diff --git a/Controllers/N5312AController/N5312AController.cpp b/Controllers/N5312AController/N5312AController.cpp
index f810f15b..9695d341 100644
--- a/Controllers/N5312AController/N5312AController.cpp
+++ b/Controllers/N5312AController/N5312AController.cpp
@@ -14,11 +14,11 @@
 #include "N5312AController.h"
 #include "StringUtils.h"
 
-N5312AController::N5312AController(hid_device* dev_handle, const hid_device_info& info)
+N5312AController::N5312AController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name)
 {
-    dev                 = dev_handle;
-    location            = info.path;
-    version             = "";
+    dev         = dev_handle;
+    location    = info.path;
+    name        = dev_name;
 
     SendInit();
 }
@@ -33,6 +33,11 @@ std::string N5312AController::GetDeviceLocation()
     return("HID: " + location);
 }
 
+std::string N5312AController::GetNameString()
+{
+    return(name);
+}
+
 std::string N5312AController::GetSerialString()
 {
     wchar_t serial_string[128];
@@ -46,11 +51,6 @@ std::string N5312AController::GetSerialString()
     return(StringUtils::wstring_to_string(serial_string));
 }
 
-std::string N5312AController::GetFirmwareVersion()
-{
-    return(version);
-}
-
 void N5312AController::SendInit()
 {
     unsigned char usb_buf[N5312A_PACKET_DATA_LENGTH];
diff --git a/Controllers/N5312AController/N5312AController.h b/Controllers/N5312AController/N5312AController.h
index 26a8967e..5a2adc60 100644
--- a/Controllers/N5312AController/N5312AController.h
+++ b/Controllers/N5312AController/N5312AController.h
@@ -41,12 +41,12 @@ enum
 class N5312AController
 {
 public:
-    N5312AController(hid_device* dev_handle, const hid_device_info& info);
+    N5312AController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name);
     ~N5312AController();
 
-    std::string GetSerialString();
     std::string GetDeviceLocation();
-    std::string GetFirmwareVersion();
+    std::string GetNameString();
+    std::string GetSerialString();
 
     void        SetColor(RGBColor color);
     void        SetMode(RGBColor color, unsigned char mode_value, unsigned char brightness, unsigned char speed);
@@ -55,6 +55,7 @@ private:
     hid_device* dev;
 
     std::string location;
+    std::string name;
     std::string version;
 
     void        SendInit();
diff --git a/Controllers/N5312AController/N5312AControllerDetect.cpp b/Controllers/N5312AController/N5312AControllerDetect.cpp
index e75481a7..ce9e74fb 100644
--- a/Controllers/N5312AController/N5312AControllerDetect.cpp
+++ b/Controllers/N5312AController/N5312AControllerDetect.cpp
@@ -29,9 +29,8 @@ void DetectN5312AControllers(hid_device_info* info, const std::string& name)
 
     if(dev)
     {
-        N5312AController*     controller         = new N5312AController(dev, *info);
+        N5312AController*     controller         = new N5312AController(dev, *info, name);
         RGBController_N5312A* rgb_controller     = new RGBController_N5312A(controller);
-        rgb_controller->name                     = name;
 
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
diff --git a/Controllers/N5312AController/RGBController_N5312A.cpp b/Controllers/N5312AController/RGBController_N5312A.cpp
index 9d994f7a..ee5dfd86 100644
--- a/Controllers/N5312AController/RGBController_N5312A.cpp
+++ b/Controllers/N5312AController/RGBController_N5312A.cpp
@@ -29,13 +29,13 @@
 RGBController_N5312A::RGBController_N5312A(N5312AController* controller_ptr)
 {
     controller                          = controller_ptr;
-    name                                = "N5312A Device";
+
+    name                                = controller->GetNameString();
     vendor                              = "Unknown";
     type                                = DEVICE_TYPE_MOUSE;
-    description                         = name;
+    description                         = "N5312A Device";
     location                            = controller->GetDeviceLocation();
     serial                              = controller->GetSerialString();
-    version                             = controller->GetFirmwareVersion();
 
     mode Static;
     Static.name                         = "Direct";