diff --git a/SS14.Client/Properties/AssemblyInfo.cs b/SS14.Client/Properties/AssemblyInfo.cs
index 4ff4aee8c..0cfc922ab 100644
--- a/SS14.Client/Properties/AssemblyInfo.cs
+++ b/SS14.Client/Properties/AssemblyInfo.cs
@@ -1,21 +1,21 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("SpaceStation14")]
+[assembly: AssemblyTitle("SS14.Client")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SpaceStation14")]
+[assembly: AssemblyProduct("SS14.Client")]
 [assembly: AssemblyCopyright("Copyright ©  2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 
 [assembly: ComVisible(false)]
@@ -27,13 +27,13 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyVersion("0.1.*")]
-[assembly: AssemblyFileVersion("0.1")]
\ No newline at end of file
+[assembly: AssemblyFileVersion("0.1")]
diff --git a/SS14.Client/SS14.Client.csproj b/SS14.Client/SS14.Client.csproj
index f37b57a30..01effcaed 100644
--- a/SS14.Client/SS14.Client.csproj
+++ b/SS14.Client/SS14.Client.csproj
@@ -10,7 +10,7 @@
     </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
-    <AssemblyName>SpaceStation14</AssemblyName>
+    <AssemblyName>SS14.Client</AssemblyName>
     <DefaultClientScript>JScript</DefaultClientScript>
     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
diff --git a/SS14.Server/Properties/AssemblyInfo.cs b/SS14.Server/Properties/AssemblyInfo.cs
index 699f2c90f..144176e85 100644
--- a/SS14.Server/Properties/AssemblyInfo.cs
+++ b/SS14.Server/Properties/AssemblyInfo.cs
@@ -1,21 +1,21 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("SpaceStation14_Server")]
+[assembly: AssemblyTitle("SS14.Server")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SpaceStation14_Server")]
+[assembly: AssemblyProduct("SS14.Server")]
 [assembly: AssemblyCopyright("Copyright ©  2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 
 [assembly: ComVisible(false)]
@@ -27,13 +27,13 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyVersion("0.1.*")]
-[assembly: AssemblyFileVersion("0.1")]
\ No newline at end of file
+[assembly: AssemblyFileVersion("0.1")]
diff --git a/SS14.Server/SS14.Server.csproj b/SS14.Server/SS14.Server.csproj
index 636dad811..63f220199 100644
--- a/SS14.Server/SS14.Server.csproj
+++ b/SS14.Server/SS14.Server.csproj
@@ -10,7 +10,7 @@
     </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
-    <AssemblyName>SpaceStation14_Server</AssemblyName>
+    <AssemblyName>SS14.Server</AssemblyName>
     <DefaultClientScript>JScript</DefaultClientScript>
     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
diff --git a/SS14.Server/SS14Server.cs b/SS14.Server/SS14Server.cs
index 6d49d6021..b3c576c6c 100644
--- a/SS14.Server/SS14Server.cs
+++ b/SS14.Server/SS14Server.cs
@@ -35,6 +35,7 @@ using MainLoopTimer = SS14.Server.Timing.MainLoopTimer;
 
 namespace SS14.Server
 {
+    [IoCTarget]
     public class SS14Server : ISS14Server
     {
         private const int GameCountdown = 15;
diff --git a/SS14.UnitTesting/SS14UnitTest.cs b/SS14.UnitTesting/SS14UnitTest.cs
index 36866c385..413596566 100644
--- a/SS14.UnitTesting/SS14UnitTest.cs
+++ b/SS14.UnitTesting/SS14UnitTest.cs
@@ -54,8 +54,8 @@ namespace SS14.UnitTesting
         {
             var assemblies = new List<Assembly>();
             string assemblyDir = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath);
-            assemblies.Add(Assembly.LoadFrom(Path.Combine(assemblyDir, "SpaceStation14.exe")));
-            assemblies.Add(Assembly.LoadFrom(Path.Combine(assemblyDir, "SpaceStation14_Server.exe")));
+            assemblies.Add(Assembly.LoadFrom(Path.Combine(assemblyDir, "SS14.Client.exe")));
+            assemblies.Add(Assembly.LoadFrom(Path.Combine(assemblyDir, "SS14.Server.exe")));
             assemblies.Add(Assembly.GetExecutingAssembly());
 
             IoCManager.AddAssemblies(assemblies);
diff --git a/runclient.bat b/runclient.bat
index 881d44bc7..cc0605fe9 100644
--- a/runclient.bat
+++ b/runclient.bat
@@ -1,6 +1,6 @@
 @echo off
 set PDIR=%~dp0
 cd %PDIR%Bin\Client
-start SpaceStation14.exe %*
+start SS14.Client.exe %*
 cd %PDIR%
 set PDIR=
diff --git a/runserver.bat b/runserver.bat
index e2b1f3d19..e86e18bed 100644
--- a/runserver.bat
+++ b/runserver.bat
@@ -1,7 +1,7 @@
 @echo off
 set PDIR=%~dp0
 cd %PDIR%Bin\Server
-call SpaceStation14_Server.exe %*
+call SS14.Server.exe %*
 cd %PDIR%
 set PDIR=
 pause