diff --git a/util/Server/Program.cs b/util/Server/Program.cs
index 9669d9bfec..fa5339a4e1 100644
--- a/util/Server/Program.cs
+++ b/util/Server/Program.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 
-namespace Server
+namespace Bit.Server
 {
     public class Program
     {
diff --git a/util/Server/Server.csproj b/util/Server/Server.csproj
index 658b8f9baf..3ce0808ca7 100644
--- a/util/Server/Server.csproj
+++ b/util/Server/Server.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
+    <RootNamespace>Bit.Server</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/util/Server/Startup.cs b/util/Server/Startup.cs
index 8305f47c26..0edef59122 100644
--- a/util/Server/Startup.cs
+++ b/util/Server/Startup.cs
@@ -3,7 +3,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace Server
+namespace Bit.Server
 {
     public class Startup
     {
diff --git a/util/Setup/Helpers.cs b/util/Setup/Helpers.cs
index 52936714c3..db0e230342 100644
--- a/util/Setup/Helpers.cs
+++ b/util/Setup/Helpers.cs
@@ -5,7 +5,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Setup
+namespace Bit.Setup
 {
     public static class Helpers
     {
diff --git a/util/Setup/Program.cs b/util/Setup/Program.cs
index c8cbe30bd8..09aa03be3b 100644
--- a/util/Setup/Program.cs
+++ b/util/Setup/Program.cs
@@ -9,7 +9,7 @@ using System.Net.Http;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-namespace Setup
+namespace Bit.Setup
 {
     public class Program
     {
diff --git a/util/Setup/Setup.csproj b/util/Setup/Setup.csproj
index 6297029bed..a97fb70cfc 100644
--- a/util/Setup/Setup.csproj
+++ b/util/Setup/Setup.csproj
@@ -4,6 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <NoWarn>1701;1702;1705;NU1701</NoWarn>
+    <RootNamespace>Bit.Setup</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>