diff --git a/Weingartner.Json.Migration.Roslyn.Spec/Weingartner.Json.Migration.Roslyn.Spec.csproj b/Weingartner.Json.Migration.Roslyn.Spec/Weingartner.Json.Migration.Roslyn.Spec.csproj
index 2ef0a90..ffdb987 100644
--- a/Weingartner.Json.Migration.Roslyn.Spec/Weingartner.Json.Migration.Roslyn.Spec.csproj
+++ b/Weingartner.Json.Migration.Roslyn.Spec/Weingartner.Json.Migration.Roslyn.Spec.csproj
@@ -29,6 +29,6 @@
     <!--<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />-->
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Weingartner.Json.Migration.Roslyn_\Weingartner.Json.Migration.Roslyn.csproj" />
+    <ProjectReference Include="..\Weingartner.Json.Migration.Roslyn\Weingartner.Json.Migration.Roslyn.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Weingartner.Json.Migration.Roslyn.Vsix/Weingartner.Json.Migration.Roslyn_Vsix.Vsix.csproj b/Weingartner.Json.Migration.Roslyn.Vsix/Weingartner.Json.Migration.Roslyn_Vsix.Vsix.csproj
index 12ef679..a1f87d1 100644
--- a/Weingartner.Json.Migration.Roslyn.Vsix/Weingartner.Json.Migration.Roslyn_Vsix.Vsix.csproj
+++ b/Weingartner.Json.Migration.Roslyn.Vsix/Weingartner.Json.Migration.Roslyn_Vsix.Vsix.csproj
@@ -88,7 +88,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Weingartner.Json.Migration.Roslyn_\Weingartner.Json.Migration.Roslyn.csproj">
+    <ProjectReference Include="..\Weingartner.Json.Migration.Roslyn\Weingartner.Json.Migration.Roslyn.csproj">
       <Project>{630bac68-a278-4bce-abf1-6c864b141aa0}</Project>
       <Name>Weingartner.Json.Migration.Roslyn</Name>
     </ProjectReference>
diff --git a/Weingartner.Json.Migration.Roslyn_/AddMigrationMethodCodeFixProvider.cs b/Weingartner.Json.Migration.Roslyn/AddMigrationMethodCodeFixProvider.cs
similarity index 100%
rename from Weingartner.Json.Migration.Roslyn_/AddMigrationMethodCodeFixProvider.cs
rename to Weingartner.Json.Migration.Roslyn/AddMigrationMethodCodeFixProvider.cs
diff --git a/Weingartner.Json.Migration.Roslyn_/Constants.cs b/Weingartner.Json.Migration.Roslyn/Constants.cs
similarity index 100%
rename from Weingartner.Json.Migration.Roslyn_/Constants.cs
rename to Weingartner.Json.Migration.Roslyn/Constants.cs
diff --git a/Weingartner.Json.Migration.Roslyn_/CorrectMigrationHashCodeFixProvider.cs b/Weingartner.Json.Migration.Roslyn/CorrectMigrationHashCodeFixProvider.cs
similarity index 100%
rename from Weingartner.Json.Migration.Roslyn_/CorrectMigrationHashCodeFixProvider.cs
rename to Weingartner.Json.Migration.Roslyn/CorrectMigrationHashCodeFixProvider.cs
diff --git a/Weingartner.Json.Migration.Roslyn_/DataContractAnalyzer.cs b/Weingartner.Json.Migration.Roslyn/DataContractAnalyzer.cs
similarity index 100%
rename from Weingartner.Json.Migration.Roslyn_/DataContractAnalyzer.cs
rename to Weingartner.Json.Migration.Roslyn/DataContractAnalyzer.cs
diff --git a/Weingartner.Json.Migration.Roslyn_/MigrationHashAnalyzer.cs b/Weingartner.Json.Migration.Roslyn/MigrationHashAnalyzer.cs
similarity index 100%
rename from Weingartner.Json.Migration.Roslyn_/MigrationHashAnalyzer.cs
rename to Weingartner.Json.Migration.Roslyn/MigrationHashAnalyzer.cs
diff --git a/Weingartner.Json.Migration.Roslyn_/MigrationHashHelper.cs b/Weingartner.Json.Migration.Roslyn/MigrationHashHelper.cs
similarity index 100%
rename from Weingartner.Json.Migration.Roslyn_/MigrationHashHelper.cs
rename to Weingartner.Json.Migration.Roslyn/MigrationHashHelper.cs
diff --git a/Weingartner.Json.Migration.Roslyn_/MigrationMethodAnalyzer.cs b/Weingartner.Json.Migration.Roslyn/MigrationMethodAnalyzer.cs
similarity index 100%
rename from Weingartner.Json.Migration.Roslyn_/MigrationMethodAnalyzer.cs
rename to Weingartner.Json.Migration.Roslyn/MigrationMethodAnalyzer.cs
diff --git a/Weingartner.Json.Migration.Roslyn_/Weingartner.Json.Migration.Roslyn.csproj b/Weingartner.Json.Migration.Roslyn/Weingartner.Json.Migration.Roslyn.csproj
similarity index 100%
rename from Weingartner.Json.Migration.Roslyn_/Weingartner.Json.Migration.Roslyn.csproj
rename to Weingartner.Json.Migration.Roslyn/Weingartner.Json.Migration.Roslyn.csproj
diff --git a/Weingartner.Json.Migration.Roslyn_/packages.config b/Weingartner.Json.Migration.Roslyn/packages.config
similarity index 100%
rename from Weingartner.Json.Migration.Roslyn_/packages.config
rename to Weingartner.Json.Migration.Roslyn/packages.config
diff --git a/Weingartner.Json.Migration.Spec/Weingartner.Json.Migration.Spec.csproj b/Weingartner.Json.Migration.Spec/Weingartner.Json.Migration.Spec.csproj
index cd80a7e..99851f9 100644
--- a/Weingartner.Json.Migration.Spec/Weingartner.Json.Migration.Spec.csproj
+++ b/Weingartner.Json.Migration.Spec/Weingartner.Json.Migration.Spec.csproj
@@ -28,6 +28,6 @@
     <!--<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />-->
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Weingartner.Json.Migration_\Weingartner.Json.Migration.csproj" />
+    <ProjectReference Include="..\Weingartner.Json.Migration\Weingartner.Json.Migration.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Weingartner.Json.Migration.sln b/Weingartner.Json.Migration.sln
index 4c4cd9d..897044a 100644
--- a/Weingartner.Json.Migration.sln
+++ b/Weingartner.Json.Migration.sln
@@ -5,9 +5,9 @@ VisualStudioVersion = 16.0.30011.22
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Weingartner.Json.Migration.Roslyn_Vsix.Vsix", "Weingartner.Json.Migration.Roslyn.Vsix\Weingartner.Json.Migration.Roslyn_Vsix.Vsix.csproj", "{CD62CCCF-6F3C-43BF-BAEC-226012EA651E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Weingartner.Json.Migration", "Weingartner.Json.Migration_\Weingartner.Json.Migration.csproj", "{567ECD20-EB97-4A30-A5B2-0889D1609491}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Weingartner.Json.Migration", "Weingartner.Json.Migration\Weingartner.Json.Migration.csproj", "{567ECD20-EB97-4A30-A5B2-0889D1609491}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Weingartner.Json.Migration.Roslyn", "Weingartner.Json.Migration.Roslyn_\Weingartner.Json.Migration.Roslyn.csproj", "{630BAC68-A278-4BCE-ABF1-6C864B141AA0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Weingartner.Json.Migration.Roslyn", "Weingartner.Json.Migration.Roslyn\Weingartner.Json.Migration.Roslyn.csproj", "{630BAC68-A278-4BCE-ABF1-6C864B141AA0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F53CBCC1-FBB0-462C-8935-0B853362A8AD}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/Weingartner.Json.Migration_/DataVersionTooHighException.cs b/Weingartner.Json.Migration/DataVersionTooHighException.cs
similarity index 100%
rename from Weingartner.Json.Migration_/DataVersionTooHighException.cs
rename to Weingartner.Json.Migration/DataVersionTooHighException.cs
diff --git a/Weingartner.Json.Migration_/HashBasedDataMigrator.cs b/Weingartner.Json.Migration/HashBasedDataMigrator.cs
similarity index 100%
rename from Weingartner.Json.Migration_/HashBasedDataMigrator.cs
rename to Weingartner.Json.Migration/HashBasedDataMigrator.cs
diff --git a/Weingartner.Json.Migration_/IExtractHashes.cs b/Weingartner.Json.Migration/IExtractHashes.cs
similarity index 100%
rename from Weingartner.Json.Migration_/IExtractHashes.cs
rename to Weingartner.Json.Migration/IExtractHashes.cs
diff --git a/Weingartner.Json.Migration_/IMigrateData.cs b/Weingartner.Json.Migration/IMigrateData.cs
similarity index 100%
rename from Weingartner.Json.Migration_/IMigrateData.cs
rename to Weingartner.Json.Migration/IMigrateData.cs
diff --git a/Weingartner.Json.Migration_/JsonVersionUpdater.cs b/Weingartner.Json.Migration/JsonVersionUpdater.cs
similarity index 100%
rename from Weingartner.Json.Migration_/JsonVersionUpdater.cs
rename to Weingartner.Json.Migration/JsonVersionUpdater.cs
diff --git a/Weingartner.Json.Migration_/MigrationConverter.cs b/Weingartner.Json.Migration/MigrationConverter.cs
similarity index 100%
rename from Weingartner.Json.Migration_/MigrationConverter.cs
rename to Weingartner.Json.Migration/MigrationConverter.cs
diff --git a/Weingartner.Json.Migration_/VerifyingJsonDataMigrator.cs b/Weingartner.Json.Migration/VerifyingJsonDataMigrator.cs
similarity index 100%
rename from Weingartner.Json.Migration_/VerifyingJsonDataMigrator.cs
rename to Weingartner.Json.Migration/VerifyingJsonDataMigrator.cs
diff --git a/Weingartner.Json.Migration_/VersionMemberName.cs b/Weingartner.Json.Migration/VersionMemberName.cs
similarity index 100%
rename from Weingartner.Json.Migration_/VersionMemberName.cs
rename to Weingartner.Json.Migration/VersionMemberName.cs
diff --git a/Weingartner.Json.Migration_/Weingartner.Json.Migration.csproj b/Weingartner.Json.Migration/Weingartner.Json.Migration.csproj
similarity index 100%
rename from Weingartner.Json.Migration_/Weingartner.Json.Migration.csproj
rename to Weingartner.Json.Migration/Weingartner.Json.Migration.csproj
diff --git a/Weingartner.Json.Migration_/nuget.targets b/Weingartner.Json.Migration/nuget.targets
similarity index 100%
rename from Weingartner.Json.Migration_/nuget.targets
rename to Weingartner.Json.Migration/nuget.targets
diff --git a/Weingartner.Json.Migration_/tools/install.ps1 b/Weingartner.Json.Migration/tools/install.ps1
similarity index 100%
rename from Weingartner.Json.Migration_/tools/install.ps1
rename to Weingartner.Json.Migration/tools/install.ps1
diff --git a/Weingartner.Json.Migration_/tools/uninstall.ps1 b/Weingartner.Json.Migration/tools/uninstall.ps1
similarity index 100%
rename from Weingartner.Json.Migration_/tools/uninstall.ps1
rename to Weingartner.Json.Migration/tools/uninstall.ps1
diff --git a/scripts/build.fsx b/scripts/build.fsx
index 4f628d2..f81a379 100644
--- a/scripts/build.fsx
+++ b/scripts/build.fsx
@@ -51,7 +51,7 @@ let nugetVersion = if buildVersion = "LocalBuild" then ( environVarOrFail "GitVe
 
 Target "NugetMigration" (fun()->
 
-    let buildDir = "Weingartner.Json.Migration_" @@ buildOutputPath
+    let buildDir = "Weingartner.Json.Migration" @@ buildOutputPath
 
     NuGet (fun p -> 
     {p with
@@ -72,7 +72,7 @@ Target "NugetMigration" (fun()->
 
 Target "NugetAnalyzer" (fun()->
 
-    let buildDir = "Weingartner.Json.Migration.Roslyn_" @@ buildOutputPath
+    let buildDir = "Weingartner.Json.Migration.Roslyn" @@ buildOutputPath
 
     NuGet (fun p -> 
     {p with