diff --git a/DMCompiler/DMCompiler.csproj b/DMCompiler/DMCompiler.csproj
index e0078b3515..8f9126626f 100644
--- a/DMCompiler/DMCompiler.csproj
+++ b/DMCompiler/DMCompiler.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\OpenDreamCommon\OpenDreamCommon.csproj" />
+    <ProjectReference Include="..\OpenDreamCommon\OpenDreamShared.Common.csproj" />
     <ProjectReference Include="..\OpenDreamNoClient\OpenDreamNoClient.csproj" />
   </ItemGroup>
 
diff --git a/OpenDream.sln b/OpenDream.sln
index 4853b5265d..5f59b35685 100644
--- a/OpenDream.sln
+++ b/OpenDream.sln
@@ -102,7 +102,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenDreamPackageTool", "Ope
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Xaml", "RobustToolbox\Robust.Xaml\Robust.Xaml.csproj", "{62F71077-77A6-4F0F-9A47-AA341668E194}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenDreamCommon", "OpenDreamCommon\OpenDreamCommon.csproj", "{556A81FF-5A5F-4DC9-9E18-AFD9767FA082}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenDreamShared.Common", "OpenDreamCommon\OpenDreamShared.Common.csproj", "{556A81FF-5A5F-4DC9-9E18-AFD9767FA082}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenDreamNoClient", "OpenDreamNoClient\OpenDreamNoClient.csproj", "{CCBE231F-192D-4CDB-8931-555B04B56534}"
 EndProject
diff --git a/OpenDreamClient/Interface/Prompts/InputWindow.cs b/OpenDreamClient/Interface/Prompts/InputWindow.cs
index 7f6b9fd776..e54ab09005 100644
--- a/OpenDreamClient/Interface/Prompts/InputWindow.cs
+++ b/OpenDreamClient/Interface/Prompts/InputWindow.cs
@@ -1,5 +1,4 @@
 using OpenDreamShared.Common.DM;
-using OpenDreamShared.Dream;
 using Robust.Client.UserInterface;
 
 namespace OpenDreamClient.Interface.Prompts;
diff --git a/OpenDreamClient/Interface/Prompts/ListPrompt.cs b/OpenDreamClient/Interface/Prompts/ListPrompt.cs
index 2881c31f64..8be58f7e3c 100644
--- a/OpenDreamClient/Interface/Prompts/ListPrompt.cs
+++ b/OpenDreamClient/Interface/Prompts/ListPrompt.cs
@@ -1,5 +1,4 @@
 using OpenDreamShared.Common.DM;
-using OpenDreamShared.Dream;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input;
diff --git a/OpenDreamNoClient/OpenDreamNoClient.csproj b/OpenDreamNoClient/OpenDreamNoClient.csproj
index 5945d62e84..d0e95f6cd9 100644
--- a/OpenDreamNoClient/OpenDreamNoClient.csproj
+++ b/OpenDreamNoClient/OpenDreamNoClient.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\OpenDreamCommon\OpenDreamCommon.csproj" />
+    <ProjectReference Include="..\OpenDreamCommon\OpenDreamShared.Common.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/OpenDreamPackaging/DreamPackaging.cs b/OpenDreamPackaging/DreamPackaging.cs
index f5fa6d1741..4a6ad6cc1a 100644
--- a/OpenDreamPackaging/DreamPackaging.cs
+++ b/OpenDreamPackaging/DreamPackaging.cs
@@ -24,7 +24,7 @@ await RobustSharedPackaging.WriteContentAssemblies(
             inputPass,
             contentDir,
             "Content.Client",
-            new[] { "OpenDreamClient", "OpenDreamShared", "OpenDreamCommon" },
+            new[] { "OpenDreamClient", "OpenDreamShared", "OpenDreamShared.Common" },
             cancel: cancel);
 
         await RobustClientPackaging.WriteClientResources(contentDir, inputPass, cancel);
diff --git a/OpenDreamRuntime/OpenDreamRuntime.csproj b/OpenDreamRuntime/OpenDreamRuntime.csproj
index 1d079112a3..a0b8488c4b 100644
--- a/OpenDreamRuntime/OpenDreamRuntime.csproj
+++ b/OpenDreamRuntime/OpenDreamRuntime.csproj
@@ -7,7 +7,7 @@
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenDreamCommon\OpenDreamCommon.csproj" />
+    <ProjectReference Include="..\OpenDreamCommon\OpenDreamShared.Common.csproj" />
     <ProjectReference Include="..\OpenDreamNoClient\OpenDreamNoClient.csproj" />
     <ProjectReference Include="..\OpenDreamPackaging\OpenDreamPackaging.csproj" />
     <ProjectReference Include="..\OpenDreamShared\OpenDreamShared.csproj" />
diff --git a/OpenDreamCommon/Bytecode/DMReference.cs b/OpenDreamShared.Common/Bytecode/DMReference.cs
similarity index 100%
rename from OpenDreamCommon/Bytecode/DMReference.cs
rename to OpenDreamShared.Common/Bytecode/DMReference.cs
diff --git a/OpenDreamCommon/Bytecode/DreamProcOpcode.cs b/OpenDreamShared.Common/Bytecode/DreamProcOpcode.cs
similarity index 100%
rename from OpenDreamCommon/Bytecode/DreamProcOpcode.cs
rename to OpenDreamShared.Common/Bytecode/DreamProcOpcode.cs
diff --git a/OpenDreamCommon/Bytecode/IOpcodeVerifier.cs b/OpenDreamShared.Common/Bytecode/IOpcodeVerifier.cs
similarity index 99%
rename from OpenDreamCommon/Bytecode/IOpcodeVerifier.cs
rename to OpenDreamShared.Common/Bytecode/IOpcodeVerifier.cs
index fa2c8d665c..d6f3247a5b 100644
--- a/OpenDreamCommon/Bytecode/IOpcodeVerifier.cs
+++ b/OpenDreamShared.Common/Bytecode/IOpcodeVerifier.cs
@@ -1,4 +1,5 @@
 namespace OpenDreamShared.Common.Bytecode;
+
 public interface IOpcodeVerifier {
     public string GetOpcodesHash();
 }
diff --git a/OpenDreamCommon/Bytecode/OpcodeMetadata.cs b/OpenDreamShared.Common/Bytecode/OpcodeMetadata.cs
similarity index 100%
rename from OpenDreamCommon/Bytecode/OpcodeMetadata.cs
rename to OpenDreamShared.Common/Bytecode/OpcodeMetadata.cs
diff --git a/OpenDreamCommon/Bytecode/StringFormatEncoder.cs b/OpenDreamShared.Common/Bytecode/StringFormatEncoder.cs
similarity index 100%
rename from OpenDreamCommon/Bytecode/StringFormatEncoder.cs
rename to OpenDreamShared.Common/Bytecode/StringFormatEncoder.cs
diff --git a/OpenDreamCommon/DM/DMValueType.cs b/OpenDreamShared.Common/DM/DMValueType.cs
similarity index 100%
rename from OpenDreamCommon/DM/DMValueType.cs
rename to OpenDreamShared.Common/DM/DMValueType.cs
diff --git a/OpenDreamCommon/DM/MatrixOpcodes.cs b/OpenDreamShared.Common/DM/MatrixOpcodes.cs
similarity index 100%
rename from OpenDreamCommon/DM/MatrixOpcodes.cs
rename to OpenDreamShared.Common/DM/MatrixOpcodes.cs
diff --git a/OpenDreamCommon/DM/ProcAttributes.cs b/OpenDreamShared.Common/DM/ProcAttributes.cs
similarity index 100%
rename from OpenDreamCommon/DM/ProcAttributes.cs
rename to OpenDreamShared.Common/DM/ProcAttributes.cs
diff --git a/OpenDreamCommon/DM/VerbSrc.cs b/OpenDreamShared.Common/DM/VerbSrc.cs
similarity index 100%
rename from OpenDreamCommon/DM/VerbSrc.cs
rename to OpenDreamShared.Common/DM/VerbSrc.cs
diff --git a/OpenDreamCommon/DreamPath.cs b/OpenDreamShared.Common/DreamPath.cs
similarity index 100%
rename from OpenDreamCommon/DreamPath.cs
rename to OpenDreamShared.Common/DreamPath.cs
diff --git a/OpenDreamCommon/JSON/DreamCompiledJson.cs b/OpenDreamShared.Common/JSON/DreamCompiledJson.cs
similarity index 100%
rename from OpenDreamCommon/JSON/DreamCompiledJson.cs
rename to OpenDreamShared.Common/JSON/DreamCompiledJson.cs
diff --git a/OpenDreamCommon/JSON/DreamMapJson.cs b/OpenDreamShared.Common/JSON/DreamMapJson.cs
similarity index 100%
rename from OpenDreamCommon/JSON/DreamMapJson.cs
rename to OpenDreamShared.Common/JSON/DreamMapJson.cs
diff --git a/OpenDreamCommon/JSON/DreamObjectJson.cs b/OpenDreamShared.Common/JSON/DreamObjectJson.cs
similarity index 100%
rename from OpenDreamCommon/JSON/DreamObjectJson.cs
rename to OpenDreamShared.Common/JSON/DreamObjectJson.cs
diff --git a/OpenDreamCommon/JSON/DreamProcJson.cs b/OpenDreamShared.Common/JSON/DreamProcJson.cs
similarity index 100%
rename from OpenDreamCommon/JSON/DreamProcJson.cs
rename to OpenDreamShared.Common/JSON/DreamProcJson.cs
diff --git a/OpenDreamCommon/OpenDreamCommon.csproj b/OpenDreamShared.Common/OpenDreamShared.Common.csproj
similarity index 100%
rename from OpenDreamCommon/OpenDreamCommon.csproj
rename to OpenDreamShared.Common/OpenDreamShared.Common.csproj
diff --git a/OpenDreamCommon/SharedOperations.cs b/OpenDreamShared.Common/SharedOperations.cs
similarity index 100%
rename from OpenDreamCommon/SharedOperations.cs
rename to OpenDreamShared.Common/SharedOperations.cs
diff --git a/OpenDreamShared/OpenDreamShared.csproj b/OpenDreamShared/OpenDreamShared.csproj
index 93e9be4fcf..9095ff8d10 100644
--- a/OpenDreamShared/OpenDreamShared.csproj
+++ b/OpenDreamShared/OpenDreamShared.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="JetBrains.Annotations" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenDreamCommon\OpenDreamCommon.csproj" />
+    <ProjectReference Include="..\OpenDreamCommon\OpenDreamShared.Common.csproj" />
     <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
   </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />