diff --git a/Controllers/LexipMouseController/LexipMouseController.cpp b/Controllers/LexipMouseController/LexipMouseController.cpp
index 64332838..417c762d 100644
--- a/Controllers/LexipMouseController/LexipMouseController.cpp
+++ b/Controllers/LexipMouseController/LexipMouseController.cpp
@@ -13,11 +13,11 @@
 #include "LexipMouseController.h"
 #include "StringUtils.h"
 
-LexipMouseController::LexipMouseController(hid_device* dev_handle, const hid_device_info& info)
+LexipMouseController::LexipMouseController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name)
 {
     dev                 = dev_handle;
     location            = info.path;
-    version             = "";
+    name                = dev_name;
 }
 
 LexipMouseController::~LexipMouseController()
@@ -30,6 +30,11 @@ std::string LexipMouseController::GetDeviceLocation()
     return("HID: " + location);
 }
 
+std::string LexipMouseController::GetNameString()
+{
+    return(name);
+}
+
 std::string LexipMouseController::GetSerialString()
 {
     wchar_t serial_string[128];
@@ -43,11 +48,6 @@ std::string LexipMouseController::GetSerialString()
     return(StringUtils::wstring_to_string(serial_string));
 }
 
-std::string LexipMouseController::GetFirmwareVersion()
-{
-    return(version);
-}
-
 void LexipMouseController::SetDirect(RGBColor color)
 {
     /*-----------------------------------------*\
diff --git a/Controllers/LexipMouseController/LexipMouseController.h b/Controllers/LexipMouseController/LexipMouseController.h
index 71828ab8..482da99a 100644
--- a/Controllers/LexipMouseController/LexipMouseController.h
+++ b/Controllers/LexipMouseController/LexipMouseController.h
@@ -20,12 +20,12 @@
 class LexipMouseController
 {
 public:
-    LexipMouseController(hid_device* dev_handle, const hid_device_info& info);
+    LexipMouseController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name);
     ~LexipMouseController();
 
-    std::string                 GetSerialString();
     std::string                 GetDeviceLocation();
-    std::string                 GetFirmwareVersion();
+    std::string                 GetNameString();
+    std::string                 GetSerialString();
 
     void                        SetDirect(RGBColor color);
 protected:
@@ -33,5 +33,6 @@ protected:
 
 private:
     std::string                 location;
+    std::string                 name;
     std::string                 version;
 };
diff --git a/Controllers/LexipMouseController/LexipMouseControllerDetect.cpp b/Controllers/LexipMouseController/LexipMouseControllerDetect.cpp
index dc6efcba..049f7d5d 100644
--- a/Controllers/LexipMouseController/LexipMouseControllerDetect.cpp
+++ b/Controllers/LexipMouseController/LexipMouseControllerDetect.cpp
@@ -29,9 +29,9 @@ void DetectLexipMouseControllers(hid_device_info* info, const std::string& name)
 
     if(dev)
     {
-        LexipMouseController*     controller        = new LexipMouseController(dev, *info);
+        LexipMouseController*     controller        = new LexipMouseController(dev, *info, name);
         RGBController_LexipMouse* rgb_controller    = new RGBController_LexipMouse(controller);
-        rgb_controller->name                        = name;
+
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }
diff --git a/Controllers/LexipMouseController/RGBController_LexipMouse.cpp b/Controllers/LexipMouseController/RGBController_LexipMouse.cpp
index 6844c7e4..6baa55da 100644
--- a/Controllers/LexipMouseController/RGBController_LexipMouse.cpp
+++ b/Controllers/LexipMouseController/RGBController_LexipMouse.cpp
@@ -27,13 +27,13 @@
 RGBController_LexipMouse::RGBController_LexipMouse(LexipMouseController* controller_ptr)
 {
     controller                          = controller_ptr;
-    name                                = "Lexip Gaming Mouse";
+
+    name                                = controller->GetNameString();
     vendor                              = "Lexip";
     type                                = DEVICE_TYPE_MOUSE;
     description                         = name;
     location                            = controller->GetDeviceLocation();
     serial                              = controller->GetSerialString();
-    version                             = controller->GetFirmwareVersion();
 
     mode Direct;
     Direct.name                         = "Direct";