diff --git a/QSB/Animation/Events/ChangeAnimTypeEvent.cs b/QSB/Animation/Events/ChangeAnimTypeEvent.cs
index c979ed3c..1913e8c3 100644
--- a/QSB/Animation/Events/ChangeAnimTypeEvent.cs
+++ b/QSB/Animation/Events/ChangeAnimTypeEvent.cs
@@ -1,6 +1,6 @@
 using QSB.Events;
 using QSB.Instruments;
-using QSB.Messages;
+using QSB.Messaging;
 using QSB.Player;
 
 namespace QSB.Animation.Events
diff --git a/QSB/Animation/Events/CrouchEvent.cs b/QSB/Animation/Events/CrouchEvent.cs
index f0d07d3e..ff3afda8 100644
--- a/QSB/Animation/Events/CrouchEvent.cs
+++ b/QSB/Animation/Events/CrouchEvent.cs
@@ -1,5 +1,5 @@
 using QSB.Events;
-using QSB.Messages;
+using QSB.Messaging;
 using QSB.Player;
 
 namespace QSB.Animation.Events
diff --git a/QSB/Animation/Events/PlayerSuitEvent.cs b/QSB/Animation/Events/PlayerSuitEvent.cs
index b9489b7d..438df5fe 100644
--- a/QSB/Animation/Events/PlayerSuitEvent.cs
+++ b/QSB/Animation/Events/PlayerSuitEvent.cs
@@ -1,5 +1,5 @@
 using QSB.Events;
-using QSB.Messages;
+using QSB.Messaging;
 using QSB.Player;
 
 namespace QSB.Animation
diff --git a/QSB/ConversationSync/Events/ConversationMessage.cs b/QSB/ConversationSync/Events/ConversationMessage.cs
index 3db5e107..206072c0 100644
--- a/QSB/ConversationSync/Events/ConversationMessage.cs
+++ b/QSB/ConversationSync/Events/ConversationMessage.cs
@@ -1,4 +1,4 @@
-using QSB.Messages;
+using QSB.Messaging;
 using QuantumUNET;
 
 namespace QSB.ConversationSync.Events
diff --git a/QSB/ConversationSync/Events/ConversationStartEndMessage.cs b/QSB/ConversationSync/Events/ConversationStartEndMessage.cs
index 1b7c833b..75db950d 100644
--- a/QSB/ConversationSync/Events/ConversationStartEndMessage.cs
+++ b/QSB/ConversationSync/Events/ConversationStartEndMessage.cs
@@ -1,4 +1,4 @@
-using QSB.Messages;
+using QSB.Messaging;
 using QuantumUNET;
 
 namespace QSB.ConversationSync.Events
diff --git a/QSB/DeathSync/Events/PlayerDeathEvent.cs b/QSB/DeathSync/Events/PlayerDeathEvent.cs
index 9abda66f..0bd9b0ea 100644
--- a/QSB/DeathSync/Events/PlayerDeathEvent.cs
+++ b/QSB/DeathSync/Events/PlayerDeathEvent.cs
@@ -1,5 +1,5 @@
 using QSB.Events;
-using QSB.Messages;
+using QSB.Messaging;
 using QSB.Player;
 using QSB.Utility;
 
diff --git a/QSB/DialogueConditionSync/Events/DialogueConditionMessage.cs b/QSB/DialogueConditionSync/Events/DialogueConditionMessage.cs
index 24ba88e5..3d4252e9 100644
--- a/QSB/DialogueConditionSync/Events/DialogueConditionMessage.cs
+++ b/QSB/DialogueConditionSync/Events/DialogueConditionMessage.cs
@@ -1,4 +1,4 @@
-using QSB.Messages;
+using QSB.Messaging;
 using QuantumUNET;
 
 namespace QSB.DialogueConditionSync.Events
diff --git a/QSB/Events/QSBEvent.cs b/QSB/Events/QSBEvent.cs
index c94e1071..cb4c4a06 100644
--- a/QSB/Events/QSBEvent.cs
+++ b/QSB/Events/QSBEvent.cs
@@ -1,4 +1,4 @@
-using QSB.Messages;
+using QSB.Messaging;
 using QSB.Player;
 using QSB.TransformSync;
 using QuantumUNET;
diff --git a/QSB/Messages/EnumMessage.cs b/QSB/Messaging/EnumMessage.cs
similarity index 84%
rename from QSB/Messages/EnumMessage.cs
rename to QSB/Messaging/EnumMessage.cs
index b3f49d88..0624f836 100644
--- a/QSB/Messages/EnumMessage.cs
+++ b/QSB/Messaging/EnumMessage.cs
@@ -1,7 +1,6 @@
-using QSB.Messages;
-using QuantumUNET;
+using QuantumUNET;
 
-namespace QSB.Messages
+namespace QSB.Messaging
 {
 	public class EnumMessage<T> : PlayerMessage
 	{
diff --git a/QSB/Messages/FloatMessage.cs b/QSB/Messaging/FloatMessage.cs
similarity index 83%
rename from QSB/Messages/FloatMessage.cs
rename to QSB/Messaging/FloatMessage.cs
index b1a3802a..832c6a0c 100644
--- a/QSB/Messages/FloatMessage.cs
+++ b/QSB/Messaging/FloatMessage.cs
@@ -1,7 +1,6 @@
-using QSB.Messages;
-using QuantumUNET;
+using QuantumUNET;
 
-namespace QSB.Messages
+namespace QSB.Messaging
 {
 	public class FloatMessage : PlayerMessage
 	{
diff --git a/QSB/Messages/MessageHandler.cs b/QSB/Messaging/MessageHandler.cs
similarity index 98%
rename from QSB/Messages/MessageHandler.cs
rename to QSB/Messaging/MessageHandler.cs
index 6537ecf8..e81af7ae 100644
--- a/QSB/Messages/MessageHandler.cs
+++ b/QSB/Messaging/MessageHandler.cs
@@ -6,7 +6,7 @@ using QuantumUNET.Messages;
 using System;
 using System.Linq;
 
-namespace QSB.Messages
+namespace QSB.Messaging
 {
 	public class MessageHandler<T> where T : QSBMessageBase, new()
 	{
diff --git a/QSB/Messages/PlayerMessage.cs b/QSB/Messaging/PlayerMessage.cs
similarity index 95%
rename from QSB/Messages/PlayerMessage.cs
rename to QSB/Messaging/PlayerMessage.cs
index 6ee5c227..9fb00238 100644
--- a/QSB/Messages/PlayerMessage.cs
+++ b/QSB/Messaging/PlayerMessage.cs
@@ -1,7 +1,7 @@
 using QuantumUNET;
 using QuantumUNET.Messages;
 
-namespace QSB.Messages
+namespace QSB.Messaging
 {
 	public class PlayerMessage : QSBMessageBase
 	{
diff --git a/QSB/Messages/ToggleMessage.cs b/QSB/Messaging/ToggleMessage.cs
similarity index 94%
rename from QSB/Messages/ToggleMessage.cs
rename to QSB/Messaging/ToggleMessage.cs
index df4e8e73..0956b3b2 100644
--- a/QSB/Messages/ToggleMessage.cs
+++ b/QSB/Messaging/ToggleMessage.cs
@@ -1,6 +1,6 @@
 using QuantumUNET;
 
-namespace QSB.Messages
+namespace QSB.Messaging
 {
 	public class ToggleMessage : PlayerMessage
 	{
diff --git a/QSB/OrbSync/Events/OrbSlotMessage.cs b/QSB/OrbSync/Events/OrbSlotMessage.cs
index 1e36aeef..c25da215 100644
--- a/QSB/OrbSync/Events/OrbSlotMessage.cs
+++ b/QSB/OrbSync/Events/OrbSlotMessage.cs
@@ -1,4 +1,4 @@
-using QSB.Messages;
+using QSB.Messaging;
 using QuantumUNET;
 
 namespace QSB.OrbSync.Events
diff --git a/QSB/Player/Events/PlayerJoinMessage.cs b/QSB/Player/Events/PlayerJoinMessage.cs
index 1be50f5a..0e695424 100644
--- a/QSB/Player/Events/PlayerJoinMessage.cs
+++ b/QSB/Player/Events/PlayerJoinMessage.cs
@@ -1,4 +1,4 @@
-using QSB.Messages;
+using QSB.Messaging;
 using QuantumUNET;
 
 namespace QSB.Player.Events
diff --git a/QSB/Player/Events/PlayerReadyEvent.cs b/QSB/Player/Events/PlayerReadyEvent.cs
index efbed2ca..cec6b65f 100644
--- a/QSB/Player/Events/PlayerReadyEvent.cs
+++ b/QSB/Player/Events/PlayerReadyEvent.cs
@@ -1,6 +1,6 @@
 using OWML.Common;
 using QSB.Events;
-using QSB.Messages;
+using QSB.Messaging;
 using QSB.SectorSync;
 using QSB.Utility;
 using System.Linq;
diff --git a/QSB/Player/Events/PlayerStateMessage.cs b/QSB/Player/Events/PlayerStateMessage.cs
index 223325c8..7d2d341f 100644
--- a/QSB/Player/Events/PlayerStateMessage.cs
+++ b/QSB/Player/Events/PlayerStateMessage.cs
@@ -1,4 +1,4 @@
-using QSB.Messages;
+using QSB.Messaging;
 using QuantumUNET;
 
 namespace QSB.Player.Events
diff --git a/QSB/Player/Events/PlayerStatesRequestEvent.cs b/QSB/Player/Events/PlayerStatesRequestEvent.cs
index 6d6bbb20..b37086b4 100644
--- a/QSB/Player/Events/PlayerStatesRequestEvent.cs
+++ b/QSB/Player/Events/PlayerStatesRequestEvent.cs
@@ -1,5 +1,5 @@
 using QSB.Events;
-using QSB.Messages;
+using QSB.Messaging;
 using QSB.SectorSync;
 using QSB.Utility;
 using QSB.WorldSync;
diff --git a/QSB/QSB.csproj b/QSB/QSB.csproj
index 16020f55..7d77e6a6 100644
--- a/QSB/QSB.csproj
+++ b/QSB/QSB.csproj
@@ -150,8 +150,8 @@
     <Compile Include="Instruments\QSBCamera\CameraManager.cs" />
     <Compile Include="Instruments\QSBCamera\CameraMode.cs" />
     <Compile Include="Instruments\InstrumentsManager.cs" />
-    <Compile Include="Messages\EnumMessage.cs" />
-    <Compile Include="Messages\FloatMessage.cs" />
+    <Compile Include="Messaging\EnumMessage.cs" />
+    <Compile Include="Messaging\FloatMessage.cs" />
     <Compile Include="OrbSync\Events\OrbSlotMessage.cs" />
     <Compile Include="OrbSync\OrbManager.cs" />
     <Compile Include="OrbSync\Events\OrbSlotEvent.cs" />
@@ -186,7 +186,7 @@
     <Compile Include="Tools\Events\PlayerTranslatorEvent.cs" />
     <Compile Include="Events\QSBEvent.cs" />
     <Compile Include="Player\Events\PlayerJoinMessage.cs" />
-    <Compile Include="Messages\ToggleMessage.cs" />
+    <Compile Include="Messaging\ToggleMessage.cs" />
     <Compile Include="SectorSync\QSBSector.cs" />
     <Compile Include="SectorSync\QSBSectorManager.cs" />
     <Compile Include="TransformSync\TransformSync.cs" />
@@ -205,8 +205,8 @@
     <Compile Include="Player\Events\PlayerStateMessage.cs" />
     <Compile Include="DeathSync\Necronomicon.cs" />
     <Compile Include="Utility\DebugLog.cs" />
-    <Compile Include="Messages\PlayerMessage.cs" />
-    <Compile Include="Messages\MessageHandler.cs" />
+    <Compile Include="Messaging\PlayerMessage.cs" />
+    <Compile Include="Messaging\MessageHandler.cs" />
     <Compile Include="Events\EventType.cs" />
     <Compile Include="Player\PlayerInfo.cs" />
     <Compile Include="Player\State.cs" />
diff --git a/QSB/TimeSync/Events/ServerTimeMessage.cs b/QSB/TimeSync/Events/ServerTimeMessage.cs
index cd3de9ff..407d2bfc 100644
--- a/QSB/TimeSync/Events/ServerTimeMessage.cs
+++ b/QSB/TimeSync/Events/ServerTimeMessage.cs
@@ -1,4 +1,4 @@
-using QSB.Messages;
+using QSB.Messaging;
 using QuantumUNET;
 
 namespace QSB.TimeSync.Events
diff --git a/QSB/Tools/Events/PlayerFlashlightEvent.cs b/QSB/Tools/Events/PlayerFlashlightEvent.cs
index 707f940f..195009b8 100644
--- a/QSB/Tools/Events/PlayerFlashlightEvent.cs
+++ b/QSB/Tools/Events/PlayerFlashlightEvent.cs
@@ -1,5 +1,5 @@
 using QSB.Events;
-using QSB.Messages;
+using QSB.Messaging;
 using QSB.Player;
 
 namespace QSB.Tools.Events
diff --git a/QSB/Tools/Events/PlayerProbeEvent.cs b/QSB/Tools/Events/PlayerProbeEvent.cs
index fac5111e..4a46795c 100644
--- a/QSB/Tools/Events/PlayerProbeEvent.cs
+++ b/QSB/Tools/Events/PlayerProbeEvent.cs
@@ -1,5 +1,5 @@
 using QSB.Events;
-using QSB.Messages;
+using QSB.Messaging;
 using QSB.Player;
 
 namespace QSB.Tools.Events
diff --git a/QSB/Tools/Events/PlayerProbeLauncherEvent.cs b/QSB/Tools/Events/PlayerProbeLauncherEvent.cs
index 42792a3f..a271e28f 100644
--- a/QSB/Tools/Events/PlayerProbeLauncherEvent.cs
+++ b/QSB/Tools/Events/PlayerProbeLauncherEvent.cs
@@ -1,5 +1,5 @@
 using QSB.Events;
-using QSB.Messages;
+using QSB.Messaging;
 using QSB.Player;
 
 namespace QSB.Tools.Events
diff --git a/QSB/Tools/Events/PlayerSignalscopeEvent.cs b/QSB/Tools/Events/PlayerSignalscopeEvent.cs
index c86ad0ff..5451d449 100644
--- a/QSB/Tools/Events/PlayerSignalscopeEvent.cs
+++ b/QSB/Tools/Events/PlayerSignalscopeEvent.cs
@@ -1,5 +1,5 @@
 using QSB.Events;
-using QSB.Messages;
+using QSB.Messaging;
 using QSB.Player;
 
 namespace QSB.Tools.Events
diff --git a/QSB/Tools/Events/PlayerTranslatorEvent.cs b/QSB/Tools/Events/PlayerTranslatorEvent.cs
index ecd1cac5..d6ef404f 100644
--- a/QSB/Tools/Events/PlayerTranslatorEvent.cs
+++ b/QSB/Tools/Events/PlayerTranslatorEvent.cs
@@ -1,5 +1,5 @@
 using QSB.Events;
-using QSB.Messages;
+using QSB.Messaging;
 using QSB.Player;
 
 namespace QSB.Tools.Events
diff --git a/QSB/WorldSync/Events/WorldObjectMessage.cs b/QSB/WorldSync/Events/WorldObjectMessage.cs
index 6d7937c2..12ec48f8 100644
--- a/QSB/WorldSync/Events/WorldObjectMessage.cs
+++ b/QSB/WorldSync/Events/WorldObjectMessage.cs
@@ -1,4 +1,4 @@
-using QSB.Messages;
+using QSB.Messaging;
 using QuantumUNET;
 
 namespace QSB.WorldSync.Events