diff --git a/EntityFramework.VersionedProperties.NET40/EntityFramework.VersionedProperties.NET40.csproj b/EntityFramework.VersionedProperties.NET40/EntityFramework.VersionedProperties.NET40.csproj
index 456aff5..9ab5d5d 100644
--- a/EntityFramework.VersionedProperties.NET40/EntityFramework.VersionedProperties.NET40.csproj
+++ b/EntityFramework.VersionedProperties.NET40/EntityFramework.VersionedProperties.NET40.csproj
@@ -104,7 +104,7 @@
     <Compile Include="..\EntityFrameworkCore.VersionedProperties\VersionedBase.cs">
       <Link>VersionedBase.cs</Link>
     </Compile>
-    <Compile Include="..\EntityFrameworkCore.VersionedProperties\VersionedProperties`1.cs">
+    <Compile Include="..\EntityFrameworkCore.VersionedProperties\VersionedProperties_1.cs">
       <Link>VersionedProperties`1.cs</Link>
     </Compile>
     <Compile Include="..\EntityFrameworkCore.VersionedProperties\VersionedRequiredValueBase.cs">
@@ -119,11 +119,11 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
   </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- 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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>
\ No newline at end of file
diff --git a/EntityFramework.VersionedProperties/EntityFramework.VersionedProperties.csproj b/EntityFramework.VersionedProperties/EntityFramework.VersionedProperties.csproj
index 9c83eff..1599199 100644
--- a/EntityFramework.VersionedProperties/EntityFramework.VersionedProperties.csproj
+++ b/EntityFramework.VersionedProperties/EntityFramework.VersionedProperties.csproj
@@ -94,7 +94,7 @@
     <Compile Include="..\EntityFrameworkCore.VersionedProperties\VersionedBase.cs">
       <Link>VersionedBase.cs</Link>
     </Compile>
-    <Compile Include="..\EntityFrameworkCore.VersionedProperties\VersionedProperties`1.cs">
+    <Compile Include="..\EntityFrameworkCore.VersionedProperties\VersionedProperties_1.cs">
       <Link>VersionedProperties`1.cs</Link>
     </Compile>
     <Compile Include="..\EntityFrameworkCore.VersionedProperties\VersionedRequiredValueBase.cs">
@@ -104,16 +104,18 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- 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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>
\ No newline at end of file
diff --git a/EntityFrameworkCore.VersionedProperties/VersionedProperties`1.cs b/EntityFrameworkCore.VersionedProperties/VersionedProperties_1.cs
similarity index 100%
rename from EntityFrameworkCore.VersionedProperties/VersionedProperties`1.cs
rename to EntityFrameworkCore.VersionedProperties/VersionedProperties_1.cs