diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index 7cdc6b11e9..357060d8fe 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{24A0AA3C-B25F-4197-B23D-476D6462DBA0}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Client.Core</RootNamespace>
-    <AssemblyName>Client.Core</AssemblyName>
+    <RootNamespace>BizHawk.Client.Common</RootNamespace>
+    <AssemblyName>BizHawk.Client.Common</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 65ba18ba53..f732204473 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -970,6 +970,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\BizHawk.Client.Common\BizHawk.Client.Common.csproj">
+      <Project>{24A0AA3C-B25F-4197-B23D-476D6462DBA0}</Project>
+      <Name>BizHawk.Client.Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\BizHawk.Emulation\BizHawk.Emulation.csproj">
       <Project>{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}</Project>
       <Name>BizHawk.Emulation</Name>
@@ -978,10 +982,6 @@
       <Project>{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}</Project>
       <Name>BizHawk.Util</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Client.Core\BizHawk.Client.Common.csproj">
-      <Project>{24A0AA3C-B25F-4197-B23D-476D6462DBA0}</Project>
-      <Name>BizHawk.Client.Common</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="AboutBox.resx">
diff --git a/BizHawk.Util/BizHawk.Util.csproj b/BizHawk.Util/BizHawk.Util.csproj
index d34ac185c1..9029fafd05 100644
--- a/BizHawk.Util/BizHawk.Util.csproj
+++ b/BizHawk.Util/BizHawk.Util.csproj
@@ -188,7 +188,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Client.Core\BizHawk.Client.Common.csproj">
+    <ProjectReference Include="..\BizHawk.Client.Common\BizHawk.Client.Common.csproj">
       <Project>{24A0AA3C-B25F-4197-B23D-476D6462DBA0}</Project>
       <Name>BizHawk.Client.Common</Name>
     </ProjectReference>
diff --git a/BizHawk.sln b/BizHawk.sln
index afa768da43..087f95c8a0 100644
--- a/BizHawk.sln
+++ b/BizHawk.sln
@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoHawk", "DiscoHawk\Disc
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.PCE_Debugger", "BizHawk.PCE_Debugger\BizHawk.PCE_Debugger.csproj", "{2D7F5A4A-C3C4-41CD-839C-C35F3DD58725}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.Common", "Client.Core\BizHawk.Client.Common.csproj", "{24A0AA3C-B25F-4197-B23D-476D6462DBA0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.Common", "BizHawk.Client.Common\BizHawk.Client.Common.csproj", "{24A0AA3C-B25F-4197-B23D-476D6462DBA0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution