diff --git a/README.md b/README.md
index 9441bce..1d10be3 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,11 @@ Elgato just released their [Official Stream Deck SDK](https://developer.elgato.c
 ## What's New
 Added support for new Stream Deck+ SDK
 
+## Breaking Changes
+
+- `streamdeck_client_csharp` namespace has been changed to `StreamDeck.Client`.
+
+
 ## Requirements
 This library uses the native WebSocket support found in Windows 8 & higher. This means that any application that uses this library must be running Windows 8 or higher.
 
diff --git a/TestPlugin/Program.cs b/TestPlugin/Program.cs
index 994d972..6855404 100644
--- a/TestPlugin/Program.cs
+++ b/TestPlugin/Program.cs
@@ -2,8 +2,8 @@
 using CommandLine.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using streamdeck_client_csharp;
-using streamdeck_client_csharp.Events;
+using StreamDeck.Client;
+using StreamDeck.Client.Events;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
diff --git a/streamdeck-client-csharp/Event.cs b/streamdeck-client-csharp/Event.cs
index e9cc382..252065a 100644
--- a/streamdeck-client-csharp/Event.cs
+++ b/streamdeck-client-csharp/Event.cs
@@ -1,4 +1,4 @@
-namespace streamdeck_client_csharp
+namespace StreamDeck.Client
 {
     internal class Event
     {
diff --git a/streamdeck-client-csharp/Events/AppearancePayload.cs b/streamdeck-client-csharp/Events/AppearancePayload.cs
index b4270c8..cc1698b 100644
--- a/streamdeck-client-csharp/Events/AppearancePayload.cs
+++ b/streamdeck-client-csharp/Events/AppearancePayload.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class AppearancePayload
     {
diff --git a/streamdeck-client-csharp/Events/ApplicationDidLaunchEvent.cs b/streamdeck-client-csharp/Events/ApplicationDidLaunchEvent.cs
index 284d1f5..4c4c6ec 100644
--- a/streamdeck-client-csharp/Events/ApplicationDidLaunchEvent.cs
+++ b/streamdeck-client-csharp/Events/ApplicationDidLaunchEvent.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class ApplicationDidLaunchEvent : BaseEvent
     {
diff --git a/streamdeck-client-csharp/Events/ApplicationDidTerminateEvent.cs b/streamdeck-client-csharp/Events/ApplicationDidTerminateEvent.cs
index a70fdde..418a8c6 100644
--- a/streamdeck-client-csharp/Events/ApplicationDidTerminateEvent.cs
+++ b/streamdeck-client-csharp/Events/ApplicationDidTerminateEvent.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class ApplicationDidTerminateEvent : BaseEvent
     {
diff --git a/streamdeck-client-csharp/Events/ApplicationPayload.cs b/streamdeck-client-csharp/Events/ApplicationPayload.cs
index d7d4f75..ef2d474 100644
--- a/streamdeck-client-csharp/Events/ApplicationPayload.cs
+++ b/streamdeck-client-csharp/Events/ApplicationPayload.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class ApplicationPayload
     {
diff --git a/streamdeck-client-csharp/Events/BaseEvent.cs b/streamdeck-client-csharp/Events/BaseEvent.cs
index c62f5a1..e078fa1 100644
--- a/streamdeck-client-csharp/Events/BaseEvent.cs
+++ b/streamdeck-client-csharp/Events/BaseEvent.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public static class EventTypes
     {
diff --git a/streamdeck-client-csharp/Events/Coordinates.cs b/streamdeck-client-csharp/Events/Coordinates.cs
index ebf0434..830808a 100644
--- a/streamdeck-client-csharp/Events/Coordinates.cs
+++ b/streamdeck-client-csharp/Events/Coordinates.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class Coordinates
     {
diff --git a/streamdeck-client-csharp/Events/DeviceDidConnectEvent.cs b/streamdeck-client-csharp/Events/DeviceDidConnectEvent.cs
index 1986dbf..b082ad9 100644
--- a/streamdeck-client-csharp/Events/DeviceDidConnectEvent.cs
+++ b/streamdeck-client-csharp/Events/DeviceDidConnectEvent.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class DeviceDidConnectEvent : BaseEvent
     {
diff --git a/streamdeck-client-csharp/Events/DeviceDidDisconnectEvent.cs b/streamdeck-client-csharp/Events/DeviceDidDisconnectEvent.cs
index f986dba..f430d7d 100644
--- a/streamdeck-client-csharp/Events/DeviceDidDisconnectEvent.cs
+++ b/streamdeck-client-csharp/Events/DeviceDidDisconnectEvent.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class DeviceDidDisconnectEvent : BaseEvent
     {
diff --git a/streamdeck-client-csharp/Events/DeviceInfo.cs b/streamdeck-client-csharp/Events/DeviceInfo.cs
index b77944f..2668a07 100644
--- a/streamdeck-client-csharp/Events/DeviceInfo.cs
+++ b/streamdeck-client-csharp/Events/DeviceInfo.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class DeviceInfo
     {
diff --git a/streamdeck-client-csharp/Events/DeviceSize.cs b/streamdeck-client-csharp/Events/DeviceSize.cs
index f853586..5cebd66 100644
--- a/streamdeck-client-csharp/Events/DeviceSize.cs
+++ b/streamdeck-client-csharp/Events/DeviceSize.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class DeviceSize
     {
diff --git a/streamdeck-client-csharp/Events/DeviceType.cs b/streamdeck-client-csharp/Events/DeviceType.cs
index c71c061..fec43c9 100644
--- a/streamdeck-client-csharp/Events/DeviceType.cs
+++ b/streamdeck-client-csharp/Events/DeviceType.cs
@@ -1,4 +1,4 @@
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public enum DeviceType : int
     {
diff --git a/streamdeck-client-csharp/Events/DialPressEvent.cs b/streamdeck-client-csharp/Events/DialPressEvent.cs
index 7d7bdd3..dd8105c 100644
--- a/streamdeck-client-csharp/Events/DialPressEvent.cs
+++ b/streamdeck-client-csharp/Events/DialPressEvent.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     /// <summary>
     /// Payload for Dial press/unpress event
diff --git a/streamdeck-client-csharp/Events/DialPressPayload.cs b/streamdeck-client-csharp/Events/DialPressPayload.cs
index 4b6b83a..15cd27a 100644
--- a/streamdeck-client-csharp/Events/DialPressPayload.cs
+++ b/streamdeck-client-csharp/Events/DialPressPayload.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     /// <summary>
     /// Payload received when a dial is pressed or unpressed
diff --git a/streamdeck-client-csharp/Events/DialRotateEvent.cs b/streamdeck-client-csharp/Events/DialRotateEvent.cs
index 2ae0217..1d16632 100644
--- a/streamdeck-client-csharp/Events/DialRotateEvent.cs
+++ b/streamdeck-client-csharp/Events/DialRotateEvent.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     /// <summary>
     /// Payload for dial rotation event
diff --git a/streamdeck-client-csharp/Events/DialRotatePayload.cs b/streamdeck-client-csharp/Events/DialRotatePayload.cs
index 9572db6..e95dea7 100644
--- a/streamdeck-client-csharp/Events/DialRotatePayload.cs
+++ b/streamdeck-client-csharp/Events/DialRotatePayload.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     /// <summary>
     /// Payload received when a dial is rotated
diff --git a/streamdeck-client-csharp/Events/DidReceiveGlobalSettingsEvent.cs b/streamdeck-client-csharp/Events/DidReceiveGlobalSettingsEvent.cs
index 4c2de2d..24652ff 100644
--- a/streamdeck-client-csharp/Events/DidReceiveGlobalSettingsEvent.cs
+++ b/streamdeck-client-csharp/Events/DidReceiveGlobalSettingsEvent.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class DidReceiveGlobalSettingsEvent : BaseEvent
     {
diff --git a/streamdeck-client-csharp/Events/DidReceiveSettingsEvent.cs b/streamdeck-client-csharp/Events/DidReceiveSettingsEvent.cs
index 0dbb041..2c23f5d 100644
--- a/streamdeck-client-csharp/Events/DidReceiveSettingsEvent.cs
+++ b/streamdeck-client-csharp/Events/DidReceiveSettingsEvent.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class DidReceiveSettingsEvent : BaseEvent
     {
diff --git a/streamdeck-client-csharp/Events/KeyDownEvent.cs b/streamdeck-client-csharp/Events/KeyDownEvent.cs
index ea7f0f7..e16d862 100644
--- a/streamdeck-client-csharp/Events/KeyDownEvent.cs
+++ b/streamdeck-client-csharp/Events/KeyDownEvent.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class KeyDownEvent : BaseEvent
     {
diff --git a/streamdeck-client-csharp/Events/KeyPayload.cs b/streamdeck-client-csharp/Events/KeyPayload.cs
index 19b9631..a14a9d6 100644
--- a/streamdeck-client-csharp/Events/KeyPayload.cs
+++ b/streamdeck-client-csharp/Events/KeyPayload.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class KeyPayload
     {
diff --git a/streamdeck-client-csharp/Events/KeyUpEvent.cs b/streamdeck-client-csharp/Events/KeyUpEvent.cs
index 967ed85..021c77f 100644
--- a/streamdeck-client-csharp/Events/KeyUpEvent.cs
+++ b/streamdeck-client-csharp/Events/KeyUpEvent.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class KeyUpEvent : BaseEvent
     {
diff --git a/streamdeck-client-csharp/Events/PropertyInspectorDidAppearEvent.cs b/streamdeck-client-csharp/Events/PropertyInspectorDidAppearEvent.cs
index 782b40b..760c46f 100644
--- a/streamdeck-client-csharp/Events/PropertyInspectorDidAppearEvent.cs
+++ b/streamdeck-client-csharp/Events/PropertyInspectorDidAppearEvent.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class PropertyInspectorDidAppearEvent : BaseEvent
     {
diff --git a/streamdeck-client-csharp/Events/PropertyInspectorDidDisappearEvent.cs b/streamdeck-client-csharp/Events/PropertyInspectorDidDisappearEvent.cs
index 58b4873..3837d10 100644
--- a/streamdeck-client-csharp/Events/PropertyInspectorDidDisappearEvent.cs
+++ b/streamdeck-client-csharp/Events/PropertyInspectorDidDisappearEvent.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class PropertyInspectorDidDisappearEvent : BaseEvent
     {
diff --git a/streamdeck-client-csharp/Events/ReceiveGlobalSettingsPayload.cs b/streamdeck-client-csharp/Events/ReceiveGlobalSettingsPayload.cs
index 79636a4..e2f1c3b 100644
--- a/streamdeck-client-csharp/Events/ReceiveGlobalSettingsPayload.cs
+++ b/streamdeck-client-csharp/Events/ReceiveGlobalSettingsPayload.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class ReceiveGlobalSettingsPayload
     {
diff --git a/streamdeck-client-csharp/Events/ReceiveSettingsPayload.cs b/streamdeck-client-csharp/Events/ReceiveSettingsPayload.cs
index ee86b60..96a4ffa 100644
--- a/streamdeck-client-csharp/Events/ReceiveSettingsPayload.cs
+++ b/streamdeck-client-csharp/Events/ReceiveSettingsPayload.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class ReceiveSettingsPayload
     {
diff --git a/streamdeck-client-csharp/Events/SendToPluginEvent.cs b/streamdeck-client-csharp/Events/SendToPluginEvent.cs
index ca36b5a..2c8f3c9 100644
--- a/streamdeck-client-csharp/Events/SendToPluginEvent.cs
+++ b/streamdeck-client-csharp/Events/SendToPluginEvent.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class SendToPluginEvent : BaseEvent
     {
diff --git a/streamdeck-client-csharp/Events/SystemDidWakeUpEvent.cs b/streamdeck-client-csharp/Events/SystemDidWakeUpEvent.cs
index 98bf35f..28a648d 100644
--- a/streamdeck-client-csharp/Events/SystemDidWakeUpEvent.cs
+++ b/streamdeck-client-csharp/Events/SystemDidWakeUpEvent.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     /// <summary>
     /// Payload for SystemDidWakeUp event
diff --git a/streamdeck-client-csharp/Events/TitleParameters.cs b/streamdeck-client-csharp/Events/TitleParameters.cs
index 4030f10..4a15ced 100644
--- a/streamdeck-client-csharp/Events/TitleParameters.cs
+++ b/streamdeck-client-csharp/Events/TitleParameters.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class TitleParameters
     {
diff --git a/streamdeck-client-csharp/Events/TitleParametersDidChangeEvent.cs b/streamdeck-client-csharp/Events/TitleParametersDidChangeEvent.cs
index ea76d7a..b4f74b2 100644
--- a/streamdeck-client-csharp/Events/TitleParametersDidChangeEvent.cs
+++ b/streamdeck-client-csharp/Events/TitleParametersDidChangeEvent.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class TitleParametersDidChangeEvent : BaseEvent
     {
diff --git a/streamdeck-client-csharp/Events/TitleParametersPayload.cs b/streamdeck-client-csharp/Events/TitleParametersPayload.cs
index 084df80..34edf9f 100644
--- a/streamdeck-client-csharp/Events/TitleParametersPayload.cs
+++ b/streamdeck-client-csharp/Events/TitleParametersPayload.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class TitleParametersPayload
     {
diff --git a/streamdeck-client-csharp/Events/TouchpadPressEvent.cs b/streamdeck-client-csharp/Events/TouchpadPressEvent.cs
index 0f265aa..3eff392 100644
--- a/streamdeck-client-csharp/Events/TouchpadPressEvent.cs
+++ b/streamdeck-client-csharp/Events/TouchpadPressEvent.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     /// <summary>
     /// Payload for touchpad press
diff --git a/streamdeck-client-csharp/Events/TouchpadPressPayload.cs b/streamdeck-client-csharp/Events/TouchpadPressPayload.cs
index 746df4e..a07cf41 100644
--- a/streamdeck-client-csharp/Events/TouchpadPressPayload.cs
+++ b/streamdeck-client-csharp/Events/TouchpadPressPayload.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     /// <summary>
     /// Payload received when the touchpad (above the dials) is pressed
diff --git a/streamdeck-client-csharp/Events/WillAppearEvent.cs b/streamdeck-client-csharp/Events/WillAppearEvent.cs
index 1ffbe7f..6c1635a 100644
--- a/streamdeck-client-csharp/Events/WillAppearEvent.cs
+++ b/streamdeck-client-csharp/Events/WillAppearEvent.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class WillAppearEvent : BaseEvent
     {
diff --git a/streamdeck-client-csharp/Events/WillDisappearEvent.cs b/streamdeck-client-csharp/Events/WillDisappearEvent.cs
index 8cc2b89..95add0a 100644
--- a/streamdeck-client-csharp/Events/WillDisappearEvent.cs
+++ b/streamdeck-client-csharp/Events/WillDisappearEvent.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Events
+namespace StreamDeck.Client.Events
 {
     public class WillDisappearEvent : BaseEvent
     {
diff --git a/streamdeck-client-csharp/IPayload.cs b/streamdeck-client-csharp/IPayload.cs
index cf6a032..5a3cfba 100644
--- a/streamdeck-client-csharp/IPayload.cs
+++ b/streamdeck-client-csharp/IPayload.cs
@@ -1,4 +1,4 @@
-namespace streamdeck_client_csharp
+namespace StreamDeck.Client
 {
     internal interface IPayload
     {
diff --git a/streamdeck-client-csharp/Messages/EmptyPayload.cs b/streamdeck-client-csharp/Messages/EmptyPayload.cs
index 6cc8869..8683206 100644
--- a/streamdeck-client-csharp/Messages/EmptyPayload.cs
+++ b/streamdeck-client-csharp/Messages/EmptyPayload.cs
@@ -1,4 +1,4 @@
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     public class EmptyPayload : IPayload
     {
diff --git a/streamdeck-client-csharp/Messages/GetGlobalSettingsMessage.cs b/streamdeck-client-csharp/Messages/GetGlobalSettingsMessage.cs
index 4725a0f..1c74674 100644
--- a/streamdeck-client-csharp/Messages/GetGlobalSettingsMessage.cs
+++ b/streamdeck-client-csharp/Messages/GetGlobalSettingsMessage.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class GetGlobalSettingsMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/GetSettingsMessage.cs b/streamdeck-client-csharp/Messages/GetSettingsMessage.cs
index 83f5ca5..c82d729 100644
--- a/streamdeck-client-csharp/Messages/GetSettingsMessage.cs
+++ b/streamdeck-client-csharp/Messages/GetSettingsMessage.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class GetSettingsMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/IMessage.cs b/streamdeck-client-csharp/Messages/IMessage.cs
index 9f3c941..99c4c24 100644
--- a/streamdeck-client-csharp/Messages/IMessage.cs
+++ b/streamdeck-client-csharp/Messages/IMessage.cs
@@ -1,4 +1,4 @@
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal interface IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/LogMessage.cs b/streamdeck-client-csharp/Messages/LogMessage.cs
index e583af5..8c86175 100644
--- a/streamdeck-client-csharp/Messages/LogMessage.cs
+++ b/streamdeck-client-csharp/Messages/LogMessage.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class LogMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/OpenUrlMessage.cs b/streamdeck-client-csharp/Messages/OpenUrlMessage.cs
index 3b2abb0..79209fa 100644
--- a/streamdeck-client-csharp/Messages/OpenUrlMessage.cs
+++ b/streamdeck-client-csharp/Messages/OpenUrlMessage.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class OpenUrlMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/RegisterEventMessage.cs b/streamdeck-client-csharp/Messages/RegisterEventMessage.cs
index 68232ab..b19c253 100644
--- a/streamdeck-client-csharp/Messages/RegisterEventMessage.cs
+++ b/streamdeck-client-csharp/Messages/RegisterEventMessage.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class RegisterEventMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/SendToPropertyInspectorMessage.cs b/streamdeck-client-csharp/Messages/SendToPropertyInspectorMessage.cs
index 5a16afe..f5aed2a 100644
--- a/streamdeck-client-csharp/Messages/SendToPropertyInspectorMessage.cs
+++ b/streamdeck-client-csharp/Messages/SendToPropertyInspectorMessage.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class SendToPropertyInspectorMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/SetFeedbackLayoutMessage.cs b/streamdeck-client-csharp/Messages/SetFeedbackLayoutMessage.cs
index f05dc4d..6445787 100644
--- a/streamdeck-client-csharp/Messages/SetFeedbackLayoutMessage.cs
+++ b/streamdeck-client-csharp/Messages/SetFeedbackLayoutMessage.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class SetFeedbackLayoutMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/SetFeedbackMessage.cs b/streamdeck-client-csharp/Messages/SetFeedbackMessage.cs
index f585fc0..ab43ecb 100644
--- a/streamdeck-client-csharp/Messages/SetFeedbackMessage.cs
+++ b/streamdeck-client-csharp/Messages/SetFeedbackMessage.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class SetFeedbackMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/SetFeedbackMessageEx.cs b/streamdeck-client-csharp/Messages/SetFeedbackMessageEx.cs
index 217061e..f21c0ad 100644
--- a/streamdeck-client-csharp/Messages/SetFeedbackMessageEx.cs
+++ b/streamdeck-client-csharp/Messages/SetFeedbackMessageEx.cs
@@ -2,7 +2,7 @@
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class SetFeedbackMessageEx : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/SetGlobalSettingsMessage.cs b/streamdeck-client-csharp/Messages/SetGlobalSettingsMessage.cs
index afbbd4e..a7fb19a 100644
--- a/streamdeck-client-csharp/Messages/SetGlobalSettingsMessage.cs
+++ b/streamdeck-client-csharp/Messages/SetGlobalSettingsMessage.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class SetGlobalSettingsMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/SetImageMessage.cs b/streamdeck-client-csharp/Messages/SetImageMessage.cs
index 545332f..d893199 100644
--- a/streamdeck-client-csharp/Messages/SetImageMessage.cs
+++ b/streamdeck-client-csharp/Messages/SetImageMessage.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class SetImageMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/SetSettingsMessage.cs b/streamdeck-client-csharp/Messages/SetSettingsMessage.cs
index adaa73f..9c74b8f 100644
--- a/streamdeck-client-csharp/Messages/SetSettingsMessage.cs
+++ b/streamdeck-client-csharp/Messages/SetSettingsMessage.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class SetSettingsMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/SetStateMessage.cs b/streamdeck-client-csharp/Messages/SetStateMessage.cs
index c461c03..7bbf50d 100644
--- a/streamdeck-client-csharp/Messages/SetStateMessage.cs
+++ b/streamdeck-client-csharp/Messages/SetStateMessage.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class SetStateMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/SetTitleMessage.cs b/streamdeck-client-csharp/Messages/SetTitleMessage.cs
index ec9f137..b38cffa 100644
--- a/streamdeck-client-csharp/Messages/SetTitleMessage.cs
+++ b/streamdeck-client-csharp/Messages/SetTitleMessage.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class SetTitleMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/ShowAlertMessage.cs b/streamdeck-client-csharp/Messages/ShowAlertMessage.cs
index 50b25f4..667756c 100644
--- a/streamdeck-client-csharp/Messages/ShowAlertMessage.cs
+++ b/streamdeck-client-csharp/Messages/ShowAlertMessage.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class ShowAlertMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/ShowOkMessage.cs b/streamdeck-client-csharp/Messages/ShowOkMessage.cs
index 8cc082f..c3e1b9c 100644
--- a/streamdeck-client-csharp/Messages/ShowOkMessage.cs
+++ b/streamdeck-client-csharp/Messages/ShowOkMessage.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class ShowOkMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/Messages/SwitchToProfileMessage.cs b/streamdeck-client-csharp/Messages/SwitchToProfileMessage.cs
index 847e63b..9bb081b 100644
--- a/streamdeck-client-csharp/Messages/SwitchToProfileMessage.cs
+++ b/streamdeck-client-csharp/Messages/SwitchToProfileMessage.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace streamdeck_client_csharp.Messages
+namespace StreamDeck.Client.Messages
 {
     internal class SwitchToProfileMessage : IMessage
     {
diff --git a/streamdeck-client-csharp/SDKTarget.cs b/streamdeck-client-csharp/SDKTarget.cs
index 0b6fbed..7689eda 100644
--- a/streamdeck-client-csharp/SDKTarget.cs
+++ b/streamdeck-client-csharp/SDKTarget.cs
@@ -1,4 +1,4 @@
-namespace streamdeck_client_csharp
+namespace StreamDeck.Client
 {
     public enum SDKTarget : int
     {
diff --git a/streamdeck-client-csharp/StreamDeckConnection.cs b/streamdeck-client-csharp/StreamDeckConnection.cs
index 5d9434e..de70d1e 100644
--- a/streamdeck-client-csharp/StreamDeckConnection.cs
+++ b/streamdeck-client-csharp/StreamDeckConnection.cs
@@ -1,7 +1,5 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using streamdeck_client_csharp.Events;
-using streamdeck_client_csharp.Messages;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -11,8 +9,10 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using StreamDeck.Client.Events;
+using StreamDeck.Client.Messages;
 
-namespace streamdeck_client_csharp
+namespace StreamDeck.Client
 {
     public class StreamDeckConnection
     {
diff --git a/streamdeck-client-csharp/StreamDeckEventReceivedEventArgs.cs b/streamdeck-client-csharp/StreamDeckEventReceivedEventArgs.cs
index ed00cc6..d278508 100644
--- a/streamdeck-client-csharp/StreamDeckEventReceivedEventArgs.cs
+++ b/streamdeck-client-csharp/StreamDeckEventReceivedEventArgs.cs
@@ -1,7 +1,7 @@
-using streamdeck_client_csharp.Events;
+using StreamDeck.Client.Events;
 using System;
 
-namespace streamdeck_client_csharp
+namespace StreamDeck.Client
 {
     public class StreamDeckEventReceivedEventArgs<T> : EventArgs
     {