[PM-8830] Billing Enums Rename (#4180)

* Renamed ProductType to ProductTierType * Renamed Product properties to ProductTier * Moved ProductTierType to Bit.Core.Billing.Enums namespace from Bit.Core.Enums * Moved PlanType enum to Bit.Core.Billing.Enums * Moved StaticStore to Bit.Core.Billing.Models.StaticStore namespace * Added ProductType enum * dotnet format
2026-01-19 17:03:16 +00:00 · 2024-06-14 15:34:47 -04:00
parent 41ed38080f
commit 721d2969d4
101 changed files with 219 additions and 147 deletions
--- a/src/Core/AdminConsole/Entities/Organization.cs
+++ b/src/Core/AdminConsole/Entities/Organization.cs
@@ -3,6 +3,7 @@ using System.Net;
 using System.Text.Json;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;
--- a/src/Core/AdminConsole/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs
+++ b/src/Core/AdminConsole/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs
@@ -1,5 +1,6 @@
 using System.Text.Json.Serialization;
 using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Utilities;

 namespace Bit.Core.Models.Data.Organizations.OrganizationUsers;
@@ -33,7 +34,7 @@ public class OrganizationUserOrganizationDetails
    public Enums.OrganizationUserStatusType Status { get; set; }
    public Enums.OrganizationUserType Type { get; set; }
    public bool Enabled { get; set; }
-    public Enums.PlanType PlanType { get; set; }
+    public PlanType PlanType { get; set; }
    public string SsoExternalId { get; set; }
    public string Identifier { get; set; }
    public string Permissions { get; set; }
--- a/src/Core/AdminConsole/Models/Data/Provider/ProviderUserOrganizationDetails.cs
+++ b/src/Core/AdminConsole/Models/Data/Provider/ProviderUserOrganizationDetails.cs
@@ -1,5 +1,6 @@
 using System.Text.Json.Serialization;
 using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Utilities;

 namespace Bit.Core.AdminConsole.Models.Data.Provider;
@@ -38,7 +39,7 @@ public class ProviderUserOrganizationDetails
    public Guid? ProviderUserId { get; set; }
    [JsonConverter(typeof(HtmlEncodingStringConverter))]
    public string ProviderName { get; set; }
-    public Core.Enums.PlanType PlanType { get; set; }
+    public PlanType PlanType { get; set; }
    public bool LimitCollectionCreationDeletion { get; set; }
    public bool AllowAdminAccessToAllCollectionItems { get; set; }
    public bool FlexibleCollections { get; set; }
--- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/AcceptOrgUserCommand.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/AcceptOrgUserCommand.cs
@@ -1,6 +1,7 @@
 using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Services;
 using Bit.Core.Auth.Models.Business.Tokenables;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
--- a/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs
+++ b/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs
@@ -13,6 +13,7 @@ using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Business;
 using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Auth.Repositories;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -2054,9 +2055,9 @@ public class OrganizationService : IOrganizationService
            throw new BadRequestException("Plan does not allow additional Machine Accounts.");
        }

-        if ((plan.Product == ProductType.TeamsStarter &&
+        if ((plan.ProductTier == ProductTierType.TeamsStarter &&
            upgrade.AdditionalSmSeats.GetValueOrDefault() > plan.PasswordManager.BaseSeats) ||
-            (plan.Product != ProductType.TeamsStarter &&
+            (plan.ProductTier != ProductTierType.TeamsStarter &&
             upgrade.AdditionalSmSeats.GetValueOrDefault() > upgrade.AdditionalSeats))
        {
            throw new BadRequestException("You cannot have more Secrets Manager seats than Password Manager seats.");
--- a/src/Core/Billing/Entities/ProviderPlan.cs
+++ b/src/Core/Billing/Entities/ProviderPlan.cs
@@ -1,5 +1,5 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Entities;
 using Bit.Core.Utilities;

 namespace Bit.Core.Billing.Entities;
--- a/src/Core/Billing/Enums/PlanType.cs
+++ b/src/Core/Billing/Enums/PlanType.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;

-namespace Bit.Core.Enums;
+namespace Bit.Core.Billing.Enums;

 public enum PlanType : byte
 {
--- a/src/Core/Billing/Enums/ProductTierType.cs
+++ b/src/Core/Billing/Enums/ProductTierType.cs
@@ -1,8 +1,8 @@
 using System.ComponentModel.DataAnnotations;

-namespace Bit.Core.Enums;
+namespace Bit.Core.Billing.Enums;

-public enum ProductType : byte
+public enum ProductTierType : byte
 {
    [Display(Name = "Free")]
    Free = 0,
@@ -15,4 +15,3 @@ public enum ProductType : byte
    [Display(Name = "Teams Starter")]
    TeamsStarter = 4,
 }
-
--- a/src/Core/Billing/Enums/ProductType.cs
+++ b/src/Core/Billing/Enums/ProductType.cs
@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Bit.Core.Billing.Enums;
+
+public enum ProductType
+{
+    [Display(Name = "Password Manager")]
+    PasswordManager = 0,
+    [Display(Name = "Secrets Manager")]
+    SecretsManager = 1,
+}
--- a/src/Core/Billing/Extensions/BillingExtensions.cs
+++ b/src/Core/Billing/Extensions/BillingExtensions.cs
@@ -1,6 +1,7 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Enums;
 using Stripe;

--- a/src/Core/Billing/Models/ConfiguredProviderPlanDTO.cs
+++ b/src/Core/Billing/Models/ConfiguredProviderPlanDTO.cs
@@ -1,5 +1,5 @@
 using Bit.Core.Billing.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;

 namespace Bit.Core.Billing.Models;

--- a/src/Core/Billing/Models/StaticStore/Plan.cs
+++ b/src/Core/Billing/Models/StaticStore/Plan.cs
@@ -1,11 +1,11 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;

 namespace Bit.Core.Models.StaticStore;

 public abstract record Plan
 {
    public PlanType Type { get; protected init; }
-    public ProductType Product { get; protected init; }
+    public ProductTierType ProductTier { get; protected init; }
    public string Name { get; protected init; }
    public bool IsAnnual { get; protected init; }
    public string NameLocalizationKey { get; protected init; }
--- a/src/Core/Billing/Models/StaticStore/Plans/CustomPlan.cs
+++ b/src/Core/Billing/Models/StaticStore/Plans/CustomPlan.cs
@@ -1,8 +1,9 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;

-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;

-public record CustomPlan : Models.StaticStore.Plan
+public record CustomPlan : Plan
 {
    public CustomPlan()
    {
--- a/src/Core/Billing/Models/StaticStore/Plans/Enterprise2019Plan.cs
+++ b/src/Core/Billing/Models/StaticStore/Plans/Enterprise2019Plan.cs
@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;

-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;

-public record Enterprise2019Plan : Models.StaticStore.Plan
+public record Enterprise2019Plan : Plan
 {
    public Enterprise2019Plan(bool isAnnual)
    {
        Type = isAnnual ? PlanType.EnterpriseAnnually2019 : PlanType.EnterpriseMonthly2019;
-        Product = ProductType.Enterprise;
+        ProductTier = ProductTierType.Enterprise;
        Name = isAnnual ? "Enterprise (Annually) 2019" : "Enterprise (Monthly) 2019";
        IsAnnual = isAnnual;
        NameLocalizationKey = "planNameEnterprise";
--- a/src/Core/Billing/Models/StaticStore/Plans/Enterprise2020Plan.cs
+++ b/src/Core/Billing/Models/StaticStore/Plans/Enterprise2020Plan.cs
@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;

-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;

-public record Enterprise2020Plan : Models.StaticStore.Plan
+public record Enterprise2020Plan : Plan
 {
    public Enterprise2020Plan(bool isAnnual)
    {
        Type = isAnnual ? PlanType.EnterpriseAnnually2020 : PlanType.EnterpriseMonthly2020;
-        Product = ProductType.Enterprise;
+        ProductTier = ProductTierType.Enterprise;
        Name = isAnnual ? "Enterprise (Annually) 2020" : "Enterprise (Monthly) 2020";
        IsAnnual = isAnnual;
        NameLocalizationKey = "planNameEnterprise";
--- a/src/Core/Billing/Models/StaticStore/Plans/EnterprisePlan.cs
+++ b/src/Core/Billing/Models/StaticStore/Plans/EnterprisePlan.cs
@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;

-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;

 public record EnterprisePlan : Plan
 {
    public EnterprisePlan(bool isAnnual)
    {
        Type = isAnnual ? PlanType.EnterpriseAnnually : PlanType.EnterpriseMonthly;
-        Product = ProductType.Enterprise;
+        ProductTier = ProductTierType.Enterprise;
        Name = isAnnual ? "Enterprise (Annually)" : "Enterprise (Monthly)";
        IsAnnual = isAnnual;
        NameLocalizationKey = "planNameEnterprise";
--- a/src/Core/Billing/Models/StaticStore/Plans/EnterprisePlan2023.cs
+++ b/src/Core/Billing/Models/StaticStore/Plans/EnterprisePlan2023.cs
@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;

-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;

 public record Enterprise2023Plan : Plan
 {
    public Enterprise2023Plan(bool isAnnual)
    {
        Type = isAnnual ? PlanType.EnterpriseAnnually2023 : PlanType.EnterpriseMonthly2023;
-        Product = ProductType.Enterprise;
+        ProductTier = ProductTierType.Enterprise;
        Name = isAnnual ? "Enterprise (Annually)" : "Enterprise (Monthly)";
        IsAnnual = isAnnual;
        NameLocalizationKey = "planNameEnterprise";
--- a/src/Core/Billing/Models/StaticStore/Plans/Families2019Plan.cs
+++ b/src/Core/Billing/Models/StaticStore/Plans/Families2019Plan.cs
@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;

-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;

-public record Families2019Plan : Models.StaticStore.Plan
+public record Families2019Plan : Plan
 {
    public Families2019Plan()
    {
        Type = PlanType.FamiliesAnnually2019;
-        Product = ProductType.Families;
+        ProductTier = ProductTierType.Families;
        Name = "Families 2019";
        IsAnnual = true;
        NameLocalizationKey = "planNameFamilies";
--- a/src/Core/Billing/Models/StaticStore/Plans/FamiliesPlan.cs
+++ b/src/Core/Billing/Models/StaticStore/Plans/FamiliesPlan.cs
@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;

-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;

-public record FamiliesPlan : Models.StaticStore.Plan
+public record FamiliesPlan : Plan
 {
    public FamiliesPlan()
    {
        Type = PlanType.FamiliesAnnually;
-        Product = ProductType.Families;
+        ProductTier = ProductTierType.Families;
        Name = "Families";
        IsAnnual = true;
        NameLocalizationKey = "planNameFamilies";
--- a/src/Core/Billing/Models/StaticStore/Plans/FreePlan.cs
+++ b/src/Core/Billing/Models/StaticStore/Plans/FreePlan.cs
@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;

-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;

-public record FreePlan : Models.StaticStore.Plan
+public record FreePlan : Plan
 {
    public FreePlan()
    {
        Type = PlanType.Free;
-        Product = ProductType.Free;
+        ProductTier = ProductTierType.Free;
        Name = "Free";
        NameLocalizationKey = "planNameFree";
        DescriptionLocalizationKey = "planDescFree";
--- a/src/Core/Billing/Models/StaticStore/Plans/Teams2019Plan.cs
+++ b/src/Core/Billing/Models/StaticStore/Plans/Teams2019Plan.cs
@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;

-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;

-public record Teams2019Plan : Models.StaticStore.Plan
+public record Teams2019Plan : Plan
 {
    public Teams2019Plan(bool isAnnual)
    {
        Type = isAnnual ? PlanType.TeamsAnnually2019 : PlanType.TeamsMonthly2019;
-        Product = ProductType.Teams;
+        ProductTier = ProductTierType.Teams;
        Name = isAnnual ? "Teams (Annually) 2019" : "Teams (Monthly) 2019";
        IsAnnual = isAnnual;
        NameLocalizationKey = "planNameTeams";
--- a/src/Core/Billing/Models/StaticStore/Plans/Teams2020Plan.cs
+++ b/src/Core/Billing/Models/StaticStore/Plans/Teams2020Plan.cs
@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;

-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;

-public record Teams2020Plan : Models.StaticStore.Plan
+public record Teams2020Plan : Plan
 {
    public Teams2020Plan(bool isAnnual)
    {
        Type = isAnnual ? PlanType.TeamsAnnually2020 : PlanType.TeamsMonthly2020;
-        Product = ProductType.Teams;
+        ProductTier = ProductTierType.Teams;
        Name = isAnnual ? "Teams (Annually) 2020" : "Teams (Monthly) 2020";
        IsAnnual = isAnnual;
        NameLocalizationKey = "planNameTeams";
--- a/src/Core/Billing/Models/StaticStore/Plans/TeamsPlan.cs
+++ b/src/Core/Billing/Models/StaticStore/Plans/TeamsPlan.cs
@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;

-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;

 public record TeamsPlan : Plan
 {
    public TeamsPlan(bool isAnnual)
    {
        Type = isAnnual ? PlanType.TeamsAnnually : PlanType.TeamsMonthly;
-        Product = ProductType.Teams;
+        ProductTier = ProductTierType.Teams;
        Name = isAnnual ? "Teams (Annually)" : "Teams (Monthly)";
        IsAnnual = isAnnual;
        NameLocalizationKey = "planNameTeams";
--- a/src/Core/Billing/Models/StaticStore/Plans/TeamsPlan2023.cs
+++ b/src/Core/Billing/Models/StaticStore/Plans/TeamsPlan2023.cs
@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;

-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;

 public record Teams2023Plan : Plan
 {
    public Teams2023Plan(bool isAnnual)
    {
        Type = isAnnual ? PlanType.TeamsAnnually2023 : PlanType.TeamsMonthly2023;
-        Product = ProductType.Teams;
+        ProductTier = ProductTierType.Teams;
        Name = isAnnual ? "Teams (Annually)" : "Teams (Monthly)";
        IsAnnual = isAnnual;
        NameLocalizationKey = "planNameTeams";
--- a/src/Core/Billing/Models/StaticStore/Plans/TeamsStarterPlan.cs
+++ b/src/Core/Billing/Models/StaticStore/Plans/TeamsStarterPlan.cs
@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;

-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;

 public record TeamsStarterPlan : Plan
 {
    public TeamsStarterPlan()
    {
        Type = PlanType.TeamsStarter;
-        Product = ProductType.TeamsStarter;
+        ProductTier = ProductTierType.TeamsStarter;
        Name = "Teams (Starter)";
        NameLocalizationKey = "planNameTeamsStarter";
        DescriptionLocalizationKey = "planDescTeams";
--- a/src/Core/Billing/Models/StaticStore/Plans/TeamsStarterPlan2023.cs
+++ b/src/Core/Billing/Models/StaticStore/Plans/TeamsStarterPlan2023.cs
@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;

-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;

 public record TeamsStarterPlan2023 : Plan
 {
    public TeamsStarterPlan2023()
    {
        Type = PlanType.TeamsStarter2023;
-        Product = ProductType.TeamsStarter;
+        ProductTier = ProductTierType.TeamsStarter;
        Name = "Teams (Starter)";
        NameLocalizationKey = "planNameTeamsStarter";
        DescriptionLocalizationKey = "planDescTeams";
--- a/src/Core/Billing/Models/StaticStore/SponsoredPlan.cs
+++ b/src/Core/Billing/Models/StaticStore/SponsoredPlan.cs
@@ -1,4 +1,5 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;

 namespace Bit.Core.Models.StaticStore;
@@ -6,8 +7,8 @@ namespace Bit.Core.Models.StaticStore;
 public class SponsoredPlan
 {
    public PlanSponsorshipType PlanSponsorshipType { get; set; }
-    public ProductType SponsoredProductType { get; set; }
-    public ProductType SponsoringProductType { get; set; }
+    public ProductTierType SponsoredProductTierType { get; set; }
+    public ProductTierType SponsoringProductTierType { get; set; }
    public string StripePlanId { get; set; }
    public Func<OrganizationUserOrganizationDetails, bool> UsersCanSponsor { get; set; }
 }
--- a/src/Core/Billing/Services/IProviderBillingService.cs
+++ b/src/Core/Billing/Services/IProviderBillingService.cs
@@ -1,8 +1,8 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Models;
-using Bit.Core.Enums;
 using Bit.Core.Models.Business;

 namespace Bit.Core.Billing.Services;
--- a/src/Core/Models/Business/OrganizationLicense.cs
+++ b/src/Core/Models/Business/OrganizationLicense.cs
@@ -4,6 +4,7 @@ using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text.Json.Serialization;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Enums;
 using Bit.Core.Services;
 using Bit.Core.Settings;
--- a/src/Core/Models/Business/OrganizationUpgrade.cs
+++ b/src/Core/Models/Business/OrganizationUpgrade.cs
@@ -1,4 +1,4 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;

 namespace Bit.Core.Models.Business;

--- a/src/Core/Models/Business/ProviderSubscriptionUpdate.cs
+++ b/src/Core/Models/Business/ProviderSubscriptionUpdate.cs
@@ -1,5 +1,5 @@
-using Bit.Core.Billing.Extensions;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Billing.Extensions;
 using Stripe;

 using static Bit.Core.Billing.Utilities;
--- a/src/Core/Models/Business/SubscriptionUpdate.cs
+++ b/src/Core/Models/Business/SubscriptionUpdate.cs
@@ -1,4 +1,4 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Stripe;

 namespace Bit.Core.Models.Business;
--- a/src/Core/Models/Mail/OrganizationInvitesInfo.cs
+++ b/src/Core/Models/Mail/OrganizationInvitesInfo.cs
@@ -1,7 +1,7 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Auth.Models.Business;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
-using Bit.Core.Enums;

 namespace Bit.Core.Models.Mail;
 public class OrganizationInvitesInfo
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudSyncSponsorshipsCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudSyncSponsorshipsCommand.cs
@@ -53,9 +53,9 @@ public class CloudSyncSponsorshipsCommand : ICloudSyncSponsorshipsCommand

        foreach (var selfHostedSponsorship in sponsorshipsData)
        {
-            var requiredSponsoringProductType = StaticStore.GetSponsoredPlan(selfHostedSponsorship.PlanSponsorshipType)?.SponsoringProductType;
+            var requiredSponsoringProductType = StaticStore.GetSponsoredPlan(selfHostedSponsorship.PlanSponsorshipType)?.SponsoringProductTierType;
            if (requiredSponsoringProductType == null
-                || StaticStore.GetPlan(sponsoringOrg.PlanType).Product != requiredSponsoringProductType.Value)
+                || StaticStore.GetPlan(sponsoringOrg.PlanType).ProductTier != requiredSponsoringProductType.Value)
            {
                continue; // prevent unsupported sponsorships
            }
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommand.cs
@@ -49,10 +49,10 @@ public class SetUpSponsorshipCommand : ISetUpSponsorshipCommand
        }

        // Check org to sponsor's product type
-        var requiredSponsoredProductType = StaticStore.GetSponsoredPlan(sponsorship.PlanSponsorshipType.Value)?.SponsoredProductType;
+        var requiredSponsoredProductType = StaticStore.GetSponsoredPlan(sponsorship.PlanSponsorshipType.Value)?.SponsoredProductTierType;
        if (requiredSponsoredProductType == null ||
            sponsoredOrganization == null ||
-            StaticStore.GetPlan(sponsoredOrganization.PlanType).Product != requiredSponsoredProductType.Value)
+            StaticStore.GetPlan(sponsoredOrganization.PlanType).ProductTier != requiredSponsoredProductType.Value)
        {
            throw new BadRequestException("Can only redeem sponsorship offer on families organizations.");
        }
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateSponsorshipCommand.cs
@@ -59,7 +59,7 @@ public class ValidateSponsorshipCommand : CancelSponsorshipCommand, IValidateSpo

        var sponsoringOrgPlan = Utilities.StaticStore.GetPlan(sponsoringOrganization.PlanType);
        if (OrgDisabledForMoreThanGracePeriod(sponsoringOrganization) ||
-            sponsoredPlan.SponsoringProductType != sponsoringOrgPlan.Product ||
+            sponsoredPlan.SponsoringProductTierType != sponsoringOrgPlan.ProductTier ||
            existingSponsorship.ToDelete ||
            SponsorshipIsSelfHostedOutOfSync(existingSponsorship))
        {
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CreateSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CreateSponsorshipCommand.cs
@@ -30,10 +30,10 @@ public class CreateSponsorshipCommand : ICreateSponsorshipCommand
            throw new BadRequestException("Cannot offer a Families Organization Sponsorship to yourself. Choose a different email.");
        }

-        var requiredSponsoringProductType = StaticStore.GetSponsoredPlan(sponsorshipType)?.SponsoringProductType;
+        var requiredSponsoringProductType = StaticStore.GetSponsoredPlan(sponsorshipType)?.SponsoringProductTierType;
        if (requiredSponsoringProductType == null ||
            sponsoringOrg == null ||
-            StaticStore.GetPlan(sponsoringOrg.PlanType).Product != requiredSponsoringProductType.Value)
+            StaticStore.GetPlan(sponsoringOrg.PlanType).ProductTier != requiredSponsoringProductType.Value)
        {
            throw new BadRequestException("Specified Organization cannot sponsor other organizations.");
        }
--- a/src/Core/OrganizationFeatures/OrganizationSubscriptions/AddSecretsManagerSubscriptionCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSubscriptions/AddSecretsManagerSubscriptionCommand.cs
@@ -1,7 +1,7 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Repositories;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface;
@@ -34,7 +34,7 @@ public class AddSecretsManagerSubscriptionCommand : IAddSecretsManagerSubscripti
        var signup = SetOrganizationUpgrade(organization, additionalSmSeats, additionalServiceAccounts);
        _organizationService.ValidateSecretsManagerPlan(plan, signup);

-        if (plan.Product != ProductType.Free)
+        if (plan.ProductTier != ProductTierType.Free)
        {
            await _paymentService.AddSecretsManagerToSubscription(organization, plan, additionalSmSeats, additionalServiceAccounts);
        }
@@ -74,12 +74,12 @@ public class AddSecretsManagerSubscriptionCommand : IAddSecretsManagerSubscripti
        }

        var plan = StaticStore.Plans.FirstOrDefault(p => p.Type == organization.PlanType && p.SupportsSecretsManager);
-        if (string.IsNullOrWhiteSpace(organization.GatewayCustomerId) && plan.Product != ProductType.Free)
+        if (string.IsNullOrWhiteSpace(organization.GatewayCustomerId) && plan.ProductTier != ProductTierType.Free)
        {
            throw new BadRequestException("No payment method found.");
        }

-        if (string.IsNullOrWhiteSpace(organization.GatewaySubscriptionId) && plan.Product != ProductType.Free)
+        if (string.IsNullOrWhiteSpace(organization.GatewaySubscriptionId) && plan.ProductTier != ProductTierType.Free)
        {
            throw new BadRequestException("No subscription found.");
        }
--- a/src/Core/OrganizationFeatures/OrganizationSubscriptions/UpdateSecretsManagerSubscriptionCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSubscriptions/UpdateSecretsManagerSubscriptionCommand.cs
@@ -1,4 +1,5 @@
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
@@ -165,7 +166,7 @@ public class UpdateSecretsManagerSubscriptionCommand : IUpdateSecretsManagerSubs
            throw new BadRequestException("Organization has no access to Secrets Manager.");
        }

-        if (update.Plan.Product == ProductType.Free)
+        if (update.Plan.ProductTier == ProductTierType.Free)
        {
            // No need to check the organization is set up with Stripe
            return;
--- a/src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs
@@ -4,6 +4,7 @@ using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Repositories;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
@@ -279,7 +280,7 @@ public class UpgradeOrganizationPlanCommand : IUpgradeOrganizationPlanCommand

        if (success)
        {
-            var upgradePath = GetUpgradePath(existingPlan.Product, newPlan.Product);
+            var upgradePath = GetUpgradePath(existingPlan.ProductTier, newPlan.ProductTier);
            await _referenceEventService.RaiseEventAsync(
                new ReferenceEvent(ReferenceEventType.UpgradePlan, organization, _currentContext)
                {
@@ -342,25 +343,25 @@ public class UpgradeOrganizationPlanCommand : IUpgradeOrganizationPlanCommand
        return await _organizationRepository.GetByIdAsync(id);
    }

-    private static string GetUpgradePath(ProductType oldProductType, ProductType newProductType)
+    private static string GetUpgradePath(ProductTierType oldProductTierType, ProductTierType newProductTierType)
    {
-        var oldDescription = _upgradePath.TryGetValue(oldProductType, out var description)
+        var oldDescription = _upgradePath.TryGetValue(oldProductTierType, out var description)
            ? description
-            : $"{oldProductType:G}";
+            : $"{oldProductTierType:G}";

-        var newDescription = _upgradePath.TryGetValue(newProductType, out description)
+        var newDescription = _upgradePath.TryGetValue(newProductTierType, out description)
            ? description
-            : $"{newProductType:G}";
+            : $"{newProductTierType:G}";

        return $"{oldDescription} → {newDescription}";
    }

-    private static readonly Dictionary<ProductType, string> _upgradePath = new()
+    private static readonly Dictionary<ProductTierType, string> _upgradePath = new()
    {
-        [ProductType.Free] = "2-person org",
-        [ProductType.Families] = "Families",
-        [ProductType.TeamsStarter] = "Teams Starter",
-        [ProductType.Teams] = "Teams",
-        [ProductType.Enterprise] = "Enterprise"
+        [ProductTierType.Free] = "2-person org",
+        [ProductTierType.Families] = "Families",
+        [ProductTierType.TeamsStarter] = "Teams Starter",
+        [ProductTierType.Teams] = "Teams",
+        [ProductTierType.Enterprise] = "Enterprise"
    };
 }
--- a/src/Core/Tools/Models/Business/ReferenceEvent.cs
+++ b/src/Core/Tools/Models/Business/ReferenceEvent.cs
@@ -1,8 +1,8 @@
 #nullable enable

 using System.Text.Json.Serialization;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Context;
-using Bit.Core.Enums;
 using Bit.Core.Tools.Entities;
 using Bit.Core.Tools.Enums;

--- a/src/Core/Utilities/CoreHelpers.cs
+++ b/src/Core/Utilities/CoreHelpers.cs
@@ -13,9 +13,9 @@ using Azure.Storage.Queues.Models;
 using Bit.Core.AdminConsole.Context;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.Auth.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Context;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.Identity;
 using Bit.Core.Settings;
 using IdentityModel;
--- a/src/Core/Utilities/StaticStore.cs
+++ b/src/Core/Utilities/StaticStore.cs
@@ -1,8 +1,9 @@
 using System.Collections.Immutable;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Billing.Models.StaticStore.Plans;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.Models.StaticStore;
-using Bit.Core.Models.StaticStore.Plans;

 namespace Bit.Core.Utilities;

@@ -142,11 +143,11 @@ public static class StaticStore
            new SponsoredPlan
            {
                PlanSponsorshipType = PlanSponsorshipType.FamiliesForEnterprise,
-                SponsoredProductType = ProductType.Families,
-                SponsoringProductType = ProductType.Enterprise,
+                SponsoredProductTierType = ProductTierType.Families,
+                SponsoringProductTierType = ProductTierType.Enterprise,
                StripePlanId = "2021-family-for-enterprise-annually",
                UsersCanSponsor = (OrganizationUserOrganizationDetails org) =>
-                    GetPlan(org.PlanType).Product == ProductType.Enterprise,
+                    GetPlan(org.PlanType).ProductTier == ProductTierType.Enterprise,
            }
        };