diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index d80b811540..447bab830f 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -4,7 +4,7 @@
             "AdxVerificationCompositeRule"
         ],
         "packages": {
-            "dotnet-watch": { },
+            "Microsoft.DotNet.Watcher.Tools": { },
             "Microsoft.DotNet.Watcher.Core": { }
         }
     },
diff --git a/src/Microsoft.DotNet.Watcher.Tools/CommandOutputLogger.cs b/src/Microsoft.DotNet.Watcher.Tools/CommandOutputLogger.cs
index aeb90f45c2..9ad0149db1 100644
--- a/src/Microsoft.DotNet.Watcher.Tools/CommandOutputLogger.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/CommandOutputLogger.cs
@@ -5,7 +5,7 @@ using System;
 using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.DotNet.Watcher
+namespace Microsoft.DotNet.Watcher.Tools
 {
     /// <summary>
     /// Logger to print formatted command output.
diff --git a/src/Microsoft.DotNet.Watcher.Tools/CommandOutputProvider.cs b/src/Microsoft.DotNet.Watcher.Tools/CommandOutputProvider.cs
index fd4945a078..a7ce107196 100644
--- a/src/Microsoft.DotNet.Watcher.Tools/CommandOutputProvider.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/CommandOutputProvider.cs
@@ -5,7 +5,7 @@ using System;
 using Microsoft.Extensions.PlatformAbstractions;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.DotNet.Watcher
+namespace Microsoft.DotNet.Watcher.Tools
 {
     public class CommandOutputProvider : ILoggerProvider
     {
diff --git a/src/Microsoft.DotNet.Watcher.Tools/Program.cs b/src/Microsoft.DotNet.Watcher.Tools/Program.cs
index 7f5c0ac257..96fdb8404a 100644
--- a/src/Microsoft.DotNet.Watcher.Tools/Program.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Program.cs
@@ -11,7 +11,7 @@ using Microsoft.Extensions.PlatformAbstractions;
 using Microsoft.DotNet.Watcher.Core;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.DotNet.Watcher
+namespace Microsoft.DotNet.Watcher.Tools
 {
     public class Program
     {
diff --git a/src/Microsoft.DotNet.Watcher.Tools/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.Watcher.Tools/Properties/AssemblyInfo.cs
index 43612c95ba..e29eda63c2 100644
--- a/src/Microsoft.DotNet.Watcher.Tools/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Properties/AssemblyInfo.cs
@@ -5,7 +5,6 @@ using System.Reflection;
 using System.Resources;
 using System.Runtime.CompilerServices;
 
-[assembly:InternalsVisibleTo("dotnet-watch.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
 [assembly: NeutralResourcesLanguage("en-US")]
 [assembly: AssemblyCompany("Microsoft Corporation.")]
diff --git a/src/Microsoft.DotNet.Watcher.Tools/project.json b/src/Microsoft.DotNet.Watcher.Tools/project.json
index 3017b1b110..55166cb20b 100644
--- a/src/Microsoft.DotNet.Watcher.Tools/project.json
+++ b/src/Microsoft.DotNet.Watcher.Tools/project.json
@@ -1,6 +1,7 @@
 {
   "version": "1.0.0-*",
   "compilationOptions": {
+    "outputName": "dotnet-watch",
     "warningsAsErrors": true,
     "emitEntryPoint": true,
     "keyFile": "../../tools/Key.snk",
diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/AppWithDepsTests.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/AppWithDepsTests.cs
index 55678cf11b..913c79abb2 100644
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/AppWithDepsTests.cs
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/AppWithDepsTests.cs
@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.IO;
 using Xunit;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public class AppWithDepsTests
     {
diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/FileWatcherTests.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/FileWatcherTests.cs
index 9a652f4325..6de6151209 100644
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/FileWatcherTests.cs
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/FileWatcherTests.cs
@@ -9,7 +9,7 @@ using System.Threading;
 using Microsoft.DotNet.Watcher.Core.Internal;
 using Xunit;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public class FileWatcherTests
     {
diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/GlobbingAppTests.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/GlobbingAppTests.cs
index 9df0d466f3..456d7a7ec0 100644
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/GlobbingAppTests.cs
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/GlobbingAppTests.cs
@@ -7,7 +7,7 @@ using System.IO;
 using System.Threading;
 using Xunit;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public class GlobbingAppTests
     {
diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/NoDepsAppTests.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/NoDepsAppTests.cs
index 418fe53fe1..5ea274b3b1 100644
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/NoDepsAppTests.cs
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/NoDepsAppTests.cs
@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.IO;
 using Xunit;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public class NoDepsAppTests
     {
diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/DotNetWatchScenario.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/DotNetWatchScenario.cs
index 2a0b2e441c..10a20ce7ab 100644
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/DotNetWatchScenario.cs
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/DotNetWatchScenario.cs
@@ -7,11 +7,11 @@ using System.Diagnostics;
 using System.IO;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public class DotNetWatchScenario : IDisposable
     {
-        protected const string DotnetWatch = "dotnet-watch";
+        protected const string DotnetWatch = "Microsoft.DotNet.Watcher.Tools";
 
         protected static readonly string _repositoryRoot = FindRepoRoot();
         protected static readonly string _artifactsFolder = Path.Combine(_repositoryRoot, "artifacts", "build");
diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs
index e2f548e7a2..a5abaab1fd 100644
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs
@@ -10,7 +10,7 @@ using System.Threading;
 using System.Xml.Linq;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public class ProjectToolScenario: IDisposable
     {
diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/WaitForFileToChange.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/WaitForFileToChange.cs
index 64c59c61dc..38ced6b437 100644
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/WaitForFileToChange.cs
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/WaitForFileToChange.cs
@@ -6,7 +6,7 @@ using System.IO;
 using System.Threading;
 using Microsoft.DotNet.Watcher.Core.Internal;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public class WaitForFileToChange : IDisposable
     {
diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Waiters.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Waiters.cs
index a65a80feb3..113d339769 100644
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Waiters.cs
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Waiters.cs
@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public static class Waiters
     {