diff --git a/test/dotnet-test.Tests/GivenDotnetTest3BuildsAndRunsTestFromCsprojForMultipleTFM.cs b/test/dotnet-test.Tests/GivenDotnetTest3BuildsAndRunsTestFromCsprojForMultipleTFM.cs
index e1dcde289..3ef4dc3af 100644
--- a/test/dotnet-test.Tests/GivenDotnetTest3BuildsAndRunsTestFromCsprojForMultipleTFM.cs
+++ b/test/dotnet-test.Tests/GivenDotnetTest3BuildsAndRunsTestFromCsprojForMultipleTFM.cs
@@ -16,13 +16,13 @@ namespace Microsoft.DotNet.Cli.Test.Tests
         [WindowsOnlyFact]
         public void MStestMultiTFM()
         {
-            // Copy VSTestDesktopAndNetCoreApp project in output directory of project dotnet-test.Tests
-            string testAppName = "VSTestDesktopAndNetCoreApp";
+            // Copy VSTestDesktopAndNetCore project in output directory of project dotnet-test.Tests
+            string testAppName = "VSTestDesktopAndNetCore";
             TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName);
 
             string testProjectDirectory = testInstance.TestRoot;
 
-            // Restore project VSTestDesktopAndNetCoreApp
+            // Restore project VSTestDesktopAndNetCore
             new RestoreCommand()
                 .WithWorkingDirectory(testProjectDirectory)
                 .Execute()
@@ -48,13 +48,13 @@ namespace Microsoft.DotNet.Cli.Test.Tests
         [WindowsOnlyFact]
         public void XunitMultiTFM()
         {
-            // Copy VSTestXunitDesktopAndNetCoreApp project in output directory of project dotnet-test.Tests
-            string testAppName = "VSTestXunitDesktopAndNetCoreApp";
+            // Copy VSTestXunitDesktopAndNetCore project in output directory of project dotnet-test.Tests
+            string testAppName = "VSTestXunitDesktopAndNetCore";
             TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName);
 
             string testProjectDirectory = testInstance.TestRoot;
 
-            // Restore project VSTestXunitDesktopAndNetCoreApp
+            // Restore project VSTestXunitDesktopAndNetCore
             new RestoreCommand()
                 .WithWorkingDirectory(testProjectDirectory)
                 .Execute()
diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
index 4f2f7322f..37f527585 100644
--- a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
+++ b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
@@ -16,13 +16,13 @@ namespace Microsoft.DotNet.Cli.Test.Tests
         [Fact]
         public void MSTestSingleTFM()
         {
-            // Copy VSTestDotNetCoreProject project in output directory of project dotnet-vstest.Tests
-            string testAppName = "VSTestDotNetCoreProject";
+            // Copy VSTestDotNetCore project in output directory of project dotnet-vstest.Tests
+            string testAppName = "VSTestDotNetCore";
             TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName);
 
             string testProjectDirectory = testInstance.TestRoot;
 
-            // Restore project VSTestDotNetCoreProject
+            // Restore project VSTestDotNetCore
             new RestoreCommand()
                 .WithWorkingDirectory(testProjectDirectory)
                 .Execute()
@@ -43,13 +43,13 @@ namespace Microsoft.DotNet.Cli.Test.Tests
         [Fact]
         public void XunitSingleTFM()
         {
-            // Copy VSTestXunitDotNetCoreProject project in output directory of project dotnet-vstest.Tests
-            string testAppName = "VSTestXunitDotNetCoreProject";
+            // Copy VSTestXunitDotNetCore project in output directory of project dotnet-vstest.Tests
+            string testAppName = "VSTestXunitDotNetCore";
             TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName);
 
             string testProjectDirectory = testInstance.TestRoot;
 
-            // Restore project VSTestXunitDotNetCoreProject
+            // Restore project VSTestXunitDotNetCore
             new RestoreCommand()
                 .WithWorkingDirectory(testProjectDirectory)
                 .Execute()
@@ -70,13 +70,13 @@ namespace Microsoft.DotNet.Cli.Test.Tests
         [Fact]
         public void TestWillNotBuildTheProjectIfNoBuildArgsIsGiven()
         {
-            // Copy VSTestDotNetCoreProject project in output directory of project dotnet-vstest.Tests
-            string testAppName = "VSTestDotNetCoreProject";
+            // Copy VSTestDotNetCore project in output directory of project dotnet-vstest.Tests
+            string testAppName = "VSTestDotNetCore";
             TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName);
 
             string testProjectDirectory = testInstance.TestRoot;
 
-            // Restore project VSTestDotNetCoreProject
+            // Restore project VSTestDotNetCore
             new RestoreCommand()
                 .WithWorkingDirectory(testProjectDirectory)
                 .Execute()
@@ -85,7 +85,7 @@ namespace Microsoft.DotNet.Cli.Test.Tests
 
             string configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
             string expectedError = Path.Combine(testProjectDirectory, "bin",
-                                   configuration, "netcoreapp1.0", "VSTestDotNetCoreProject.dll");
+                                   configuration, "netcoreapp1.0", "VSTestDotNetCore.dll");
             expectedError = "The test source file " + "\"" + expectedError + "\"" + " provided was not found.";
 
             // Call test