diff --git a/RGB.NET.Core/Devices/RGBDeviceType.cs b/RGB.NET.Core/Devices/RGBDeviceType.cs
index 012ee60..7345bab 100644
--- a/RGB.NET.Core/Devices/RGBDeviceType.cs
+++ b/RGB.NET.Core/Devices/RGBDeviceType.cs
@@ -26,9 +26,9 @@
         Headset = 3,
 
         /// <summary>
-        /// Represents a mousmat.
+        /// Represents a mousepad.
         /// </summary>
-        Mousemat = 4,
+        Mousepad = 4,
 
         /// <summary>
         /// Represents a LED-stipe.
diff --git a/RGB.NET.Core/Positioning/Rectangle.cs b/RGB.NET.Core/Positioning/Rectangle.cs
index b74cef8..72b8e5c 100644
--- a/RGB.NET.Core/Positioning/Rectangle.cs
+++ b/RGB.NET.Core/Positioning/Rectangle.cs
@@ -192,7 +192,7 @@ namespace RGB.NET.Core
             if (IsEmpty || intersectingRect.IsEmpty) return 0;
 
             Rectangle intersection = CalculateIntersection(intersectingRect);
-            return intersection.IsEmpty ? 0 : (intersection.Size.Width * intersection.Size.Height) / (Size.Width * Size.Height);
+            return (intersection.Size.Width * intersection.Size.Height) / (Size.Width * Size.Height);
         }
 
         /// <summary>
diff --git a/RGB.NET.Devices.CoolerMaster/Generic/CoolerMasterRGBDevice.cs b/RGB.NET.Devices.CoolerMaster/Generic/CoolerMasterRGBDevice.cs
index be2789c..374ea48 100644
--- a/RGB.NET.Devices.CoolerMaster/Generic/CoolerMasterRGBDevice.cs
+++ b/RGB.NET.Devices.CoolerMaster/Generic/CoolerMasterRGBDevice.cs
@@ -9,7 +9,7 @@ using RGB.NET.Devices.CoolerMaster.Native;
 namespace RGB.NET.Devices.CoolerMaster
 {
     /// <summary>
-    /// Represents a generic CoolerMaster-device. (keyboard, mouse, headset, mousmat).
+    /// Represents a generic CoolerMaster-device. (keyboard, mouse, headset, mousepad).
     /// </summary>
     public abstract class CoolerMasterRGBDevice : AbstractRGBDevice
     {
diff --git a/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs b/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
index d1bbdb4..a29af8d 100644
--- a/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
+++ b/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
@@ -161,8 +161,8 @@ namespace RGB.NET.Devices.Corsair
                     case CorsairDeviceType.Headset:
                         device = new CorsairHeadsetRGBDevice(new CorsairHeadsetRGBDeviceInfo(i, nativeDeviceInfo));
                         break;
-                    case CorsairDeviceType.Mousemat:
-                        device = new CorsairMousematRGBDevice(new CorsairMousematRGBDeviceInfo(i, nativeDeviceInfo));
+                    case CorsairDeviceType.Mousepad:
+                        device = new CorsairMousepadRGBDevice(new CorsairMousepadRGBDeviceInfo(i, nativeDeviceInfo));
                         break;
                     // ReSharper disable once RedundantCaseLabel
                     case CorsairDeviceType.Unknown:
diff --git a/RGB.NET.Devices.Corsair/Enum/CorsairDeviceType.cs b/RGB.NET.Devices.Corsair/Enum/CorsairDeviceType.cs
index ffa502b..4892fc6 100644
--- a/RGB.NET.Devices.Corsair/Enum/CorsairDeviceType.cs
+++ b/RGB.NET.Devices.Corsair/Enum/CorsairDeviceType.cs
@@ -15,6 +15,6 @@ namespace RGB.NET.Devices.Corsair
         Mouse = 1,
         Keyboard = 2,
         Headset = 3,
-        Mousemat = 4
+        Mousepad = 4
     };
 }
diff --git a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
index 31bcef5..7a71602 100644
--- a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
+++ b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
@@ -10,7 +10,7 @@ using RGB.NET.Devices.Corsair.Native;
 namespace RGB.NET.Devices.Corsair
 {
     /// <summary>
-    /// Represents a generic CUE-device. (keyboard, mouse, headset, mousmat).
+    /// Represents a generic CUE-device. (keyboard, mouse, headset, mousepad).
     /// </summary>
     public abstract class CorsairRGBDevice : AbstractRGBDevice
     {
diff --git a/RGB.NET.Devices.Corsair/Mousmat/CorsairMousematRGBDevice.cs b/RGB.NET.Devices.Corsair/Mousepad/CorsairMousepadRGBDevice.cs
similarity index 79%
rename from RGB.NET.Devices.Corsair/Mousmat/CorsairMousematRGBDevice.cs
rename to RGB.NET.Devices.Corsair/Mousepad/CorsairMousepadRGBDevice.cs
index e280293..098e21a 100644
--- a/RGB.NET.Devices.Corsair/Mousmat/CorsairMousematRGBDevice.cs
+++ b/RGB.NET.Devices.Corsair/Mousepad/CorsairMousepadRGBDevice.cs
@@ -11,29 +11,29 @@ using RGB.NET.Devices.Corsair.Native;
 namespace RGB.NET.Devices.Corsair
 {
     /// <summary>
-    /// Represents a corsair mousemat.
+    /// Represents a corsair mousepad.
     /// </summary>
-    public class CorsairMousematRGBDevice : CorsairRGBDevice
+    public class CorsairMousepadRGBDevice : CorsairRGBDevice
     {
         #region Properties & Fields
 
         /// <summary>
-        /// Gets information about the <see cref="CorsairMousematRGBDevice"/>.
+        /// Gets information about the <see cref="CorsairMousepadRGBDevice"/>.
         /// </summary>
-        public CorsairMousematRGBDeviceInfo MousematDeviceInfo { get; }
+        public CorsairMousepadRGBDeviceInfo MousepadDeviceInfo { get; }
 
         #endregion
 
         #region Constructors
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CorsairMousematRGBDevice"/> class.
+        /// Initializes a new instance of the <see cref="CorsairMousepadRGBDevice"/> class.
         /// </summary>
-        /// <param name="info">The specific information provided by CUE for the mousemat</param>
-        internal CorsairMousematRGBDevice(CorsairMousematRGBDeviceInfo info)
+        /// <param name="info">The specific information provided by CUE for the mousepad</param>
+        internal CorsairMousepadRGBDevice(CorsairMousepadRGBDeviceInfo info)
             : base(info)
         {
-            this.MousematDeviceInfo = info;
+            this.MousepadDeviceInfo = info;
         }
 
         #endregion
@@ -45,7 +45,7 @@ namespace RGB.NET.Devices.Corsair
         {
             _CorsairLedPositions nativeLedPositions =
                 (_CorsairLedPositions)
-                Marshal.PtrToStructure(_CUESDK.CorsairGetLedPositionsByDeviceIndex(MousematDeviceInfo.CorsairDeviceIndex),
+                Marshal.PtrToStructure(_CUESDK.CorsairGetLedPositionsByDeviceIndex(MousepadDeviceInfo.CorsairDeviceIndex),
                                        typeof(_CorsairLedPositions));
 
             int structSize = Marshal.SizeOf(typeof(_CorsairLedPosition));
@@ -63,8 +63,8 @@ namespace RGB.NET.Devices.Corsair
                 InitializeLed(new CorsairLedId(this, ledPosition.ledId),
                               new Rectangle(ledPosition.left, ledPosition.top, ledPosition.width, ledPosition.height));
 
-            ApplyLayoutFromFile(PathHelper.GetAbsolutePath($@"Layouts\Corsair\Mousemats\{MousematDeviceInfo.Model.Replace(" ", string.Empty).ToUpper()}.xml"),
-                null, PathHelper.GetAbsolutePath(@"Images\Corsair\Mousemats"));
+            ApplyLayoutFromFile(PathHelper.GetAbsolutePath($@"Layouts\Corsair\Mousepads\{MousepadDeviceInfo.Model.Replace(" ", string.Empty).ToUpper()}.xml"),
+                null, PathHelper.GetAbsolutePath(@"Images\Corsair\Mousepads"));
         }
 
         #endregion
diff --git a/RGB.NET.Devices.Corsair/Mousmat/CorsairMousematRGBDeviceInfo.cs b/RGB.NET.Devices.Corsair/Mousepad/CorsairMousepadRGBDeviceInfo.cs
similarity index 67%
rename from RGB.NET.Devices.Corsair/Mousmat/CorsairMousematRGBDeviceInfo.cs
rename to RGB.NET.Devices.Corsair/Mousepad/CorsairMousepadRGBDeviceInfo.cs
index fd5463b..f7eec20 100644
--- a/RGB.NET.Devices.Corsair/Mousmat/CorsairMousematRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.Corsair/Mousepad/CorsairMousepadRGBDeviceInfo.cs
@@ -5,21 +5,21 @@ using RGB.NET.Devices.Corsair.Native;
 namespace RGB.NET.Devices.Corsair
 {
     /// <summary>
-    /// Represents a generic information for a <see cref="CorsairMousematRGBDevice"/>.
+    /// Represents a generic information for a <see cref="CorsairMousepadRGBDevice"/>.
     /// </summary>
-    public class CorsairMousematRGBDeviceInfo : CorsairRGBDeviceInfo
+    public class CorsairMousepadRGBDeviceInfo : CorsairRGBDeviceInfo
     {
         #region Constructors
 
         /// <summary>
-        /// Internal constructor of managed <see cref="CorsairMousematRGBDeviceInfo"/>.
+        /// Internal constructor of managed <see cref="CorsairMousepadRGBDeviceInfo"/>.
         /// </summary>
-        /// <param name="deviceIndex">The index if the <see cref="CorsairMousematRGBDevice"/>.</param>
+        /// <param name="deviceIndex">The index if the <see cref="CorsairMousepadRGBDevice"/>.</param>
         /// <param name="nativeInfo">The native <see cref="_CorsairDeviceInfo" />-struct</param>
-        internal CorsairMousematRGBDeviceInfo(int deviceIndex, _CorsairDeviceInfo nativeInfo)
-            : base(deviceIndex, RGBDeviceType.Mousemat, nativeInfo)
+        internal CorsairMousepadRGBDeviceInfo(int deviceIndex, _CorsairDeviceInfo nativeInfo)
+            : base(deviceIndex, RGBDeviceType.Mousepad, nativeInfo)
         {
-            Image = new Uri(PathHelper.GetAbsolutePath($@"Images\Corsair\Mousemat\{Model.Replace(" ", string.Empty).ToUpper()}.png"), UriKind.Absolute);
+            Image = new Uri(PathHelper.GetAbsolutePath($@"Images\Corsair\Mousepad\{Model.Replace(" ", string.Empty).ToUpper()}.png"), UriKind.Absolute);
         }
 
         #endregion
diff --git a/RGB.NET.Devices.Corsair/Native/_CUESDK.cs b/RGB.NET.Devices.Corsair/Native/_CUESDK.cs
index ebe94d8..b7b20c7 100644
--- a/RGB.NET.Devices.Corsair/Native/_CUESDK.cs
+++ b/RGB.NET.Devices.Corsair/Native/_CUESDK.cs
@@ -160,7 +160,7 @@ namespace RGB.NET.Devices.Corsair.Native
         }
 
         /// <summary>
-        /// CUE-SDK: provides list of keyboard or mousemat LEDs with their physical positions.
+        /// CUE-SDK: provides list of keyboard or mousepad LEDs with their physical positions.
         /// </summary>
         internal static IntPtr CorsairGetLedPositionsByDeviceIndex(int deviceIndex)
         {
diff --git a/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj b/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj
index f81da5a..d7a53f8 100644
--- a/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj
+++ b/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj
@@ -65,8 +65,8 @@
     <Compile Include="Keyboard\CorsairKeyboardRGBDeviceInfo.cs" />
     <Compile Include="Mouse\CorsairMouseRGBDevice.cs" />
     <Compile Include="Mouse\CorsairMouseRGBDeviceInfo.cs" />
-    <Compile Include="Mousmat\CorsairMousematRGBDevice.cs" />
-    <Compile Include="Mousmat\CorsairMousematRGBDeviceInfo.cs" />
+    <Compile Include="Mousepad\CorsairMousepadRGBDevice.cs" />
+    <Compile Include="Mousepad\CorsairMousepadRGBDeviceInfo.cs" />
     <Compile Include="Native\_CorsairDeviceInfo.cs" />
     <Compile Include="Native\_CorsairLedColor.cs" />
     <Compile Include="Native\_CorsairLedPosition.cs" />
@@ -89,10 +89,10 @@
   <ItemGroup>
     <Folder Include="Images\Corsair\Headsets\" />
     <Folder Include="Images\Corsair\Mice\" />
-    <Folder Include="Images\Corsair\Mousemats\" />
+    <Folder Include="Images\Corsair\Mousepads\" />
     <Folder Include="Layouts\Corsair\Headsets\" />
     <Folder Include="Layouts\Corsair\Mice\" />
-    <Folder Include="Layouts\Corsair\Mousemats\" />
+    <Folder Include="Layouts\Corsair\Mousepads\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Images\Corsair\Keyboards\K70RGB.png" />
diff --git a/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj.DotSettings b/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj.DotSettings
index a5c99b2..0ba3335 100644
--- a/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj.DotSettings
+++ b/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj.DotSettings
@@ -1,5 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=libs/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=mousepad/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=native/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=mousmat/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=mouse/@EntryIndexedValue">True</s:Boolean>
diff --git a/RGB.NET.Devices.Logitech/Generic/LogitechRGBDevice.cs b/RGB.NET.Devices.Logitech/Generic/LogitechRGBDevice.cs
index 9e3981c..ff13901 100644
--- a/RGB.NET.Devices.Logitech/Generic/LogitechRGBDevice.cs
+++ b/RGB.NET.Devices.Logitech/Generic/LogitechRGBDevice.cs
@@ -9,7 +9,7 @@ using RGB.NET.Devices.Logitech.Native;
 namespace RGB.NET.Devices.Logitech
 {
     /// <summary>
-    /// Represents a generic Logitech-device. (keyboard, mouse, headset, mousmat).
+    /// Represents a generic Logitech-device. (keyboard, mouse, headset, mousepad).
     /// </summary>
     public abstract class LogitechRGBDevice : AbstractRGBDevice
     {