diff --git a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor
index 94ee91d6..245ce1cb 100644
--- a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor
@@ -9,7 +9,7 @@
             <Label For="name" HelpText="The name of the tenant">Name: </Label>
         </td>
         <td>
-            @if (name == Constants.MasterTenant)
+            @if (name == TenantNames.Master)
             {
                 <input id="name" class="form-control" @bind="@name" readonly />
             }
diff --git a/Oqtane.Client/Modules/Admin/Tenants/Index.razor b/Oqtane.Client/Modules/Admin/Tenants/Index.razor
index 1ce7c686..5858a059 100644
--- a/Oqtane.Client/Modules/Admin/Tenants/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Tenants/Index.razor
@@ -17,7 +17,7 @@ else
         </Header>
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.TenantId.ToString())" /></td>
-            <td><ActionDialog Header="Delete Tenant" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Tenant?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTenant(context))" Disabled="@(context.Name == Constants.MasterTenant)" /></td>
+            <td><ActionDialog Header="Delete Tenant" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Tenant?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTenant(context))" Disabled="@(context.Name == TenantNames.Master)" /></td>
             <td>@context.Name</td>
         </Row>
     </Pager>
diff --git a/Oqtane.Client/UI/Installer.razor b/Oqtane.Client/UI/Installer.razor
index 8b915b5f..6ee0bba4 100644
--- a/Oqtane.Client/UI/Installer.razor
+++ b/Oqtane.Client/UI/Installer.razor
@@ -131,7 +131,7 @@
     private string _databaseName = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
     private string _username = string.Empty;
     private string _password = string.Empty;
-    private string _hostUsername = Constants.HostUser;
+    private string _hostUsername = UserNames.Host;
     private string _hostPassword = string.Empty;
     private string _confirmPassword = string.Empty;
     private string _hostEmail = string.Empty;
@@ -188,8 +188,8 @@
                 Aliases = uri.Authority,
                 HostEmail = _hostEmail,
                 HostPassword = _hostPassword,
-                HostName = Constants.HostUser,
-                TenantName = Constants.MasterTenant,
+                HostName = UserNames.Host,
+                TenantName = TenantNames.Master,
                 IsNewTenant = true,
                 SiteName = Constants.DefaultSite
             };
diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
index 28228280..4f598322 100644
--- a/Oqtane.Server/Infrastructure/DatabaseManager.cs
+++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -72,7 +72,7 @@ namespace Oqtane.Infrastructure
             if (install == null)
             {
                 // startup or silent installation
-                install = new InstallConfig { ConnectionString = _config.GetConnectionString(SettingKeys.ConnectionStringKey), TenantName = Constants.MasterTenant, IsNewTenant = false };
+                install = new InstallConfig { ConnectionString = _config.GetConnectionString(SettingKeys.ConnectionStringKey), TenantName = TenantNames.Master, IsNewTenant = false };
 
                 if (!IsInstalled())
                 {
@@ -192,7 +192,7 @@ namespace Oqtane.Infrastructure
         {
             var result = new Installation { Success = false, Message = string.Empty };
 
-            if (install.TenantName == Constants.MasterTenant)
+            if (install.TenantName == TenantNames.Master)
             {
                 MigrateScriptNamingConvention("Master", install.ConnectionString);
 
@@ -245,7 +245,7 @@ namespace Oqtane.Infrastructure
                         db.SaveChanges();
                         _cache.Remove("tenants");
 
-                        if (install.TenantName == Constants.MasterTenant)
+                        if (install.TenantName == TenantNames.Master)
                         {
                             var job = new Job { Name = "Notification Job", JobType = "Oqtane.Infrastructure.NotificationJob, Oqtane.Server", Frequency = "m", Interval = 1, StartDate = null, EndDate = null, IsEnabled = false, IsStarted = false, IsExecuting = false, NextExecution = null, RetentionHistory = 10, CreatedBy = "", CreatedOn = DateTime.UtcNow, ModifiedBy = "", ModifiedOn = DateTime.UtcNow };
                             db.Job.Add(job);
@@ -350,7 +350,7 @@ namespace Oqtane.Infrastructure
                                 foreach (var tenant in db.Tenant.ToList())
                                 {
                                     int index = Array.FindIndex(versions, item => item == moduledefinition.Version);
-                                    if (tenant.Name == install.TenantName && install.TenantName != Constants.MasterTenant)
+                                    if (tenant.Name == install.TenantName && install.TenantName != TenantNames.Master)
                                     {
                                         index = -1;
                                     }
diff --git a/Oqtane.Server/Repository/TenantRepository.cs b/Oqtane.Server/Repository/TenantRepository.cs
index 6c22ba75..7df0cbe2 100644
--- a/Oqtane.Server/Repository/TenantRepository.cs
+++ b/Oqtane.Server/Repository/TenantRepository.cs
@@ -40,7 +40,7 @@ namespace Oqtane.Repository
         {
             var oldTenant =_db.Tenant.AsNoTracking().FirstOrDefault(t=> t.TenantId == tenant.TenantId);
             
-            if (oldTenant != null && (oldTenant.Name.Equals(Constants.MasterTenant, StringComparison.OrdinalIgnoreCase) && !oldTenant.Name.Equals(tenant.Name)))
+            if (oldTenant != null && (oldTenant.Name.Equals(TenantNames.Master, StringComparison.OrdinalIgnoreCase) && !oldTenant.Name.Equals(tenant.Name)))
             {
                 throw new InvalidOperationException("Unable to rename the master tenant.");
             }
@@ -59,7 +59,7 @@ namespace Oqtane.Repository
         public void DeleteTenant(int tenantId)
         {
             var tenant = GetTenant(tenantId);
-            if (tenant != null && !tenant.Name.Equals(Constants.MasterTenant, StringComparison.OrdinalIgnoreCase))
+            if (tenant != null && !tenant.Name.Equals(TenantNames.Master, StringComparison.OrdinalIgnoreCase))
             {
                 _db.Tenant.Remove(tenant);
                 _db.SaveChanges();
diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs
index a4eeffb4..c065f347 100644
--- a/Oqtane.Shared/Shared/Constants.cs
+++ b/Oqtane.Shared/Shared/Constants.cs
@@ -40,7 +40,8 @@ namespace Oqtane.Shared {
         [Obsolete("Use UserNames.Host instead.")]
         public const string HostUser = UserNames.Host;
 
-        public const string MasterTenant = "Master";
+        [Obsolete("Use TenantNames.Master instead")]
+        public const string MasterTenant = TenantNames.Master;
         public const string DefaultSite = "Default Site";
 
         const string RoleObsoleteMessage = "Use the corresponding memeber from Oqtane.Shared.RoleNames";
diff --git a/Oqtane.Shared/Shared/TenantNames.cs b/Oqtane.Shared/Shared/TenantNames.cs
new file mode 100644
index 00000000..057235fd
--- /dev/null
+++ b/Oqtane.Shared/Shared/TenantNames.cs
@@ -0,0 +1,9 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Oqtane.Shared {
+    public class TenantNames {
+        public const string Master = "Master";
+    }
+}