diff --git a/csharpcore/GuildedRose.sln b/csharpcore/GildedRose.sln
similarity index 79%
rename from csharpcore/GuildedRose.sln
rename to csharpcore/GildedRose.sln
index 3468c12b..a922b9a1 100644
--- a/csharpcore/GuildedRose.sln
+++ b/csharpcore/GildedRose.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31424.327
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GuildedRose", "GuildedRose\GuildedRose.csproj", "{D781C52B-92C0-48BF-8414-177495DF4174}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GildedRose", "GildedRose\GildedRose.csproj", "{D781C52B-92C0-48BF-8414-177495DF4174}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuildedRoseTests", "GuildedRoseTests\GuildedRoseTests.csproj", "{CB6715CE-A283-4C70-9C1B-F58822077731}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GildedRoseTests", "GildedRoseTests\GildedRoseTests.csproj", "{CB6715CE-A283-4C70-9C1B-F58822077731}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/csharpcore/GuildedRose/GildedRose.cs b/csharpcore/GildedRose/GildedRose.cs
similarity index 99%
rename from csharpcore/GuildedRose/GildedRose.cs
rename to csharpcore/GildedRose/GildedRose.cs
index 3b386391..ed7dc428 100644
--- a/csharpcore/GuildedRose/GildedRose.cs
+++ b/csharpcore/GildedRose/GildedRose.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace GuildedRose
+namespace GildedRoseKata
 {
     public class GildedRose
     {
diff --git a/csharpcore/GuildedRose/GuildedRose.csproj b/csharpcore/GildedRose/GildedRose.csproj
similarity index 74%
rename from csharpcore/GuildedRose/GuildedRose.csproj
rename to csharpcore/GildedRose/GildedRose.csproj
index af859afe..89266e99 100644
--- a/csharpcore/GuildedRose/GuildedRose.csproj
+++ b/csharpcore/GildedRose/GildedRose.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <StartupObject>GuildedRose.Program</StartupObject>
+    <StartupObject>GildedRoseKata.Program</StartupObject>
   </PropertyGroup>
 
 </Project>
diff --git a/csharpcore/GuildedRose/Item.cs b/csharpcore/GildedRose/Item.cs
similarity index 85%
rename from csharpcore/GuildedRose/Item.cs
rename to csharpcore/GildedRose/Item.cs
index ee0972f3..3d87cab4 100644
--- a/csharpcore/GuildedRose/Item.cs
+++ b/csharpcore/GildedRose/Item.cs
@@ -1,4 +1,4 @@
-namespace GuildedRose
+namespace GildedRoseKata
 {
     public class Item
     {
diff --git a/csharpcore/GuildedRose/Program.cs b/csharpcore/GildedRose/Program.cs
similarity index 98%
rename from csharpcore/GuildedRose/Program.cs
rename to csharpcore/GildedRose/Program.cs
index 08cc3b79..1367fe73 100644
--- a/csharpcore/GuildedRose/Program.cs
+++ b/csharpcore/GildedRose/Program.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace GuildedRose
+namespace GildedRoseKata
 {
     public class Program
     {
diff --git a/csharpcore/GuildedRoseTests/ApprovalTest.cs b/csharpcore/GildedRoseTests/ApprovalTest.cs
similarity index 92%
rename from csharpcore/GuildedRoseTests/ApprovalTest.cs
rename to csharpcore/GildedRoseTests/ApprovalTest.cs
index 0ff3c994..178e66a7 100644
--- a/csharpcore/GuildedRoseTests/ApprovalTest.cs
+++ b/csharpcore/GildedRoseTests/ApprovalTest.cs
@@ -4,9 +4,9 @@ using System.IO;
 using System.Text;
 using ApprovalTests;
 using ApprovalTests.Reporters;
-using GuildedRose;
-
-namespace GuildedRoseTests
+using GildedRoseKata;
+
+namespace GildedRoseTests
 {
     [UseReporter(typeof(DiffReporter))]
     public class ApprovalTest
diff --git a/csharpcore/GuildedRoseTests/GildedRoseTest.cs b/csharpcore/GildedRoseTests/GildedRoseTest.cs
similarity index 85%
rename from csharpcore/GuildedRoseTests/GildedRoseTest.cs
rename to csharpcore/GildedRoseTests/GildedRoseTest.cs
index 5134a2a5..6e5d24b6 100644
--- a/csharpcore/GuildedRoseTests/GildedRoseTest.cs
+++ b/csharpcore/GildedRoseTests/GildedRoseTest.cs
@@ -1,8 +1,8 @@
 using Xunit;
 using System.Collections.Generic;
-using GuildedRose;
+using GildedRoseKata;
 
-namespace GuildedRoseTests
+namespace GildedRoseTests
 {
     public class GildedRoseTest
     {
diff --git a/csharpcore/GuildedRoseTests/GuildedRoseTests.csproj b/csharpcore/GildedRoseTests/GildedRoseTests.csproj
similarity index 86%
rename from csharpcore/GuildedRoseTests/GuildedRoseTests.csproj
rename to csharpcore/GildedRoseTests/GildedRoseTests.csproj
index 02c2759e..3991f8c9 100644
--- a/csharpcore/GuildedRoseTests/GuildedRoseTests.csproj
+++ b/csharpcore/GildedRoseTests/GildedRoseTests.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\GuildedRose\GuildedRose.csproj" />
+    <ProjectReference Include="..\GildedRose\GildedRose.csproj" />
   </ItemGroup>
 
 </Project>