diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index deac19f67..0985aeb02 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -76,7 +76,7 @@ jobs:
         shell: pwsh
 
       - name: Test Bitwarden solution
-        run: dotnet test ./bitwarden_license/test/CmmCore.Test --configuration Debug --no-build
+        run: dotnet test ./bitwarden_license/test/Commercial.Core.Test --configuration Debug --no-build
         shell: pwsh
 
 
diff --git a/LICENSE_FAQ.md b/LICENSE_FAQ.md
index b84a2f700..84a46fe93 100644
--- a/LICENSE_FAQ.md
+++ b/LICENSE_FAQ.md
@@ -16,12 +16,12 @@ Our current software products have the following licenses:
 
 *Bitwarden server:* The main Bitwarden server code is licensed under the AGPL 3.0 license.
 
-*CommCore and SSO integration:* Code for certain new modules that are designed and developed for use by larger
+*Commercial.Core and SSO integration:* Code for certain new modules that are designed and developed for use by larger
 organizations and enterprise environments is released under the Bitwarden License, a "source available" license. The
 Bitwarden License provides users access to product source code for non-production purposes such as development and
 testing, but requires a paid subscription for production use of the product, and environments supporting production.
-Additionally the Api module by default includes CommCore which is under the Bitwarden License, however this can be
-disabled by using `/p:DefineConstants="OSS"` as an argument to `dotnet` while building the module.
+Additionally the Api module by default includes Commercial.Core which is under the Bitwarden License, however this can
+be disabled by using `/p:DefineConstants="OSS"` as an argument to `dotnet` while building the module.
 
 # Frequently Asked Questions
 
diff --git a/bitwarden-server.sln b/bitwarden-server.sln
index ded2f6504..6f59d3225 100644
--- a/bitwarden-server.sln
+++ b/bitwarden-server.sln
@@ -61,12 +61,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sso", "bitwarden_license\sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Icons.Test", "test\Icons.Test\Icons.Test.csproj", "{C7BA2255-C1B1-4789-8BB9-C27540DA6FB8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommCore", "bitwarden_license\src\CommCore\CommCore.csproj", "{EDC0D688-D58C-4CE1-AA07-3606AC6874B8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commercial.Core", "bitwarden_license\src\Commercial.Core\Commercial.Core.csproj", "{EDC0D688-D58C-4CE1-AA07-3606AC6874B8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3973D21B-A692-4B60-9B70-3631C057423A} = {3973D21B-A692-4B60-9B70-3631C057423A}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommCore.Test", "bitwarden_license\test\CmmCore.Test\CommCore.Test.csproj", "{0E99A21B-684B-4C59-9831-90F775CAB6F7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commercial.Core.Test", "bitwarden_license\test\Commercial.Core.Test\Commercial.Core.Test.csproj", "{0E99A21B-684B-4C59-9831-90F775CAB6F7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test - Bitwarden License", "test - Bitwarden License", "{287CFF34-BBDB-4BC4-AF88-1E19A5A4679B}"
 EndProject
diff --git a/bitwarden_license/src/CommCore/CommCore.csproj b/bitwarden_license/src/Commercial.Core/Commercial.Core.csproj
similarity index 100%
rename from bitwarden_license/src/CommCore/CommCore.csproj
rename to bitwarden_license/src/Commercial.Core/Commercial.Core.csproj
diff --git a/bitwarden_license/src/CommCore/Services/ProviderService.cs b/bitwarden_license/src/Commercial.Core/Services/ProviderService.cs
similarity index 99%
rename from bitwarden_license/src/CommCore/Services/ProviderService.cs
rename to bitwarden_license/src/Commercial.Core/Services/ProviderService.cs
index 596de0e28..22c180524 100644
--- a/bitwarden_license/src/CommCore/Services/ProviderService.cs
+++ b/bitwarden_license/src/Commercial.Core/Services/ProviderService.cs
@@ -13,7 +13,7 @@ using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.DataProtection;
 
-namespace Bit.CommCore.Services
+namespace Bit.Commercial.Core.Services
 {
     public class ProviderService : IProviderService
     {
diff --git a/bitwarden_license/src/CommCore/Utilities/ServiceCollectionExtensions.cs b/bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs
similarity index 79%
rename from bitwarden_license/src/CommCore/Utilities/ServiceCollectionExtensions.cs
rename to bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs
index bd8447120..4074fe5f7 100644
--- a/bitwarden_license/src/CommCore/Utilities/ServiceCollectionExtensions.cs
+++ b/bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs
@@ -1,8 +1,8 @@
-using Bit.CommCore.Services;
+using Bit.Commercial.Core.Services;
 using Bit.Core.Services;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Bit.CommCore.Utilities
+namespace Bit.Commercial.Core.Utilities
 {
     public static class ServiceCollectionExtensions
     {
diff --git a/bitwarden_license/src/CommCore/packages.lock.json b/bitwarden_license/src/Commercial.Core/packages.lock.json
similarity index 100%
rename from bitwarden_license/src/CommCore/packages.lock.json
rename to bitwarden_license/src/Commercial.Core/packages.lock.json
diff --git a/bitwarden_license/test/CmmCore.Test/AutoFixture/ProviderUserFixtures.cs b/bitwarden_license/test/Commercial.Core.Test/AutoFixture/ProviderUserFixtures.cs
similarity index 88%
rename from bitwarden_license/test/CmmCore.Test/AutoFixture/ProviderUserFixtures.cs
rename to bitwarden_license/test/Commercial.Core.Test/AutoFixture/ProviderUserFixtures.cs
index 8860f5227..59bc1c59f 100644
--- a/bitwarden_license/test/CmmCore.Test/AutoFixture/ProviderUserFixtures.cs
+++ b/bitwarden_license/test/Commercial.Core.Test/AutoFixture/ProviderUserFixtures.cs
@@ -3,7 +3,7 @@ using AutoFixture;
 using AutoFixture.Xunit2;
 using Bit.Core.Enums.Provider;
 
-namespace Bit.CommCore.Test.AutoFixture.ProviderUserFixtures
+namespace Bit.Commercial.Core.Test.AutoFixture
 {
     internal class ProviderUser : ICustomization
     {
@@ -18,7 +18,7 @@ namespace Bit.CommCore.Test.AutoFixture.ProviderUserFixtures
 
         public void Customize(IFixture fixture)
         {
-            fixture.Customize<Core.Entities.Provider.ProviderUser>(composer => composer
+            fixture.Customize<Bit.Core.Entities.Provider.ProviderUser>(composer => composer
                 .With(o => o.Type, Type)
                 .With(o => o.Status, Status));
         }
diff --git a/bitwarden_license/test/CmmCore.Test/CommCore.Test.csproj b/bitwarden_license/test/Commercial.Core.Test/Commercial.Core.Test.csproj
similarity index 91%
rename from bitwarden_license/test/CmmCore.Test/CommCore.Test.csproj
rename to bitwarden_license/test/Commercial.Core.Test/Commercial.Core.Test.csproj
index dba4bcff8..6c92db92b 100644
--- a/bitwarden_license/test/CmmCore.Test/CommCore.Test.csproj
+++ b/bitwarden_license/test/Commercial.Core.Test/Commercial.Core.Test.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\CommCore\CommCore.csproj" />
+    <ProjectReference Include="..\..\src\Commercial.Core\Commercial.Core.csproj" />
     <ProjectReference Include="..\..\..\test\Core.Test\Core.Test.csproj" />
   </ItemGroup>
 
diff --git a/bitwarden_license/test/CmmCore.Test/Services/ProviderServiceTests.cs b/bitwarden_license/test/Commercial.Core.Test/Services/ProviderServiceTests.cs
similarity index 99%
rename from bitwarden_license/test/CmmCore.Test/Services/ProviderServiceTests.cs
rename to bitwarden_license/test/Commercial.Core.Test/Services/ProviderServiceTests.cs
index 67f7e433a..a8c08b632 100644
--- a/bitwarden_license/test/CmmCore.Test/Services/ProviderServiceTests.cs
+++ b/bitwarden_license/test/Commercial.Core.Test/Services/ProviderServiceTests.cs
@@ -1,5 +1,5 @@
-using Bit.CommCore.Services;
-using Bit.CommCore.Test.AutoFixture.ProviderUserFixtures;
+using Bit.Commercial.Core.Services;
+using Bit.Commercial.Core.Test.AutoFixture;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
@@ -19,7 +19,7 @@ using NSubstitute.ReturnsExtensions;
 using Xunit;
 using ProviderUser = Bit.Core.Entities.Provider.ProviderUser;
 
-namespace Bit.CommCore.Test.Services
+namespace Bit.Commercial.Core.Test.Services
 {
     public class ProviderServiceTests
     {
diff --git a/bitwarden_license/test/CmmCore.Test/packages.lock.json b/bitwarden_license/test/Commercial.Core.Test/packages.lock.json
similarity index 99%
rename from bitwarden_license/test/CmmCore.Test/packages.lock.json
rename to bitwarden_license/test/Commercial.Core.Test/packages.lock.json
index 3443b00b0..9debedc30 100644
--- a/bitwarden_license/test/CmmCore.Test/packages.lock.json
+++ b/bitwarden_license/test/Commercial.Core.Test/packages.lock.json
@@ -2880,13 +2880,13 @@
         "type": "Project",
         "dependencies": {
           "Azure.Messaging.EventGrid": "4.10.0",
-          "CommCore": "2022.6.2",
+          "Commercial.Core": "2022.6.2",
           "Core": "2022.6.2",
           "SharedWeb": "2022.6.2",
           "Swashbuckle.AspNetCore": "6.3.1"
         }
       },
-      "commcore": {
+      "commercial.core": {
         "type": "Project",
         "dependencies": {
           "Core": "2022.6.2"
diff --git a/src/Admin/Admin.csproj b/src/Admin/Admin.csproj
index 281521bd3..fa3d2f452 100644
--- a/src/Admin/Admin.csproj
+++ b/src/Admin/Admin.csproj
@@ -13,7 +13,7 @@
   <Choose>
     <When Condition="!$(DefineConstants.Contains('OSS'))">
       <ItemGroup>
-        <ProjectReference Include="..\..\bitwarden_license\src\CommCore\CommCore.csproj" />
+        <ProjectReference Include="..\..\bitwarden_license\src\Commercial.Core\Commercial.Core.csproj" />
       </ItemGroup>
     </When>
   </Choose>
diff --git a/src/Admin/Startup.cs b/src/Admin/Startup.cs
index dd1d994f1..ea8485c79 100644
--- a/src/Admin/Startup.cs
+++ b/src/Admin/Startup.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Identity;
 using Stripe;
 
 #if !OSS
-using Bit.CommCore.Utilities;
+using Bit.Commercial.Core.Utilities;
 #endif
 
 namespace Bit.Admin
diff --git a/src/Admin/packages.lock.json b/src/Admin/packages.lock.json
index f51eb5cf0..5f2f1e33b 100644
--- a/src/Admin/packages.lock.json
+++ b/src/Admin/packages.lock.json
@@ -3145,7 +3145,7 @@
           "NETStandard.Library": "1.6.1"
         }
       },
-      "commcore": {
+      "commercial.core": {
         "type": "Project",
         "dependencies": {
           "Core": "2022.6.2"
diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj
index 1d7eca09d..30ef64658 100644
--- a/src/Api/Api.csproj
+++ b/src/Api/Api.csproj
@@ -23,7 +23,7 @@
   <Choose>
     <When Condition="!$(DefineConstants.Contains('OSS'))">
       <ItemGroup>
-        <ProjectReference Include="..\..\bitwarden_license\src\CommCore\CommCore.csproj" />
+        <ProjectReference Include="..\..\bitwarden_license\src\Commercial.Core\Commercial.Core.csproj" />
       </ItemGroup>
     </When>
   </Choose>
diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs
index 87249f026..7bebb1a9b 100644
--- a/src/Api/Startup.cs
+++ b/src/Api/Startup.cs
@@ -14,7 +14,7 @@ using Bit.SharedWeb.Utilities;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 #if !OSS
-using Bit.CommCore.Utilities;
+using Bit.Commercial.Core.Utilities;
 #endif
 
 namespace Bit.Api
diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json
index e63da9891..f24c48b0a 100644
--- a/src/Api/packages.lock.json
+++ b/src/Api/packages.lock.json
@@ -2645,7 +2645,7 @@
           "NETStandard.Library": "1.6.1"
         }
       },
-      "commcore": {
+      "commercial.core": {
         "type": "Project",
         "dependencies": {
           "Core": "2022.6.2"
diff --git a/test/Api.Test/packages.lock.json b/test/Api.Test/packages.lock.json
index 6898f6d5f..0c1f5fc42 100644
--- a/test/Api.Test/packages.lock.json
+++ b/test/Api.Test/packages.lock.json
@@ -2873,13 +2873,13 @@
         "type": "Project",
         "dependencies": {
           "Azure.Messaging.EventGrid": "4.10.0",
-          "CommCore": "2022.6.2",
+          "Commercial.Core": "2022.6.2",
           "Core": "2022.6.2",
           "SharedWeb": "2022.6.2",
           "Swashbuckle.AspNetCore": "6.3.1"
         }
       },
-      "commcore": {
+      "commercial.core": {
         "type": "Project",
         "dependencies": {
           "Core": "2022.6.2"
diff --git a/test/Billing.Test/packages.lock.json b/test/Billing.Test/packages.lock.json
index 592ee1b56..ea2b43035 100644
--- a/test/Billing.Test/packages.lock.json
+++ b/test/Billing.Test/packages.lock.json
@@ -3393,7 +3393,7 @@
         "type": "Project",
         "dependencies": {
           "Azure.Messaging.EventGrid": "4.10.0",
-          "CommCore": "2022.6.2",
+          "Commercial.Core": "2022.6.2",
           "Core": "2022.6.2",
           "SharedWeb": "2022.6.2",
           "Swashbuckle.AspNetCore": "6.3.1"
@@ -3407,7 +3407,7 @@
           "SharedWeb": "2022.6.2"
         }
       },
-      "commcore": {
+      "commercial.core": {
         "type": "Project",
         "dependencies": {
           "Core": "2022.6.2"
diff --git a/test/Common/packages.lock.json b/test/Common/packages.lock.json
index 096425d82..bd2317e43 100644
--- a/test/Common/packages.lock.json
+++ b/test/Common/packages.lock.json
@@ -2869,13 +2869,13 @@
         "type": "Project",
         "dependencies": {
           "Azure.Messaging.EventGrid": "4.10.0",
-          "CommCore": "2022.6.2",
+          "Commercial.Core": "2022.6.2",
           "Core": "2022.6.2",
           "SharedWeb": "2022.6.2",
           "Swashbuckle.AspNetCore": "6.3.1"
         }
       },
-      "commcore": {
+      "commercial.core": {
         "type": "Project",
         "dependencies": {
           "Core": "2022.6.2"
diff --git a/test/Core.Test/packages.lock.json b/test/Core.Test/packages.lock.json
index fa338aaf6..f5be78176 100644
--- a/test/Core.Test/packages.lock.json
+++ b/test/Core.Test/packages.lock.json
@@ -2885,13 +2885,13 @@
         "type": "Project",
         "dependencies": {
           "Azure.Messaging.EventGrid": "4.10.0",
-          "CommCore": "2022.6.2",
+          "Commercial.Core": "2022.6.2",
           "Core": "2022.6.2",
           "SharedWeb": "2022.6.2",
           "Swashbuckle.AspNetCore": "6.3.1"
         }
       },
-      "commcore": {
+      "commercial.core": {
         "type": "Project",
         "dependencies": {
           "Core": "2022.6.2"
diff --git a/test/Identity.IntegrationTest/packages.lock.json b/test/Identity.IntegrationTest/packages.lock.json
index 225863737..4c6f57d22 100644
--- a/test/Identity.IntegrationTest/packages.lock.json
+++ b/test/Identity.IntegrationTest/packages.lock.json
@@ -3010,13 +3010,13 @@
         "type": "Project",
         "dependencies": {
           "Azure.Messaging.EventGrid": "4.10.0",
-          "CommCore": "2022.6.2",
+          "Commercial.Core": "2022.6.2",
           "Core": "2022.6.2",
           "SharedWeb": "2022.6.2",
           "Swashbuckle.AspNetCore": "6.3.1"
         }
       },
-      "commcore": {
+      "commercial.core": {
         "type": "Project",
         "dependencies": {
           "Core": "2022.6.2"
diff --git a/test/Identity.Test/packages.lock.json b/test/Identity.Test/packages.lock.json
index 969bfc4e5..361dfc260 100644
--- a/test/Identity.Test/packages.lock.json
+++ b/test/Identity.Test/packages.lock.json
@@ -2873,13 +2873,13 @@
         "type": "Project",
         "dependencies": {
           "Azure.Messaging.EventGrid": "4.10.0",
-          "CommCore": "2022.6.2",
+          "Commercial.Core": "2022.6.2",
           "Core": "2022.6.2",
           "SharedWeb": "2022.6.2",
           "Swashbuckle.AspNetCore": "6.3.1"
         }
       },
-      "commcore": {
+      "commercial.core": {
         "type": "Project",
         "dependencies": {
           "Core": "2022.6.2"
diff --git a/test/IntegrationTestCommon/packages.lock.json b/test/IntegrationTestCommon/packages.lock.json
index 568ad1fec..bb903aa4a 100644
--- a/test/IntegrationTestCommon/packages.lock.json
+++ b/test/IntegrationTestCommon/packages.lock.json
@@ -2996,13 +2996,13 @@
         "type": "Project",
         "dependencies": {
           "Azure.Messaging.EventGrid": "4.10.0",
-          "CommCore": "2022.6.2",
+          "Commercial.Core": "2022.6.2",
           "Core": "2022.6.2",
           "SharedWeb": "2022.6.2",
           "Swashbuckle.AspNetCore": "6.3.1"
         }
       },
-      "commcore": {
+      "commercial.core": {
         "type": "Project",
         "dependencies": {
           "Core": "2022.6.2"
diff --git a/util/MySqlMigrations/packages.lock.json b/util/MySqlMigrations/packages.lock.json
index 8318fcade..6dc109b4b 100644
--- a/util/MySqlMigrations/packages.lock.json
+++ b/util/MySqlMigrations/packages.lock.json
@@ -2662,13 +2662,13 @@
         "type": "Project",
         "dependencies": {
           "Azure.Messaging.EventGrid": "4.10.0",
-          "CommCore": "2022.6.2",
+          "Commercial.Core": "2022.6.2",
           "Core": "2022.6.2",
           "SharedWeb": "2022.6.2",
           "Swashbuckle.AspNetCore": "6.3.1"
         }
       },
-      "commcore": {
+      "commercial.core": {
         "type": "Project",
         "dependencies": {
           "Core": "2022.6.2"
diff --git a/util/PostgresMigrations/packages.lock.json b/util/PostgresMigrations/packages.lock.json
index 8318fcade..6dc109b4b 100644
--- a/util/PostgresMigrations/packages.lock.json
+++ b/util/PostgresMigrations/packages.lock.json
@@ -2662,13 +2662,13 @@
         "type": "Project",
         "dependencies": {
           "Azure.Messaging.EventGrid": "4.10.0",
-          "CommCore": "2022.6.2",
+          "Commercial.Core": "2022.6.2",
           "Core": "2022.6.2",
           "SharedWeb": "2022.6.2",
           "Swashbuckle.AspNetCore": "6.3.1"
         }
       },
-      "commcore": {
+      "commercial.core": {
         "type": "Project",
         "dependencies": {
           "Core": "2022.6.2"