diff --git a/Controllers/AOCMouseController/AOCMouseController.cpp b/Controllers/AOCMouseController/AOCMouseController.cpp
index 0ffbd1901..f6c6175ca 100644
--- a/Controllers/AOCMouseController/AOCMouseController.cpp
+++ b/Controllers/AOCMouseController/AOCMouseController.cpp
@@ -13,10 +13,11 @@
 #include "AOCMouseController.h"
 #include "StringUtils.h"
 
-AOCMouseController::AOCMouseController(hid_device* dev_handle, const char* path)
+AOCMouseController::AOCMouseController(hid_device* dev_handle, const char* path, std::string dev_name)
 {
     dev         = dev_handle;
     location    = path;
+    name        = dev_name;
 }
 
 AOCMouseController::~AOCMouseController()
@@ -29,6 +30,11 @@ std::string AOCMouseController::GetDeviceLocation()
     return("HID " + location);
 }
 
+std::string AOCMouseController::GetDeviceName()
+{
+    return(name);
+}
+
 std::string AOCMouseController::GetSerialString()
 {
     wchar_t serial_string[128];
diff --git a/Controllers/AOCMouseController/AOCMouseController.h b/Controllers/AOCMouseController/AOCMouseController.h
index 11cfac6cf..81454c128 100644
--- a/Controllers/AOCMouseController/AOCMouseController.h
+++ b/Controllers/AOCMouseController/AOCMouseController.h
@@ -56,10 +56,11 @@ enum
 class AOCMouseController
 {
 public:
-    AOCMouseController(hid_device* dev_handle, const char* path);
+    AOCMouseController(hid_device* dev_handle, const char* path, std::string dev_name);
     ~AOCMouseController();
 
     std::string GetDeviceLocation();
+    std::string GetDeviceName();
     std::string GetSerialString();
 
     void SendDirect
@@ -79,4 +80,5 @@ public:
 private:
     hid_device*             dev;
     std::string             location;
+    std::string             name;
 };
diff --git a/Controllers/AOCMouseController/AOCMouseControllerDetect.cpp b/Controllers/AOCMouseController/AOCMouseControllerDetect.cpp
index 692aeed52..974209f98 100644
--- a/Controllers/AOCMouseController/AOCMouseControllerDetect.cpp
+++ b/Controllers/AOCMouseController/AOCMouseControllerDetect.cpp
@@ -33,9 +33,8 @@ void DetectAOCMouseControllers(hid_device_info* info, const std::string& name)
 
     if(dev)
     {
-        AOCMouseController*     controller     = new AOCMouseController(dev, info->path);
+        AOCMouseController*     controller     = new AOCMouseController(dev, info->path, name);
         RGBController_AOCMouse* rgb_controller = new RGBController_AOCMouse(controller);
-        rgb_controller->name                   = name;
 
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
diff --git a/Controllers/AOCMouseController/RGBController_AOCMouse.cpp b/Controllers/AOCMouseController/RGBController_AOCMouse.cpp
index 76e641d36..d7caa3179 100644
--- a/Controllers/AOCMouseController/RGBController_AOCMouse.cpp
+++ b/Controllers/AOCMouseController/RGBController_AOCMouse.cpp
@@ -26,7 +26,7 @@ RGBController_AOCMouse::RGBController_AOCMouse(AOCMouseController* controller_pt
 {
     controller                      = controller_ptr;
 
-    name                            = "AOC Mouse Device";
+    name                            = controller->GetDeviceName();
     vendor                          = "AOC";
     type                            = DEVICE_TYPE_MOUSE;
     description                     = "AOC Mouse Device";