diff --git a/FSharp.Data.GraphQL.sln b/FSharp.Data.GraphQL.sln
index c2301aa6d..ab4dad194 100644
--- a/FSharp.Data.GraphQL.sln
+++ b/FSharp.Data.GraphQL.sln
@@ -36,13 +36,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{78D10788-601
 		docs\files\img\logo.png = docs\files\img\logo.png
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "star-wars-api", "star-wars-api", "{F66BEE6C-0CB7-4F39-97E4-243F797E8723}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "star-wars-api", "samples\star-wars-api\star-wars-api.fsproj", "{B837B3ED-83CE-446F-A4E5-44CB06AA6505}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Samples.StarWarsApi", "samples\star-wars-api\FSharp.Data.GraphQL.Samples.StarWarsApi.fsproj", "{B837B3ED-83CE-446F-A4E5-44CB06AA6505}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "chat-app", "chat-app", "{24AB1F5A-4996-4DDA-87E0-B82B3A24C13F}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Samples.ChatApp", "samples\chat-app\server\FSharp.Data.GraphQL.Samples.ChatApp.fsproj", "{225B0790-C6B6-425C-9093-F359A4C635D3}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "chat-app", "samples\chat-app\server\chat-app.fsproj", "{225B0790-C6B6-425C-9093-F359A4C635D3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BEFD8748-2467-45F9-A4AD-B450B12D5F78}"
 EndProject
@@ -52,6 +48,10 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.AspNetCore", "src\FSharp.Data.GraphQL.Server.AspNetCore\FSharp.Data.GraphQL.Server.AspNetCore.fsproj", "{554A6833-1E72-41B4-AAC1-C19371EC061B}"
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Giraffe", "src\FSharp.Data.GraphQL.Server.Giraffe\FSharp.Data.GraphQL.Server.Giraffe.fsproj", "{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Oxpecker", "src\FSharp.Data.GraphQL.Server.Oxpecker\FSharp.Data.GraphQL.Server.Oxpecker.fsproj", "{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}"
+EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Relay", "src\FSharp.Data.GraphQL.Server.Relay\FSharp.Data.GraphQL.Server.Relay.fsproj", "{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Middleware", "src\FSharp.Data.GraphQL.Server.Middleware\FSharp.Data.GraphQL.Server.Middleware.fsproj", "{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}"
@@ -174,10 +174,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components", "components",
 		samples\relay-modern-starter-kit\src\components\user.jsx = samples\relay-modern-starter-kit\src\components\user.jsx
 	EndProjectSection
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Giraffe", "src\FSharp.Data.GraphQL.Server.Giraffe\FSharp.Data.GraphQL.Server.Giraffe.fsproj", "{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Oxpecker", "src\FSharp.Data.GraphQL.Server.Oxpecker\FSharp.Data.GraphQL.Server.Oxpecker.fsproj", "{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -351,10 +347,8 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{56640EAF-82A6-4439-AD14-69F44A90DA99} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
 		{78D10788-601D-4D53-808B-36661911EDD1} = {56640EAF-82A6-4439-AD14-69F44A90DA99}
-		{F66BEE6C-0CB7-4F39-97E4-243F797E8723} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
-		{B837B3ED-83CE-446F-A4E5-44CB06AA6505} = {F66BEE6C-0CB7-4F39-97E4-243F797E8723}
-		{24AB1F5A-4996-4DDA-87E0-B82B3A24C13F} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
-		{225B0790-C6B6-425C-9093-F359A4C635D3} = {24AB1F5A-4996-4DDA-87E0-B82B3A24C13F}
+		{B837B3ED-83CE-446F-A4E5-44CB06AA6505} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
+		{225B0790-C6B6-425C-9093-F359A4C635D3} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
 		{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
 		{474179D3-0090-49E9-88F8-2971C0966077} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
 		{554A6833-1E72-41B4-AAC1-C19371EC061B} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
diff --git a/Prepare template project for packing.ps1 b/Prepare template project for packing.ps1
index 7590ca361..c7c541960 100644
--- a/Prepare template project for packing.ps1	
+++ b/Prepare template project for packing.ps1	
@@ -1,4 +1,4 @@
-$starWarsApiProjPath = "samples/star-wars-api/FSharp.Data.GraphQL.Samples.StarWarsApi.fsproj"
+$starWarsApiProjPath = "samples/star-wars-api/star-wars-api.fsproj"
 [xml]$starWarsApiProj = Get-Content -Path $starWarsApiProjPath
 $starWarsApiProjRefNode = $starWarsApiProj.SelectSingleNode("//ItemGroup[@Label='ProjectReferences']")
 $starWarsApiProjRefNode.ParentNode.RemoveChild($starWarsApiProjRefNode) | Out-Null
diff --git a/build/Program.fs b/build/Program.fs
index 10c79727a..b6e91caf3 100644
--- a/build/Program.fs
+++ b/build/Program.fs
@@ -138,7 +138,7 @@ Target.create StartStarWarsServerTarget <| fun _ ->
     let project =
         "samples"
         </> "star-wars-api"
-        </> "FSharp.Data.GraphQL.Samples.StarWarsApi.fsproj"
+        </> "star-wars-api.fsproj"
 
     startGraphQLServer project 8086 starWarsServerStream
 
diff --git a/samples/chat-app/server/FSharp.Data.GraphQL.Samples.ChatApp.fsproj b/samples/chat-app/server/chat-app.fsproj
similarity index 93%
rename from samples/chat-app/server/FSharp.Data.GraphQL.Samples.ChatApp.fsproj
rename to samples/chat-app/server/chat-app.fsproj
index f6fc5e5c7..4e0ff7bbb 100644
--- a/samples/chat-app/server/FSharp.Data.GraphQL.Samples.ChatApp.fsproj
+++ b/samples/chat-app/server/chat-app.fsproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(DotNetVersion)</TargetFramework>
+    <RootNamespace>FSharp.Data.GraphQL.Samples.ChatApp</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/star-wars-api/FSharp.Data.GraphQL.Samples.StarWarsApi.fsproj b/samples/star-wars-api/star-wars-api.fsproj
similarity index 95%
rename from samples/star-wars-api/FSharp.Data.GraphQL.Samples.StarWarsApi.fsproj
rename to samples/star-wars-api/star-wars-api.fsproj
index f8ec1fa29..a90126350 100644
--- a/samples/star-wars-api/FSharp.Data.GraphQL.Samples.StarWarsApi.fsproj
+++ b/samples/star-wars-api/star-wars-api.fsproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(DotNetVersion)</TargetFramework>
+    <RootNamespace>FSharp.Data.GraphQL.Samples.StarWarsApi</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup Label="PackageReferences">