diff --git a/ModernKeePass.sln b/ModernKeePass.sln
index a5cfa75..2624c80 100644
--- a/ModernKeePass.sln
+++ b/ModernKeePass.sln
@@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassApp", "ModernKeePass\ModernKeePassApp.csproj", "{A0CFC681-769B-405A-8482-0CDEE595A91F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePass.App", "ModernKeePass\ModernKeePass.App.csproj", "{A0CFC681-769B-405A-8482-0CDEE595A91F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassLib", "ModernKeePassLib\ModernKeePassLib.csproj", "{2E710089-9559-4967-846C-E763DD1F3ACB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePass.Lib", "ModernKeePassLib\ModernKeePass.Lib.csproj", "{2E710089-9559-4967-846C-E763DD1F3ACB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassLib.Test", "ModernKeePassLib.Test\ModernKeePassLib.Test.csproj", "{0A4279CF-2A67-4868-9906-052E50C25F3B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePass.LibTest", "ModernKeePassLib.Test\ModernKeePass.LibTest.csproj", "{0A4279CF-2A67-4868-9906-052E50C25F3B}"
 EndProject
 Project("{F5034706-568F-408A-B7B3-4D38C6DB8A32}") = "Scripts", "Scripts\Scripts.pssproj", "{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassApp.Test", "ModernKeePassApp.Test\ModernKeePassApp.Test.csproj", "{7E80F5E7-724A-4668-9333-B10F5D75C6D0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePass.AppTest", "ModernKeePassApp.Test\ModernKeePass.AppTest.csproj", "{7E80F5E7-724A-4668-9333-B10F5D75C6D0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/ModernKeePass/ModernKeePassApp.csproj b/ModernKeePass/ModernKeePass.App.csproj
similarity index 100%
rename from ModernKeePass/ModernKeePassApp.csproj
rename to ModernKeePass/ModernKeePass.App.csproj
diff --git a/ModernKeePassApp.Test/ModernKeePassApp.Test.csproj b/ModernKeePassApp.Test/ModernKeePass.AppTest.csproj
similarity index 98%
rename from ModernKeePassApp.Test/ModernKeePassApp.Test.csproj
rename to ModernKeePassApp.Test/ModernKeePass.AppTest.csproj
index 65819c8..c1cb329 100644
--- a/ModernKeePassApp.Test/ModernKeePassApp.Test.csproj
+++ b/ModernKeePassApp.Test/ModernKeePass.AppTest.csproj
@@ -154,9 +154,9 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ModernKeePass\ModernKeePassApp.csproj">
+    <ProjectReference Include="..\ModernKeePass\ModernKeePass.App.csproj">
       <Project>{A0CFC681-769B-405A-8482-0CDEE595A91F}</Project>
-      <Name>ModernKeePassApp</Name>
+      <Name>ModernKeePass.App</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj b/ModernKeePassLib.Test/ModernKeePass.LibTest.csproj
similarity index 100%
rename from ModernKeePassLib.Test/ModernKeePassLib.Test.csproj
rename to ModernKeePassLib.Test/ModernKeePass.LibTest.csproj
diff --git a/ModernKeePassLib/ModernKeePassLib.csproj b/ModernKeePassLib/ModernKeePass.Lib.csproj
similarity index 100%
rename from ModernKeePassLib/ModernKeePassLib.csproj
rename to ModernKeePassLib/ModernKeePass.Lib.csproj
diff --git a/ModernKeePassLib/ModernKeePass.Lib.nuget.targets b/ModernKeePassLib/ModernKeePass.Lib.nuget.targets
new file mode 100644
index 0000000..a00610d
--- /dev/null
+++ b/ModernKeePassLib/ModernKeePass.Lib.nuget.targets
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
+    <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+  </PropertyGroup>
+  <ImportGroup>
+    <Import Project="$(NuGetPackageRoot)\NETStandard.Library\2.0.1\build\NETStandard.Library.targets" Condition="Exists('$(NuGetPackageRoot)\NETStandard.Library\2.0.1\build\NETStandard.Library.targets')" />
+  </ImportGroup>
+</Project>
\ No newline at end of file