diff --git a/RGB.NET.Core/Devices/IRGBDeviceInfo.cs b/RGB.NET.Core/Devices/IRGBDeviceInfo.cs
index 98424d8..61cc868 100644
--- a/RGB.NET.Core/Devices/IRGBDeviceInfo.cs
+++ b/RGB.NET.Core/Devices/IRGBDeviceInfo.cs
@@ -9,11 +9,6 @@ namespace RGB.NET.Core
     {
         #region Properties & Fields
 
-        /// <summary>
-        /// Gets an unique identifier of the <see cref="IRGBDevice"/> this info belongs to.
-        /// </summary>
-        object DeviceId { get; }
-
         /// <summary>
         /// Gets the <see cref="RGBDeviceType"/> of the <see cref="IRGBDevice"/>.
         /// </summary>
diff --git a/RGB.NET.Devices.Asus/Generic/AsusRGBDeviceInfo.cs b/RGB.NET.Devices.Asus/Generic/AsusRGBDeviceInfo.cs
index c7aad3e..488a2b7 100644
--- a/RGB.NET.Devices.Asus/Generic/AsusRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.Asus/Generic/AsusRGBDeviceInfo.cs
@@ -11,9 +11,6 @@ namespace RGB.NET.Devices.Asus
     {
         #region Properties & Fields
 
-        /// <inheritdoc />
-        public object DeviceId => Handle.ToInt32();
-
         /// <inheritdoc />
         public RGBDeviceType DeviceType { get; }
 
diff --git a/RGB.NET.Devices.CoolerMaster/Generic/CoolerMasterRGBDeviceInfo.cs b/RGB.NET.Devices.CoolerMaster/Generic/CoolerMasterRGBDeviceInfo.cs
index e6bdb63..b9790ca 100644
--- a/RGB.NET.Devices.CoolerMaster/Generic/CoolerMasterRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.CoolerMaster/Generic/CoolerMasterRGBDeviceInfo.cs
@@ -12,9 +12,6 @@ namespace RGB.NET.Devices.CoolerMaster
     {
         #region Properties & Fields
 
-        /// <inheritdoc />
-        public object DeviceId => DeviceIndex;
-
         /// <inheritdoc />
         public RGBDeviceType DeviceType { get; }
 
diff --git a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs
index 6d3f424..012cfb5 100644
--- a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs
@@ -14,9 +14,6 @@ namespace RGB.NET.Devices.Corsair
     {
         #region Properties & Fields
 
-        /// <inheritdoc />
-        public object DeviceId => CorsairDeviceIndex;
-
         /// <summary>
         /// Gets the corsair specific device type.
         /// </summary>
diff --git a/RGB.NET.Devices.DMX/E131/E131DeviceInfo.cs b/RGB.NET.Devices.DMX/E131/E131DeviceInfo.cs
index 8a84459..8da933e 100644
--- a/RGB.NET.Devices.DMX/E131/E131DeviceInfo.cs
+++ b/RGB.NET.Devices.DMX/E131/E131DeviceInfo.cs
@@ -21,9 +21,6 @@ namespace RGB.NET.Devices.DMX.E131
 
         #region Properties & Fields
 
-        /// <inheritdoc />
-        public object DeviceId => CID;
-
         /// <inheritdoc />
         public RGBDeviceType DeviceType { get; }
 
diff --git a/RGB.NET.Devices.Debug/DebugRGBDeviceInfo.cs b/RGB.NET.Devices.Debug/DebugRGBDeviceInfo.cs
index 6440cdc..10ad430 100644
--- a/RGB.NET.Devices.Debug/DebugRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.Debug/DebugRGBDeviceInfo.cs
@@ -11,9 +11,6 @@ namespace RGB.NET.Devices.Debug
     {
         #region Properties & Fields
 
-        /// <inheritdoc />
-        public object DeviceId { get; }
-
         /// <inheritdoc />
         public RGBDeviceType DeviceType { get; }
 
@@ -44,15 +41,13 @@ namespace RGB.NET.Devices.Debug
         /// <param name="model">The model of the device.</param>
         /// <param name="lighting">The <see cref="RGBDeviceLighting"/> of the device.</param>
         /// <param name="supportsSyncBack">True if the device supports syncback; false if not.</param>
-        /// <param name="deviceId">The unique identifier of this device.</param>
-        internal DebugRGBDeviceInfo(RGBDeviceType deviceType, string manufacturer, string model, RGBDeviceLighting lighting, bool supportsSyncBack, object deviceId = null)
+        internal DebugRGBDeviceInfo(RGBDeviceType deviceType, string manufacturer, string model, RGBDeviceLighting lighting, bool supportsSyncBack)
         {
             this.DeviceType = deviceType;
             this.Manufacturer = manufacturer;
             this.Model = model;
             this.Lighting = lighting;
             this.SupportsSyncBack = supportsSyncBack;
-            this.DeviceId = deviceId;
         }
 
         #endregion
diff --git a/RGB.NET.Devices.Logitech/Generic/LogitechRGBDeviceInfo.cs b/RGB.NET.Devices.Logitech/Generic/LogitechRGBDeviceInfo.cs
index ccd52a2..3fc5017 100644
--- a/RGB.NET.Devices.Logitech/Generic/LogitechRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.Logitech/Generic/LogitechRGBDeviceInfo.cs
@@ -11,9 +11,6 @@ namespace RGB.NET.Devices.Logitech
     {
         #region Properties & Fields
 
-        /// <inheritdoc />
-        public object DeviceId => Lighting;
-
         /// <inheritdoc />
         public RGBDeviceType DeviceType { get; }
 
diff --git a/RGB.NET.Devices.Msi/Generic/MsiRGBDeviceInfo.cs b/RGB.NET.Devices.Msi/Generic/MsiRGBDeviceInfo.cs
index eda003f..f0d5c15 100644
--- a/RGB.NET.Devices.Msi/Generic/MsiRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.Msi/Generic/MsiRGBDeviceInfo.cs
@@ -11,9 +11,6 @@ namespace RGB.NET.Devices.Msi
     {
         #region Properties & Fields
 
-        /// <inheritdoc />
-        public object DeviceId => MsiDeviceType;
-
         /// <inheritdoc />
         public RGBDeviceType DeviceType { get; }
 
diff --git a/RGB.NET.Devices.Novation/Generic/NovationRGBDevice.cs b/RGB.NET.Devices.Novation/Generic/NovationRGBDevice.cs
index ee8a7ea..c1904eb 100644
--- a/RGB.NET.Devices.Novation/Generic/NovationRGBDevice.cs
+++ b/RGB.NET.Devices.Novation/Generic/NovationRGBDevice.cs
@@ -58,7 +58,7 @@ namespace RGB.NET.Devices.Novation
             }
 
             if (DeviceInfo.ColorCapabilities == NovationColorCapabilities.LimitedRG)
-                UpdateQueue = new LimitedColorUpdateQueue(updateTrigger, DeviceInfo.MidiDeviceId);
+                UpdateQueue = new LimitedColorUpdateQueue(updateTrigger, DeviceInfo.DeviceId);
         }
 
         /// <summary>
diff --git a/RGB.NET.Devices.Novation/Generic/NovationRGBDeviceInfo.cs b/RGB.NET.Devices.Novation/Generic/NovationRGBDeviceInfo.cs
index 991582d..c419719 100644
--- a/RGB.NET.Devices.Novation/Generic/NovationRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.Novation/Generic/NovationRGBDeviceInfo.cs
@@ -11,9 +11,6 @@ namespace RGB.NET.Devices.Novation
     {
         #region Properties & Fields
 
-        /// <inheritdoc />
-        public object DeviceId => MidiDeviceId;
-
         /// <inheritdoc />
         public RGBDeviceType DeviceType { get; }
 
@@ -40,7 +37,7 @@ namespace RGB.NET.Devices.Novation
         /// <summary>
         /// Gets the (midi)-id of the <see cref="IRGBDevice"/>..
         /// </summary>
-        public int MidiDeviceId { get; }
+        public int DeviceId { get; }
 
         #endregion
 
@@ -57,7 +54,7 @@ namespace RGB.NET.Devices.Novation
         {
             this.DeviceType = deviceType;
             this.Model = model;
-            this.MidiDeviceId = deviceId;
+            this.DeviceId = deviceId;
             this.ColorCapabilities = colorCapabilities;
         }
 
diff --git a/RGB.NET.Devices.Razer/ChromaLink/RazerChromaLinkRGBDevice.cs b/RGB.NET.Devices.Razer/ChromaLink/RazerChromaLinkRGBDevice.cs
index bf0008e..069aab8 100644
--- a/RGB.NET.Devices.Razer/ChromaLink/RazerChromaLinkRGBDevice.cs
+++ b/RGB.NET.Devices.Razer/ChromaLink/RazerChromaLinkRGBDevice.cs
@@ -42,7 +42,7 @@ namespace RGB.NET.Devices.Razer
         protected override object CreateLedCustomData(LedId ledId) => (int)ledId - (int)LedId.Custom1;
 
         /// <inheritdoc />
-        protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerChromaLinkUpdateQueue(updateTrigger, DeviceInfo.RazerDeviceId);
+        protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerChromaLinkUpdateQueue(updateTrigger, DeviceInfo.DeviceId);
 
         #endregion
     }
diff --git a/RGB.NET.Devices.Razer/Generic/RazerRGBDeviceInfo.cs b/RGB.NET.Devices.Razer/Generic/RazerRGBDeviceInfo.cs
index 5ab0d43..2385b01 100644
--- a/RGB.NET.Devices.Razer/Generic/RazerRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.Razer/Generic/RazerRGBDeviceInfo.cs
@@ -11,13 +11,10 @@ namespace RGB.NET.Devices.Razer
     {
         #region Properties & Fields
 
-        /// <inheritdoc />
-        public object DeviceId => RazerDeviceId;
-
         /// <summary>
         /// Gets the Id of the <see cref="RazerRGBDevice{TDeviceInfo}"/>.
         /// </summary>
-        public Guid RazerDeviceId { get; }
+        public Guid DeviceId { get; }
 
         /// <inheritdoc />
         public RGBDeviceType DeviceType { get; }
@@ -49,7 +46,7 @@ namespace RGB.NET.Devices.Razer
         /// <param name="model">The model of the <see cref="IRGBDevice"/>.</param>
         internal RazerRGBDeviceInfo(Guid deviceId, RGBDeviceType deviceType, string model)
         {
-            this.RazerDeviceId = deviceId;
+            this.DeviceId = deviceId;
             this.DeviceType = deviceType;
             this.Model = model;
         }
diff --git a/RGB.NET.Devices.Razer/Headset/RazerHeadsetRGBDevice.cs b/RGB.NET.Devices.Razer/Headset/RazerHeadsetRGBDevice.cs
index cbdef3b..a5ef0ab 100644
--- a/RGB.NET.Devices.Razer/Headset/RazerHeadsetRGBDevice.cs
+++ b/RGB.NET.Devices.Razer/Headset/RazerHeadsetRGBDevice.cs
@@ -42,7 +42,7 @@ namespace RGB.NET.Devices.Razer
         protected override object CreateLedCustomData(LedId ledId) => (int)ledId - (int)LedId.Headset1;
 
         /// <inheritdoc />
-        protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerHeadsetUpdateQueue(updateTrigger, DeviceInfo.RazerDeviceId);
+        protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerHeadsetUpdateQueue(updateTrigger, DeviceInfo.DeviceId);
 
         #endregion
     }
diff --git a/RGB.NET.Devices.Razer/Keyboard/RazerKeyboardRGBDevice.cs b/RGB.NET.Devices.Razer/Keyboard/RazerKeyboardRGBDevice.cs
index 5f6ebbd..763fd47 100644
--- a/RGB.NET.Devices.Razer/Keyboard/RazerKeyboardRGBDevice.cs
+++ b/RGB.NET.Devices.Razer/Keyboard/RazerKeyboardRGBDevice.cs
@@ -48,7 +48,7 @@ namespace RGB.NET.Devices.Razer
         protected override object CreateLedCustomData(LedId ledId) => (int)ledId - (int)LedId.Keyboard_Escape;
 
         /// <inheritdoc />
-        protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerKeyboardUpdateQueue(updateTrigger, DeviceInfo.RazerDeviceId);
+        protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerKeyboardUpdateQueue(updateTrigger, DeviceInfo.DeviceId);
 
         #endregion
     }
diff --git a/RGB.NET.Devices.Razer/Keypad/RazerKeypadRGBDevice.cs b/RGB.NET.Devices.Razer/Keypad/RazerKeypadRGBDevice.cs
index 3ccf566..589faae 100644
--- a/RGB.NET.Devices.Razer/Keypad/RazerKeypadRGBDevice.cs
+++ b/RGB.NET.Devices.Razer/Keypad/RazerKeypadRGBDevice.cs
@@ -45,7 +45,7 @@ namespace RGB.NET.Devices.Razer
         protected override object CreateLedCustomData(LedId ledId) => (int)ledId - (int)LedId.Keypad1;
 
         /// <inheritdoc />
-        protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerKeypadUpdateQueue(updateTrigger, DeviceInfo.RazerDeviceId);
+        protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerKeypadUpdateQueue(updateTrigger, DeviceInfo.DeviceId);
 
         #endregion
     }
diff --git a/RGB.NET.Devices.Razer/Mouse/RazerMouseRGBDevice.cs b/RGB.NET.Devices.Razer/Mouse/RazerMouseRGBDevice.cs
index 7269b04..2eeba61 100644
--- a/RGB.NET.Devices.Razer/Mouse/RazerMouseRGBDevice.cs
+++ b/RGB.NET.Devices.Razer/Mouse/RazerMouseRGBDevice.cs
@@ -45,7 +45,7 @@ namespace RGB.NET.Devices.Razer
         protected override object CreateLedCustomData(LedId ledId) => (int)ledId - (int)LedId.Mouse1;
 
         /// <inheritdoc />
-        protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerMouseUpdateQueue(updateTrigger, DeviceInfo.RazerDeviceId);
+        protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerMouseUpdateQueue(updateTrigger, DeviceInfo.DeviceId);
 
         #endregion
     }
diff --git a/RGB.NET.Devices.Razer/Mousepad/RazerMousepadRGBDevice.cs b/RGB.NET.Devices.Razer/Mousepad/RazerMousepadRGBDevice.cs
index 000d7e6..d0d8e1c 100644
--- a/RGB.NET.Devices.Razer/Mousepad/RazerMousepadRGBDevice.cs
+++ b/RGB.NET.Devices.Razer/Mousepad/RazerMousepadRGBDevice.cs
@@ -42,7 +42,7 @@ namespace RGB.NET.Devices.Razer
         protected override object CreateLedCustomData(LedId ledId) => (int)ledId - (int)LedId.Mousepad1;
 
         /// <inheritdoc />
-        protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerMousepadUpdateQueue(updateTrigger, DeviceInfo.RazerDeviceId);
+        protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerMousepadUpdateQueue(updateTrigger, DeviceInfo.DeviceId);
 
         #endregion
     }
diff --git a/RGB.NET.Devices.SoIP/Client/SoIPClientRGBDeviceInfo.cs b/RGB.NET.Devices.SoIP/Client/SoIPClientRGBDeviceInfo.cs
index f017e48..a878d09 100644
--- a/RGB.NET.Devices.SoIP/Client/SoIPClientRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.SoIP/Client/SoIPClientRGBDeviceInfo.cs
@@ -11,9 +11,6 @@ namespace RGB.NET.Devices.SoIP.Client
     {
         #region Properties & Fields
 
-        /// <inheritdoc />
-        public object DeviceId => $"{Hostname}:{Port}";
-
         /// <inheritdoc />
         public RGBDeviceType DeviceType => RGBDeviceType.Unknown;
 
diff --git a/RGB.NET.Devices.SoIP/Server/SoIPServerRGBDeviceInfo.cs b/RGB.NET.Devices.SoIP/Server/SoIPServerRGBDeviceInfo.cs
index ee2d548..25db97e 100644
--- a/RGB.NET.Devices.SoIP/Server/SoIPServerRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.SoIP/Server/SoIPServerRGBDeviceInfo.cs
@@ -11,9 +11,6 @@ namespace RGB.NET.Devices.SoIP.Server
     {
         #region Properties & Fields
 
-        /// <inheritdoc />
-        public object DeviceId => Port;
-
         /// <inheritdoc />
         public RGBDeviceType DeviceType => RGBDeviceType.Unknown;