diff --git a/NAV Source Control Test Host/NAV Source Control Test Host.csproj b/NAV Source Control Test Host/NAV Source Control Test Host.csproj
index 5eda895..b0c1c2b 100644
--- a/NAV Source Control Test Host/NAV Source Control Test Host.csproj	
+++ b/NAV Source Control Test Host/NAV Source Control Test Host.csproj	
@@ -7,7 +7,7 @@
     <ProjectGuid>{E0BED7B8-729A-4AA4-83A3-2F0EC569728E}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NAVSCM.TestHost</RootNamespace>
+    <RootNamespace>NavScm.TestHost</RootNamespace>
     <AssemblyName>NAV Source Control Test Host</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -73,9 +73,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NAVSCM Library\NAVSCM Library.csproj">
+    <ProjectReference Include="..\NAVSCM Library\NavScm Library.csproj">
       <Project>{46db932e-45d1-4783-a8bf-ce5333b3f8f9}</Project>
-      <Name>NAVSCM Library</Name>
+      <Name>NavScm Library</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/NAV Source Control Test Host/Program.cs b/NAV Source Control Test Host/Program.cs
index 0d5268e..c0fec8d 100644
--- a/NAV Source Control Test Host/Program.cs	
+++ b/NAV Source Control Test Host/Program.cs	
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using log4net;
 
-namespace NAVSCM.TestHost
+namespace NavScm.TestHost
 {
     class Program
     {
diff --git a/NAV Source Control.sln b/NAV Source Control.sln
index bbb28c8..1990799 100644
--- a/NAV Source Control.sln	
+++ b/NAV Source Control.sln	
@@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NAV Source Control Test Host", "NAV Source Control Test Host\NAV Source Control Test Host.csproj", "{E0BED7B8-729A-4AA4-83A3-2F0EC569728E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NAVSCM Library", "NAVSCM Library\NAVSCM Library.csproj", "{46DB932E-45D1-4783-A8BF-CE5333B3F8F9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NavScm Library", "NAVSCM Library\NavScm Library.csproj", "{46DB932E-45D1-4783-A8BF-CE5333B3F8F9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/NAVSCM Library/NAVSCM Library.csproj b/NAVSCM Library/NAVSCM Library.csproj
index bbea052..150372a 100644
--- a/NAVSCM Library/NAVSCM Library.csproj	
+++ b/NAVSCM Library/NAVSCM Library.csproj	
@@ -7,8 +7,8 @@
     <ProjectGuid>{46DB932E-45D1-4783-A8BF-CE5333B3F8F9}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NAVSCM</RootNamespace>
-    <AssemblyName>NAVSCM Library</AssemblyName>
+    <RootNamespace>NavScm</RootNamespace>
+    <AssemblyName>NavScm Library</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -51,6 +51,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="NavScm.NavInterface\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.