diff --git a/src/dotnet/commands/dotnet-new/CSharp_mstest/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj
similarity index 100%
rename from src/dotnet/commands/dotnet-new/CSharp_mstest/$projectName$.csproj
rename to src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj
diff --git a/src/dotnet/commands/dotnet-new/CSharp_mstest/Tests.cs b/src/dotnet/commands/dotnet-new/CSharp_Mstest/Tests.cs
similarity index 100%
rename from src/dotnet/commands/dotnet-new/CSharp_mstest/Tests.cs
rename to src/dotnet/commands/dotnet-new/CSharp_Mstest/Tests.cs
diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj
similarity index 100%
rename from src/dotnet/commands/dotnet-new/CSharp_xunittest/$projectName$.csproj
rename to src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj
diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/Tests.cs b/src/dotnet/commands/dotnet-new/CSharp_Xunittest/Tests.cs
similarity index 100%
rename from src/dotnet/commands/dotnet-new/CSharp_xunittest/Tests.cs
rename to src/dotnet/commands/dotnet-new/CSharp_Xunittest/Tests.cs
diff --git a/src/dotnet/commands/dotnet-new/Program.cs b/src/dotnet/commands/dotnet-new/Program.cs
index 007bd7af6..d8ec18bed 100644
--- a/src/dotnet/commands/dotnet-new/Program.cs
+++ b/src/dotnet/commands/dotnet-new/Program.cs
@@ -138,8 +138,8 @@ namespace Microsoft.DotNet.Tools.New
                                    new { Name = "Console", isMsBuild = true }, 
                                    new { Name = "Web", isMsBuild = true }, 
                                    new { Name = "Lib", isMsBuild = true },
-                                   new { Name = "mstest", isMsBuild = true },
-                                   new { Name = "xunittest", isMsBuild = true }
+                                   new { Name = "Mstest", isMsBuild = true },
+                                   new { Name = "Xunittest", isMsBuild = true }
                                }
             };
 
diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj
index 0cba9b130..899212f98 100644
--- a/src/dotnet/dotnet.csproj
+++ b/src/dotnet/dotnet.csproj
@@ -10,8 +10,8 @@
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;netstandardapp1.5;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50</PackageTargetFallback>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="commands\dotnet-new\CSharp_Console\**;commands\dotnet-new\CSharp_Web\**;commands\dotnet-new\CSharp_Lib\**;commands\dotnet-new\CSharp_mstest\**;commands\dotnet-new\CSharp_xunittest\**" />
-    <EmbeddedResource Include="commands\dotnet-new\CSharp_Console.zip;commands\dotnet-new\CSharp_Lib.zip;commands\dotnet-new\CSharp_Web.zip;commands\dotnet-new\CSharp_mstest.zip;commands\dotnet-new\CSharp_xunittest.zip" />
+    <Compile Include="**\*.cs" Exclude="commands\dotnet-new\CSharp_Console\**;commands\dotnet-new\CSharp_Lib\**;commands\dotnet-new\CSharp_Web\**;commands\dotnet-new\CSharp_Mstest\**;commands\dotnet-new\CSharp_Xunittest\**" />
+    <EmbeddedResource Include="commands\dotnet-new\CSharp_Console.zip;commands\dotnet-new\CSharp_Lib.zip;commands\dotnet-new\CSharp_Web.zip;commands\dotnet-new\CSharp_Mstest.zip;commands\dotnet-new\CSharp_Xunittest.zip" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj" />