diff --git a/RGBController/RGBController.cpp b/RGBController/RGBController.cpp
index 3170b348..ba408c94 100644
--- a/RGBController/RGBController.cpp
+++ b/RGBController/RGBController.cpp
@@ -1,6 +1,55 @@
 #include "RGBController.h"
 #include <cstring>
 
+//Include thread libraries for Windows or Linux
+#ifdef WIN32
+#include <process.h>
+#else
+#include "pthread.h"
+#include "unistd.h"
+#endif
+
+//Thread functions have different types in Windows and Linux
+#ifdef WIN32
+#define THREAD static void
+#define THREADRETURN
+#else
+#define THREAD static void*
+#define THREADRETURN return(NULL);
+#endif
+
+#ifdef WIN32
+#include <Windows.h>
+#else
+#include <unistd.h>
+
+static void Sleep(unsigned int milliseconds)
+{
+    usleep(1000 * milliseconds);
+}
+#endif
+
+THREAD devicecallthread_thread(void *param)
+{
+    RGBController* controller = static_cast<RGBController*>(param);
+    controller->DeviceCallThread();
+    THREADRETURN
+}
+
+RGBController::RGBController()
+{
+    /*-----------------------------------------------------*\
+    | The RGBController class starts a thread to handle     |
+    | asynchronous device updating                          |
+    \*-----------------------------------------------------*/
+#ifdef WIN32
+    _beginthread(keepalive_thread, 0, this);
+#else
+    pthread_t thread;
+    pthread_create(&thread, NULL, &devicecallthread_thread, this);
+#endif
+}
+
 unsigned char * RGBController::GetDeviceDescription()
 {
     unsigned int data_ptr = 0;
@@ -1179,6 +1228,33 @@ void RGBController::SetMode(int mode)
     UpdateMode();
 }
 
+void RGBController::UpdateLEDs()
+{
+    CallFlag_UpdateLEDs = true;
+}
+
+void RGBController::DeviceUpdateLEDs()
+{
+
+}
+
+void RGBController::DeviceCallThread()
+{
+    CallFlag_UpdateLEDs = false;
+    while(1)
+    {
+        if(CallFlag_UpdateLEDs)
+        {
+            DeviceUpdateLEDs();
+            CallFlag_UpdateLEDs = false;
+        }
+        else
+        {
+            Sleep(1);
+        }
+    }
+}
+
 std::string device_type_to_str(device_type type)
 {
     switch(type)
diff --git a/RGBController/RGBController.h b/RGBController/RGBController.h
index 81905c47..e492994a 100644
--- a/RGBController/RGBController.h
+++ b/RGBController/RGBController.h
@@ -142,7 +142,10 @@ public:
     device_type             type;           /* device type              */
     int                     active_mode = 0;/* active mode              */
 
-    virtual ~RGBController() = default;
+    /*---------------------------------------------------------*\
+    | RGBController base class constructor                      |
+    \*---------------------------------------------------------*/
+    RGBController();
 
     /*---------------------------------------------------------*\
     | Generic functions implemented in RGBController.cpp        |
@@ -172,6 +175,14 @@ public:
     unsigned char *         GetSingleLEDColorDescription(int led);
     void                    SetSingleLEDColorDescription(unsigned char* data_buf);
 
+    void                    UpdateLEDs();
+    //void                    UpdateZoneLEDs(int zone);
+    //void                    UpdateSingleLED(int led);
+
+    //void                    UpdateMode();
+
+    void                    DeviceCallThread();
+
     /*---------------------------------------------------------*\
     | Functions to be implemented in device implementation      |
     \*---------------------------------------------------------*/
@@ -179,10 +190,17 @@ public:
 
     virtual void            ResizeZone(int zone, int new_size)          = 0;
 
-    virtual void            UpdateLEDs()                                = 0;
+    virtual void            DeviceUpdateLEDs()                          = 0;
     virtual void            UpdateZoneLEDs(int zone)                    = 0;
     virtual void            UpdateSingleLED(int led)                    = 0;
 
-    virtual void            SetCustomMode()                             = 0;
     virtual void            UpdateMode()                                = 0;
+
+    virtual void            SetCustomMode()                             = 0;
+
+private:
+    bool                    CallFlag_UpdateLEDs                         = false;
+    //bool                    CallFlag_UpdateZoneLEDs                     = false;
+    //bool                    CallFlag_UpdateSingleLED                    = false;
+    //bool                    CallFlag_UpdateMode                         = false;
 };
diff --git a/RGBController/RGBController_AMDWraithPrism.cpp b/RGBController/RGBController_AMDWraithPrism.cpp
index cd266831..0bde9f1e 100644
--- a/RGBController/RGBController_AMDWraithPrism.cpp
+++ b/RGBController/RGBController_AMDWraithPrism.cpp
@@ -147,7 +147,7 @@ void RGBController_AMDWraithPrism::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_AMDWraithPrism::UpdateLEDs()
+void RGBController_AMDWraithPrism::DeviceUpdateLEDs()
 {
     unsigned char red = RGBGetRValue(colors[0]);
     unsigned char grn = RGBGetGValue(colors[0]);
@@ -230,5 +230,5 @@ void RGBController_AMDWraithPrism::UpdateMode()
             break;
     }
 
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
diff --git a/RGBController/RGBController_AMDWraithPrism.h b/RGBController/RGBController_AMDWraithPrism.h
index 81c411eb..b9218bfb 100644
--- a/RGBController/RGBController_AMDWraithPrism.h
+++ b/RGBController/RGBController_AMDWraithPrism.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_AuraAddressable.cpp b/RGBController/RGBController_AuraAddressable.cpp
index c01f85f7..d13e70b5 100644
--- a/RGBController/RGBController_AuraAddressable.cpp
+++ b/RGBController/RGBController_AuraAddressable.cpp
@@ -172,7 +172,7 @@ void RGBController_AuraAddressable::ResizeZone(int zone, int new_size)
     }
 }
 
-void RGBController_AuraAddressable::UpdateLEDs()
+void RGBController_AuraAddressable::DeviceUpdateLEDs()
 {
     for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
     {
diff --git a/RGBController/RGBController_AuraAddressable.h b/RGBController/RGBController_AuraAddressable.h
index 89239365..167e34a5 100644
--- a/RGBController/RGBController_AuraAddressable.h
+++ b/RGBController/RGBController_AuraAddressable.h
@@ -23,7 +23,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_AuraCore.cpp b/RGBController/RGBController_AuraCore.cpp
index 1ba3498e..608059b9 100644
--- a/RGBController/RGBController_AuraCore.cpp
+++ b/RGBController/RGBController_AuraCore.cpp
@@ -66,7 +66,7 @@ void RGBController_AuraCore::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_AuraCore::UpdateLEDs()
+void RGBController_AuraCore::DeviceUpdateLEDs()
 {
     UpdateZoneLEDs(0);
 }
@@ -101,5 +101,5 @@ void RGBController_AuraCore::SetCustomMode()
 
 void RGBController_AuraCore::UpdateMode()
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
diff --git a/RGBController/RGBController_AuraCore.h b/RGBController/RGBController_AuraCore.h
index a602b36e..9be6fcc8 100644
--- a/RGBController/RGBController_AuraCore.h
+++ b/RGBController/RGBController_AuraCore.h
@@ -20,7 +20,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_AuraGPU.cpp b/RGBController/RGBController_AuraGPU.cpp
index 6839bc19..45173eb1 100644
--- a/RGBController/RGBController_AuraGPU.cpp
+++ b/RGBController/RGBController_AuraGPU.cpp
@@ -138,7 +138,7 @@ void RGBController_AuraGPU::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_AuraGPU::UpdateLEDs()
+void RGBController_AuraGPU::DeviceUpdateLEDs()
 {
     for(std::size_t led = 0; led < colors.size(); led++)
     {
@@ -159,12 +159,12 @@ void RGBController_AuraGPU::UpdateLEDs()
 
 void RGBController_AuraGPU::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_AuraGPU::UpdateSingleLED(int /*led*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_AuraGPU::SetCustomMode()
diff --git a/RGBController/RGBController_AuraGPU.h b/RGBController/RGBController_AuraGPU.h
index c1db6514..f0f585f1 100644
--- a/RGBController/RGBController_AuraGPU.h
+++ b/RGBController/RGBController_AuraGPU.h
@@ -20,7 +20,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_AuraSMBus.cpp b/RGBController/RGBController_AuraSMBus.cpp
index 21435371..7804dd85 100644
--- a/RGBController/RGBController_AuraSMBus.cpp
+++ b/RGBController/RGBController_AuraSMBus.cpp
@@ -56,7 +56,7 @@ int RGBController_AuraSMBus::GetDeviceMode()
     return(active_mode);
 }
 
-void RGBController_AuraSMBus::UpdateLEDs()
+void RGBController_AuraSMBus::DeviceUpdateLEDs()
 {
     for(std::size_t led = 0; led < colors.size(); led++)
     {
diff --git a/RGBController/RGBController_AuraSMBus.h b/RGBController/RGBController_AuraSMBus.h
index f549b55b..9dda6d14 100644
--- a/RGBController/RGBController_AuraSMBus.h
+++ b/RGBController/RGBController_AuraSMBus.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_CMMP750Controller.cpp b/RGBController/RGBController_CMMP750Controller.cpp
index f896203e..ac6da033 100644
--- a/RGBController/RGBController_CMMP750Controller.cpp
+++ b/RGBController/RGBController_CMMP750Controller.cpp
@@ -99,7 +99,7 @@ void RGBController_CMMP750Controller::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_CMMP750Controller::UpdateLEDs()
+void RGBController_CMMP750Controller::DeviceUpdateLEDs()
 {
     unsigned char red = RGBGetRValue(colors[0]);
     unsigned char grn = RGBGetGValue(colors[0]);
diff --git a/RGBController/RGBController_CMMP750Controller.h b/RGBController/RGBController_CMMP750Controller.h
index 9740ef94..81995522 100644
--- a/RGBController/RGBController_CMMP750Controller.h
+++ b/RGBController/RGBController_CMMP750Controller.h
@@ -20,7 +20,7 @@ public:
     void        SetupZones();
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_CorsairLightingNode.cpp b/RGBController/RGBController_CorsairLightingNode.cpp
index 49663f89..d655ba84 100644
--- a/RGBController/RGBController_CorsairLightingNode.cpp
+++ b/RGBController/RGBController_CorsairLightingNode.cpp
@@ -237,7 +237,7 @@ void RGBController_CorsairLightingNode::ResizeZone(int zone, int new_size)
     }
 }
 
-void RGBController_CorsairLightingNode::UpdateLEDs()
+void RGBController_CorsairLightingNode::DeviceUpdateLEDs()
 {
     for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
     {
@@ -266,7 +266,7 @@ void RGBController_CorsairLightingNode::UpdateMode()
 {
     if(modes[active_mode].value == 0xFFFF)
     {
-        UpdateLEDs();
+        DeviceUpdateLEDs();
     }
     else
     {
diff --git a/RGBController/RGBController_CorsairLightingNode.h b/RGBController/RGBController_CorsairLightingNode.h
index 721840b3..d336f013 100644
--- a/RGBController/RGBController_CorsairLightingNode.h
+++ b/RGBController/RGBController_CorsairLightingNode.h
@@ -20,7 +20,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_CorsairPeripheral.cpp b/RGBController/RGBController_CorsairPeripheral.cpp
index 4086128f..2a1abedd 100644
--- a/RGBController/RGBController_CorsairPeripheral.cpp
+++ b/RGBController/RGBController_CorsairPeripheral.cpp
@@ -241,7 +241,7 @@ void RGBController_CorsairPeripheral::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_CorsairPeripheral::UpdateLEDs()
+void RGBController_CorsairPeripheral::DeviceUpdateLEDs()
 {
     corsair->SetLEDs(colors);
 }
diff --git a/RGBController/RGBController_CorsairPeripheral.h b/RGBController/RGBController_CorsairPeripheral.h
index e00407ea..55f0cfad 100644
--- a/RGBController/RGBController_CorsairPeripheral.h
+++ b/RGBController/RGBController_CorsairPeripheral.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
     
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_CorsairVengeance.cpp b/RGBController/RGBController_CorsairVengeance.cpp
index a6c56e6d..fd31cbd5 100644
--- a/RGBController/RGBController_CorsairVengeance.cpp
+++ b/RGBController/RGBController_CorsairVengeance.cpp
@@ -75,7 +75,7 @@ void RGBController_CorsairVengeance::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_CorsairVengeance::UpdateLEDs()
+void RGBController_CorsairVengeance::DeviceUpdateLEDs()
 {
     RGBColor      color = colors[0];
     unsigned char red   = RGBGetRValue(color);
@@ -87,12 +87,12 @@ void RGBController_CorsairVengeance::UpdateLEDs()
 
 void RGBController_CorsairVengeance::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_CorsairVengeance::UpdateSingleLED(int /*led*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_CorsairVengeance::SetCustomMode()
diff --git a/RGBController/RGBController_CorsairVengeance.h b/RGBController/RGBController_CorsairVengeance.h
index a239ce18..5f91004e 100644
--- a/RGBController/RGBController_CorsairVengeance.h
+++ b/RGBController/RGBController_CorsairVengeance.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_CorsairVengeancePro.cpp b/RGBController/RGBController_CorsairVengeancePro.cpp
index 70e968ba..034ec6c9 100644
--- a/RGBController/RGBController_CorsairVengeancePro.cpp
+++ b/RGBController/RGBController_CorsairVengeancePro.cpp
@@ -183,7 +183,7 @@ void RGBController_CorsairVengeancePro::ResizeZone(int /*zone*/, int /*new_size*
     \*---------------------------------------------------------*/
 }
 
-void RGBController_CorsairVengeancePro::UpdateLEDs()
+void RGBController_CorsairVengeancePro::DeviceUpdateLEDs()
 {
     for (std::size_t led = 0; led < colors.size(); led++)
     {
@@ -199,7 +199,7 @@ void RGBController_CorsairVengeancePro::UpdateLEDs()
 
 void RGBController_CorsairVengeancePro::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_CorsairVengeancePro::UpdateSingleLED(int led)
diff --git a/RGBController/RGBController_CorsairVengeancePro.h b/RGBController/RGBController_CorsairVengeancePro.h
index 754a01c9..598f5084 100644
--- a/RGBController/RGBController_CorsairVengeancePro.h
+++ b/RGBController/RGBController_CorsairVengeancePro.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_Crucial.cpp b/RGBController/RGBController_Crucial.cpp
index 4edc853d..e617200c 100644
--- a/RGBController/RGBController_Crucial.cpp
+++ b/RGBController/RGBController_Crucial.cpp
@@ -149,7 +149,7 @@ void RGBController_Crucial::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_Crucial::UpdateLEDs()
+void RGBController_Crucial::DeviceUpdateLEDs()
 {
     if(modes[active_mode].value == 0xFFFF)
     {
@@ -163,12 +163,12 @@ void RGBController_Crucial::UpdateLEDs()
 
 void RGBController_Crucial::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_Crucial::UpdateSingleLED(int /*led*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_Crucial::SetCustomMode()
diff --git a/RGBController/RGBController_Crucial.h b/RGBController/RGBController_Crucial.h
index 1cfd3775..c5c1374d 100644
--- a/RGBController/RGBController_Crucial.h
+++ b/RGBController/RGBController_Crucial.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
     
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_Dummy.cpp b/RGBController/RGBController_Dummy.cpp
index 241bbc55..6b049e6e 100644
--- a/RGBController/RGBController_Dummy.cpp
+++ b/RGBController/RGBController_Dummy.cpp
@@ -23,7 +23,7 @@ void RGBController_Dummy::ResizeZone(int /*zone*/, int /*new_size*/)
 
 }
 
-void RGBController_Dummy::UpdateLEDs()
+void RGBController_Dummy::DeviceUpdateLEDs()
 {
 
 }
diff --git a/RGBController/RGBController_Dummy.h b/RGBController/RGBController_Dummy.h
index cc3a4639..9bde3284 100644
--- a/RGBController/RGBController_Dummy.h
+++ b/RGBController/RGBController_Dummy.h
@@ -19,7 +19,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_E131.cpp b/RGBController/RGBController_E131.cpp
index de733ed9..b29dc28d 100644
--- a/RGBController/RGBController_E131.cpp
+++ b/RGBController/RGBController_E131.cpp
@@ -109,7 +109,7 @@ void RGBController_E131::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_E131::UpdateLEDs()
+void RGBController_E131::DeviceUpdateLEDs()
 {
     int color_idx = 0;
 
@@ -172,12 +172,12 @@ void RGBController_E131::UpdateLEDs()
 
 void RGBController_E131::UpdateZoneLEDs(int /*zone*/)
 {
-	UpdateLEDs();
+	DeviceUpdateLEDs();
 }
 
 void RGBController_E131::UpdateSingleLED(int /*led*/)
 {
-	UpdateLEDs();
+	DeviceUpdateLEDs();
 }
 
 void RGBController_E131::SetCustomMode()
diff --git a/RGBController/RGBController_E131.h b/RGBController/RGBController_E131.h
index d9b90198..6b075f4d 100644
--- a/RGBController/RGBController_E131.h
+++ b/RGBController/RGBController_E131.h
@@ -42,7 +42,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_Faustus.cpp b/RGBController/RGBController_Faustus.cpp
index f9052861..316c4726 100644
--- a/RGBController/RGBController_Faustus.cpp
+++ b/RGBController/RGBController_Faustus.cpp
@@ -85,7 +85,7 @@ void RGBController_Faustus::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_Faustus::UpdateLEDs()
+void RGBController_Faustus::DeviceUpdateLEDs()
 {
     int rv = uint8_t(RGBGetRValue(colors[0]));
     int gv = uint8_t(RGBGetGValue(colors[0]));
@@ -130,12 +130,12 @@ void RGBController_Faustus::UpdateLEDs()
 
 void RGBController_Faustus::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_Faustus::UpdateSingleLED(int /*led*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_Faustus::SetCustomMode()
@@ -145,7 +145,7 @@ void RGBController_Faustus::SetCustomMode()
 
 void RGBController_Faustus::UpdateMode()
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void DetectFaustusControllers(std::vector<RGBController*> &rgb_controllers)
diff --git a/RGBController/RGBController_Faustus.h b/RGBController/RGBController_Faustus.h
index 0bd9bd12..f5b6a7a7 100644
--- a/RGBController/RGBController_Faustus.h
+++ b/RGBController/RGBController_Faustus.h
@@ -35,7 +35,7 @@ class RGBController_Faustus : public RGBController
 
         void        ResizeZone(int zone, int new_size);
         
-        void        UpdateLEDs();
+        void        DeviceUpdateLEDs();
         void        UpdateZoneLEDs(int zone);
         void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_Hue2.cpp b/RGBController/RGBController_Hue2.cpp
index 4dbdf5a2..94e7a862 100644
--- a/RGBController/RGBController_Hue2.cpp
+++ b/RGBController/RGBController_Hue2.cpp
@@ -174,7 +174,7 @@ void RGBController_Hue2::ResizeZone(int /*zone*/, int /*new_size*/)
 
 }
 
-void RGBController_Hue2::UpdateLEDs()
+void RGBController_Hue2::DeviceUpdateLEDs()
 {
     for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
     {
@@ -203,7 +203,7 @@ void RGBController_Hue2::UpdateMode()
 {
     if(modes[active_mode].value == 0xFFFF)
     {
-        UpdateLEDs();
+        DeviceUpdateLEDs();
     }
     else
     {
diff --git a/RGBController/RGBController_Hue2.h b/RGBController/RGBController_Hue2.h
index b99c5464..867a3b3f 100644
--- a/RGBController/RGBController_Hue2.h
+++ b/RGBController/RGBController_Hue2.h
@@ -19,7 +19,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_HuePlus.cpp b/RGBController/RGBController_HuePlus.cpp
index 49a358f4..25453d0d 100644
--- a/RGBController/RGBController_HuePlus.cpp
+++ b/RGBController/RGBController_HuePlus.cpp
@@ -227,7 +227,7 @@ void RGBController_HuePlus::ResizeZone(int zone, int new_size)
     }
 }
 
-void RGBController_HuePlus::UpdateLEDs()
+void RGBController_HuePlus::DeviceUpdateLEDs()
 {
     for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
     {
@@ -256,7 +256,7 @@ void RGBController_HuePlus::UpdateMode()
 {
     if(modes[active_mode].value == HUE_PLUS_MODE_FIXED)
     {
-        UpdateLEDs();
+        DeviceUpdateLEDs();
     }
     else
     {
diff --git a/RGBController/RGBController_HuePlus.h b/RGBController/RGBController_HuePlus.h
index 5fa65d26..f007f9fe 100644
--- a/RGBController/RGBController_HuePlus.h
+++ b/RGBController/RGBController_HuePlus.h
@@ -20,7 +20,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_HyperXDRAM.cpp b/RGBController/RGBController_HyperXDRAM.cpp
index 76920233..b81bb8ff 100644
--- a/RGBController/RGBController_HyperXDRAM.cpp
+++ b/RGBController/RGBController_HyperXDRAM.cpp
@@ -167,7 +167,7 @@ void RGBController_HyperXDRAM::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_HyperXDRAM::UpdateLEDs()
+void RGBController_HyperXDRAM::DeviceUpdateLEDs()
 {
     if(hyperx->GetMode() == HYPERX_MODE_DIRECT)
     {
diff --git a/RGBController/RGBController_HyperXDRAM.h b/RGBController/RGBController_HyperXDRAM.h
index 1b3ba2aa..f4ba680a 100644
--- a/RGBController/RGBController_HyperXDRAM.h
+++ b/RGBController/RGBController_HyperXDRAM.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_HyperXKeyboard.cpp b/RGBController/RGBController_HyperXKeyboard.cpp
index 73a127c9..d525f093 100644
--- a/RGBController/RGBController_HyperXKeyboard.cpp
+++ b/RGBController/RGBController_HyperXKeyboard.cpp
@@ -290,7 +290,7 @@ void RGBController_HyperXKeyboard::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_HyperXKeyboard::UpdateLEDs()
+void RGBController_HyperXKeyboard::DeviceUpdateLEDs()
 {
     if(active_mode == 0)
     {
@@ -304,12 +304,12 @@ void RGBController_HyperXKeyboard::UpdateLEDs()
 
 void RGBController_HyperXKeyboard::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_HyperXKeyboard::UpdateSingleLED(int /*led*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_HyperXKeyboard::SetCustomMode()
diff --git a/RGBController/RGBController_HyperXKeyboard.h b/RGBController/RGBController_HyperXKeyboard.h
index 41b00e67..b57f6db1 100644
--- a/RGBController/RGBController_HyperXKeyboard.h
+++ b/RGBController/RGBController_HyperXKeyboard.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
     
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_LEDStrip.cpp b/RGBController/RGBController_LEDStrip.cpp
index a01a773d..6d0337ec 100644
--- a/RGBController/RGBController_LEDStrip.cpp
+++ b/RGBController/RGBController_LEDStrip.cpp
@@ -57,7 +57,7 @@ void RGBController_LEDStrip::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_LEDStrip::UpdateLEDs()
+void RGBController_LEDStrip::DeviceUpdateLEDs()
 {
     strip->SetLEDs(colors);
 }
diff --git a/RGBController/RGBController_LEDStrip.h b/RGBController/RGBController_LEDStrip.h
index 5e12c0a3..27d07313 100644
--- a/RGBController/RGBController_LEDStrip.h
+++ b/RGBController/RGBController_LEDStrip.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_MSI3Zone.cpp b/RGBController/RGBController_MSI3Zone.cpp
index 07e5dbcf..21220896 100644
--- a/RGBController/RGBController_MSI3Zone.cpp
+++ b/RGBController/RGBController_MSI3Zone.cpp
@@ -82,7 +82,7 @@ void RGBController_MSI3Zone::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_MSI3Zone::UpdateLEDs()
+void RGBController_MSI3Zone::DeviceUpdateLEDs()
 {
     msi->SetLEDs(colors);
 }
diff --git a/RGBController/RGBController_MSI3Zone.h b/RGBController/RGBController_MSI3Zone.h
index a1070a27..fb87ae56 100644
--- a/RGBController/RGBController_MSI3Zone.h
+++ b/RGBController/RGBController_MSI3Zone.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_MSIMysticLight.cpp b/RGBController/RGBController_MSIMysticLight.cpp
index 3ba32c70..4f06b867 100644
--- a/RGBController/RGBController_MSIMysticLight.cpp
+++ b/RGBController/RGBController_MSIMysticLight.cpp
@@ -105,7 +105,7 @@ void RGBController_MSIMysticLight::SetCustomMode()
     active_mode = 0;
 }
 
-void RGBController_MSIMysticLight::UpdateLEDs()
+void RGBController_MSIMysticLight::DeviceUpdateLEDs()
 {
     for(size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
     {
diff --git a/RGBController/RGBController_MSIMysticLight.h b/RGBController/RGBController_MSIMysticLight.h
index 5744b46e..5e65769d 100644
--- a/RGBController/RGBController_MSIMysticLight.h
+++ b/RGBController/RGBController_MSIMysticLight.h
@@ -22,7 +22,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_MSIRGB.cpp b/RGBController/RGBController_MSIRGB.cpp
index 2e096ad3..56afb93f 100644
--- a/RGBController/RGBController_MSIRGB.cpp
+++ b/RGBController/RGBController_MSIRGB.cpp
@@ -53,7 +53,7 @@ void RGBController_MSIRGB::ResizeZone(int /*zone*/, int /*new_size*/)
 
 }
 
-void RGBController_MSIRGB::UpdateLEDs()
+void RGBController_MSIRGB::DeviceUpdateLEDs()
 {
     RGBColor      color = colors[0];
     unsigned char red   = RGBGetRValue(color);
@@ -65,12 +65,12 @@ void RGBController_MSIRGB::UpdateLEDs()
 
 void RGBController_MSIRGB::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_MSIRGB::UpdateSingleLED(int /*led*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_MSIRGB::SetCustomMode()
diff --git a/RGBController/RGBController_MSIRGB.h b/RGBController/RGBController_MSIRGB.h
index fb57cc7d..d8aa7077 100644
--- a/RGBController/RGBController_MSIRGB.h
+++ b/RGBController/RGBController_MSIRGB.h
@@ -20,7 +20,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_NZXTKraken.cpp b/RGBController/RGBController_NZXTKraken.cpp
index 3904ea20..92698a30 100644
--- a/RGBController/RGBController_NZXTKraken.cpp
+++ b/RGBController/RGBController_NZXTKraken.cpp
@@ -299,7 +299,7 @@ void RGBController_NZXTKraken::UpdateChannel(NZXTKrakenChannel_t channel, int zo
     }
 }
 
-void RGBController_NZXTKraken::UpdateLEDs()
+void RGBController_NZXTKraken::DeviceUpdateLEDs()
 {
     if(logo_modes.find(modes[active_mode].value) == logo_modes.end())
     {
@@ -344,5 +344,5 @@ void RGBController_NZXTKraken::SetCustomMode()
 
 void RGBController_NZXTKraken::UpdateMode()
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
diff --git a/RGBController/RGBController_NZXTKraken.h b/RGBController/RGBController_NZXTKraken.h
index 6816c1b8..b1b4ba63 100644
--- a/RGBController/RGBController_NZXTKraken.h
+++ b/RGBController/RGBController_NZXTKraken.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_Network.cpp b/RGBController/RGBController_Network.cpp
index 25a2bf48..d17ac204 100644
--- a/RGBController/RGBController_Network.cpp
+++ b/RGBController/RGBController_Network.cpp
@@ -26,7 +26,7 @@ void RGBController_Network::ResizeZone(int zone, int new_size)
     client->SendRequest_RGBController_ResizeZone(dev_idx, zone, new_size);
 }
 
-void RGBController_Network::UpdateLEDs()
+void RGBController_Network::DeviceUpdateLEDs()
 {
     unsigned char * data = GetColorDescription();
     unsigned int size;
diff --git a/RGBController/RGBController_Network.h b/RGBController/RGBController_Network.h
index 07280493..7fa5745d 100644
--- a/RGBController/RGBController_Network.h
+++ b/RGBController/RGBController_Network.h
@@ -20,7 +20,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_OpenRazer.cpp b/RGBController/RGBController_OpenRazer.cpp
index b16a21cd..ae4e250a 100644
--- a/RGBController/RGBController_OpenRazer.cpp
+++ b/RGBController/RGBController_OpenRazer.cpp
@@ -12,7 +12,7 @@
 #include <fstream>
 #include <unistd.h>
 
-void RGBController_OpenRazer::UpdateLEDs()
+void RGBController_OpenRazer::DeviceUpdateLEDs()
 {
     switch(matrix_type)
     {
@@ -93,12 +93,12 @@ void RGBController_OpenRazer::UpdateLEDs()
 
 void RGBController_OpenRazer::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_OpenRazer::UpdateSingleLED(int /*led*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_OpenRazer::SetupMatrixDevice(unsigned int rows, unsigned int cols)
diff --git a/RGBController/RGBController_OpenRazer.h b/RGBController/RGBController_OpenRazer.h
index 8e315666..5ceb16e6 100644
--- a/RGBController/RGBController_OpenRazer.h
+++ b/RGBController/RGBController_OpenRazer.h
@@ -46,7 +46,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_OpenRazerWindows.cpp b/RGBController/RGBController_OpenRazerWindows.cpp
index 1ba3e5d7..b6ca10fa 100644
--- a/RGBController/RGBController_OpenRazerWindows.cpp
+++ b/RGBController/RGBController_OpenRazerWindows.cpp
@@ -16,7 +16,7 @@
 #include <linux/module.h>
 #include <linux/hid.h>
 
-void RGBController_OpenRazer::UpdateLEDs()
+void RGBController_OpenRazer::DeviceUpdateLEDs()
 {
     switch(matrix_type)
     {
@@ -93,12 +93,12 @@ void RGBController_OpenRazer::UpdateLEDs()
 
 void RGBController_OpenRazer::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_OpenRazer::UpdateSingleLED(int /*led*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_OpenRazer::SetupMatrixDevice(device_fn_type* razer_functions, unsigned int rows, unsigned int cols)
diff --git a/RGBController/RGBController_OpenRazerWindows.h b/RGBController/RGBController_OpenRazerWindows.h
index 7a45ae24..a734fc6d 100644
--- a/RGBController/RGBController_OpenRazerWindows.h
+++ b/RGBController/RGBController_OpenRazerWindows.h
@@ -103,7 +103,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_PatriotViper.cpp b/RGBController/RGBController_PatriotViper.cpp
index 03f262ea..344cf2da 100644
--- a/RGBController/RGBController_PatriotViper.cpp
+++ b/RGBController/RGBController_PatriotViper.cpp
@@ -139,7 +139,7 @@ void RGBController_PatriotViper::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_PatriotViper::UpdateLEDs()
+void RGBController_PatriotViper::DeviceUpdateLEDs()
 {
     if(viper->direct == true)
     {
@@ -167,7 +167,7 @@ void RGBController_PatriotViper::UpdateLEDs()
 
 void RGBController_PatriotViper::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_PatriotViper::UpdateSingleLED(int led)
diff --git a/RGBController/RGBController_PatriotViper.h b/RGBController/RGBController_PatriotViper.h
index 1fe2877f..ae3b44f8 100644
--- a/RGBController/RGBController_PatriotViper.h
+++ b/RGBController/RGBController_PatriotViper.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
     
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_Polychrome.cpp b/RGBController/RGBController_Polychrome.cpp
index a3f8ab0f..8bd6c751 100644
--- a/RGBController/RGBController_Polychrome.cpp
+++ b/RGBController/RGBController_Polychrome.cpp
@@ -235,7 +235,7 @@ void RGBController_Polychrome::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_Polychrome::UpdateLEDs()
+void RGBController_Polychrome::DeviceUpdateLEDs()
 {
     for (std::size_t led = 0; led < colors.size(); led++)
     {
@@ -249,12 +249,12 @@ void RGBController_Polychrome::UpdateLEDs()
 
 void RGBController_Polychrome::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_Polychrome::UpdateSingleLED(int /*led*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_Polychrome::SetCustomMode()
diff --git a/RGBController/RGBController_Polychrome.h b/RGBController/RGBController_Polychrome.h
index cd2d87f3..6481be71 100644
--- a/RGBController/RGBController_Polychrome.h
+++ b/RGBController/RGBController_Polychrome.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_PoseidonZRGB.cpp b/RGBController/RGBController_PoseidonZRGB.cpp
index 86bbdf2f..723a64c7 100644
--- a/RGBController/RGBController_PoseidonZRGB.cpp
+++ b/RGBController/RGBController_PoseidonZRGB.cpp
@@ -217,7 +217,7 @@ void RGBController_PoseidonZRGB::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_PoseidonZRGB::UpdateLEDs()
+void RGBController_PoseidonZRGB::DeviceUpdateLEDs()
 {
     if(active_mode == 0)
     {
@@ -231,12 +231,12 @@ void RGBController_PoseidonZRGB::UpdateLEDs()
 
 void RGBController_PoseidonZRGB::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_PoseidonZRGB::UpdateSingleLED(int /*led*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_PoseidonZRGB::SetCustomMode()
diff --git a/RGBController/RGBController_PoseidonZRGB.h b/RGBController/RGBController_PoseidonZRGB.h
index 11244ba3..936b2ee6 100644
--- a/RGBController/RGBController_PoseidonZRGB.h
+++ b/RGBController/RGBController_PoseidonZRGB.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
     
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_RGBFusion.cpp b/RGBController/RGBController_RGBFusion.cpp
index 8399413d..d66792bc 100644
--- a/RGBController/RGBController_RGBFusion.cpp
+++ b/RGBController/RGBController_RGBFusion.cpp
@@ -107,7 +107,7 @@ void RGBController_RGBFusion::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_RGBFusion::UpdateLEDs()
+void RGBController_RGBFusion::DeviceUpdateLEDs()
 {
     for (std::size_t led = 0; led < colors.size(); led++)
     {
diff --git a/RGBController/RGBController_RGBFusion.h b/RGBController/RGBController_RGBFusion.h
index 743fa583..e2fb424f 100644
--- a/RGBController/RGBController_RGBFusion.h
+++ b/RGBController/RGBController_RGBFusion.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_RGBFusion2USB.cpp b/RGBController/RGBController_RGBFusion2USB.cpp
index 85a5c209..d0be8043 100644
--- a/RGBController/RGBController_RGBFusion2USB.cpp
+++ b/RGBController/RGBController_RGBFusion2USB.cpp
@@ -261,7 +261,7 @@ void RGBController_RGBFusion2USB::SetCustomMode()
     active_mode = 0;
 }
 
-void RGBController_RGBFusion2USB::UpdateLEDs()
+void RGBController_RGBFusion2USB::DeviceUpdateLEDs()
 {
     for(size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
     {
@@ -456,5 +456,5 @@ void RGBController_RGBFusion2USB::UpdateSingleLED(int led)
 
 void RGBController_RGBFusion2USB::UpdateMode()
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
diff --git a/RGBController/RGBController_RGBFusion2USB.h b/RGBController/RGBController_RGBFusion2USB.h
index 353e2f69..b83ace6c 100644
--- a/RGBController/RGBController_RGBFusion2USB.h
+++ b/RGBController/RGBController_RGBFusion2USB.h
@@ -31,7 +31,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_RGBFusionGPU.cpp b/RGBController/RGBController_RGBFusionGPU.cpp
index c8d30b2d..42730fe7 100644
--- a/RGBController/RGBController_RGBFusionGPU.cpp
+++ b/RGBController/RGBController_RGBFusionGPU.cpp
@@ -105,7 +105,7 @@ void RGBController_RGBFusionGPU::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_RGBFusionGPU::UpdateLEDs()
+void RGBController_RGBFusionGPU::DeviceUpdateLEDs()
 {
     RGBColor      color = colors[0];
     unsigned char red   = RGBGetRValue(color);
@@ -117,12 +117,12 @@ void RGBController_RGBFusionGPU::UpdateLEDs()
 
 void RGBController_RGBFusionGPU::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_RGBFusionGPU::UpdateSingleLED(int /*led*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_RGBFusionGPU::SetCustomMode()
diff --git a/RGBController/RGBController_RGBFusionGPU.h b/RGBController/RGBController_RGBFusionGPU.h
index db31607f..d87aa598 100644
--- a/RGBController/RGBController_RGBFusionGPU.h
+++ b/RGBController/RGBController_RGBFusionGPU.h
@@ -21,7 +21,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_RedragonK556.cpp b/RGBController/RGBController_RedragonK556.cpp
index 07adf651..c30c7da1 100644
--- a/RGBController/RGBController_RedragonK556.cpp
+++ b/RGBController/RGBController_RedragonK556.cpp
@@ -226,7 +226,7 @@ void RGBController_RedragonK556::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_RedragonK556::UpdateLEDs()
+void RGBController_RedragonK556::DeviceUpdateLEDs()
 {
     unsigned char color_data[7*0x36];
 
@@ -246,12 +246,12 @@ void RGBController_RedragonK556::UpdateLEDs()
 
 void RGBController_RedragonK556::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_RedragonK556::UpdateSingleLED(int /*led*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_RedragonK556::SetCustomMode()
diff --git a/RGBController/RGBController_RedragonK556.h b/RGBController/RGBController_RedragonK556.h
index 93d8f2f9..f9f235cd 100644
--- a/RGBController/RGBController_RedragonK556.h
+++ b/RGBController/RGBController_RedragonK556.h
@@ -20,7 +20,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
     
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_RedragonM711.cpp b/RGBController/RGBController_RedragonM711.cpp
index ec4f1ba4..2d52e01d 100644
--- a/RGBController/RGBController_RedragonM711.cpp
+++ b/RGBController/RGBController_RedragonM711.cpp
@@ -79,7 +79,7 @@ void RGBController_RedragonM711::ResizeZone(int /*zone*/, int /*new_size*/)
     \*---------------------------------------------------------*/
 }
 
-void RGBController_RedragonM711::UpdateLEDs()
+void RGBController_RedragonM711::DeviceUpdateLEDs()
 {
     bool random       = (modes[active_mode].color_mode == MODE_COLORS_RANDOM);
     unsigned char red = RGBGetRValue(colors[0]);
@@ -100,12 +100,12 @@ void RGBController_RedragonM711::UpdateLEDs()
 
 void RGBController_RedragonM711::UpdateZoneLEDs(int /*zone*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_RedragonM711::UpdateSingleLED(int /*led*/)
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
 
 void RGBController_RedragonM711::SetCustomMode()
@@ -115,5 +115,5 @@ void RGBController_RedragonM711::SetCustomMode()
 
 void RGBController_RedragonM711::UpdateMode()
 {
-    UpdateLEDs();
+    DeviceUpdateLEDs();
 }
diff --git a/RGBController/RGBController_RedragonM711.h b/RGBController/RGBController_RedragonM711.h
index 93d0b7c7..29ffe563 100644
--- a/RGBController/RGBController_RedragonM711.h
+++ b/RGBController/RGBController_RedragonM711.h
@@ -20,7 +20,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
     
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
diff --git a/RGBController/RGBController_ThermaltakeRiing.cpp b/RGBController/RGBController_ThermaltakeRiing.cpp
index 77364096..62af2a18 100644
--- a/RGBController/RGBController_ThermaltakeRiing.cpp
+++ b/RGBController/RGBController_ThermaltakeRiing.cpp
@@ -176,7 +176,7 @@ void RGBController_ThermaltakeRiing::ResizeZone(int zone, int new_size)
     }
 }
 
-void RGBController_ThermaltakeRiing::UpdateLEDs()
+void RGBController_ThermaltakeRiing::DeviceUpdateLEDs()
 {
     for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
     {
diff --git a/RGBController/RGBController_ThermaltakeRiing.h b/RGBController/RGBController_ThermaltakeRiing.h
index 1dd2ca1a..91558d5e 100644
--- a/RGBController/RGBController_ThermaltakeRiing.h
+++ b/RGBController/RGBController_ThermaltakeRiing.h
@@ -20,7 +20,7 @@ public:
 
     void        ResizeZone(int zone, int new_size);
 
-    void        UpdateLEDs();
+    void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);