diff --git a/package-lock.json b/package-lock.json
index bdbdeb60c..8cd9122bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-edit-ui",
-  "version": "4.10.1",
+  "version": "4.10.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-edit-ui",
-      "version": "4.10.1",
+      "version": "4.10.2",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/action-chip": "1.1.5",
@@ -18,7 +18,7 @@
         "@bcrs-shared-components/completing-party": "2.1.30",
         "@bcrs-shared-components/confirm-dialog": "1.2.1",
         "@bcrs-shared-components/contact-info": "1.2.5",
-        "@bcrs-shared-components/corp-type-module": "1.0.11",
+        "@bcrs-shared-components/corp-type-module": "1.0.16",
         "@bcrs-shared-components/court-order-poa": "2.1.3",
         "@bcrs-shared-components/date-picker": "1.2.5",
         "@bcrs-shared-components/detail-comment": "1.1.3",
@@ -282,11 +282,6 @@
         "vue": "^2.7.14"
       }
     },
-    "node_modules/@bcrs-shared-components/business-lookup/node_modules/@bcrs-shared-components/corp-type-module": {
-      "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.16.tgz",
-      "integrity": "sha512-3MumJZ/0Urfnp1AGJpnUifk5DMrLcjDD+8YiGXy1WXjvpVLwA0S4bNPuvFUf0w4My+0HyXWZ/XsZWiQydVGYHw=="
-    },
     "node_modules/@bcrs-shared-components/business-lookup/node_modules/@bcrs-shared-components/enums": {
       "version": "1.1.10",
       "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.1.10.tgz",
@@ -345,9 +340,9 @@
       }
     },
     "node_modules/@bcrs-shared-components/corp-type-module": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.11.tgz",
-      "integrity": "sha512-+iE3qiySSafiA311m14DuoG9Rq/ranBJNT7Kf7KQ9dJFDNNuTA326pCGwKBeuT1L6pFpGeibXGE+vQ0AYnSPUA=="
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.16.tgz",
+      "integrity": "sha512-3MumJZ/0Urfnp1AGJpnUifk5DMrLcjDD+8YiGXy1WXjvpVLwA0S4bNPuvFUf0w4My+0HyXWZ/XsZWiQydVGYHw=="
     },
     "node_modules/@bcrs-shared-components/court-order-poa": {
       "version": "2.1.3",
@@ -384,11 +379,6 @@
         "@bcrs-shared-components/corp-type-module": "^1.0.15"
       }
     },
-    "node_modules/@bcrs-shared-components/enums/node_modules/@bcrs-shared-components/corp-type-module": {
-      "version": "1.0.15",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.15.tgz",
-      "integrity": "sha512-g/TcNSR7zJsG2lBjn/NnM+/+k7dJzhAiy5PiPj0ObN56bUV1PrUWVVlg5lz4/JZUEAZetWhwnyAzPVGsn7kr1w=="
-    },
     "node_modules/@bcrs-shared-components/fee-summary": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/@bcrs-shared-components/fee-summary/-/fee-summary-1.2.5.tgz",
@@ -486,11 +476,6 @@
         "vue": "^2.7.14"
       }
     },
-    "node_modules/@bcrs-shared-components/interfaces/node_modules/@bcrs-shared-components/corp-type-module": {
-      "version": "1.0.15",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.15.tgz",
-      "integrity": "sha512-g/TcNSR7zJsG2lBjn/NnM+/+k7dJzhAiy5PiPj0ObN56bUV1PrUWVVlg5lz4/JZUEAZetWhwnyAzPVGsn7kr1w=="
-    },
     "node_modules/@bcrs-shared-components/limited-restoration-panel": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@bcrs-shared-components/limited-restoration-panel/-/limited-restoration-panel-2.0.1.tgz",
diff --git a/package.json b/package.json
index b03d7fba1..6e6bed04f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-edit-ui",
-  "version": "4.10.1",
+  "version": "4.10.2",
   "private": true,
   "appName": "Edit UI",
   "sbcName": "SBC Common Components",
@@ -23,7 +23,7 @@
     "@bcrs-shared-components/completing-party": "2.1.30",
     "@bcrs-shared-components/confirm-dialog": "1.2.1",
     "@bcrs-shared-components/contact-info": "1.2.5",
-    "@bcrs-shared-components/corp-type-module": "1.0.11",
+    "@bcrs-shared-components/corp-type-module": "1.0.16",
     "@bcrs-shared-components/court-order-poa": "2.1.3",
     "@bcrs-shared-components/date-picker": "1.2.5",
     "@bcrs-shared-components/detail-comment": "1.1.3",
diff --git a/src/App.vue b/src/App.vue
index f3267f62a..88906c824 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -166,7 +166,7 @@ export default class App extends Mixins(CommonMixin, FilingTemplateMixin) {
     confirm: ConfirmDialogType
   }
 
-  // Global getters
+  // Store getters
   @Getter(useStore) getAppValidate!: boolean
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) getCurrentJsDate!: Date
@@ -187,7 +187,7 @@ export default class App extends Mixins(CommonMixin, FilingTemplateMixin) {
   @Getter(useStore) isSummaryMode!: boolean
   @Getter(useStore) showFeeSummary!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setAccountInformation!: (x: AccountInformationIF) => void
   @Action(useStore) setAppValidate!: (x: boolean) => void
   @Action(useStore) setBusinessId!: (x: string) => void
diff --git a/src/components/Alteration/AlterationSummary.vue b/src/components/Alteration/AlterationSummary.vue
index 9815550f2..b0788eb3a 100644
--- a/src/components/Alteration/AlterationSummary.vue
+++ b/src/components/Alteration/AlterationSummary.vue
@@ -188,7 +188,7 @@ import { useStore } from '@/store/store'
   }
 })
 export default class AlterationSummary extends Mixins(DateMixin, FeeMixin, FilingTemplateMixin) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getBusinessNumber!: string
   @Getter(useStore) getCurrentFees!: FeesIF[]
   @Getter(useStore) getFlagsReviewCertify!: FlagsReviewCertifyIF
@@ -198,7 +198,7 @@ export default class AlterationSummary extends Mixins(DateMixin, FeeMixin, Filin
   @Getter(useStore) haveNewResolutionDates!: boolean
   @Getter(useStore) isBusySaving!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setEffectiveDateValid!: (x: boolean) => void
 
   /** Whether to perform validation. */
diff --git a/src/components/Alteration/Articles/Articles.vue b/src/components/Alteration/Articles/Articles.vue
index 1378c2be4..5b7a0a8f1 100644
--- a/src/components/Alteration/Articles/Articles.vue
+++ b/src/components/Alteration/Articles/Articles.vue
@@ -58,7 +58,7 @@ export default class Articles extends Mixins(CommonMixin) {
   private isEditingCompanyProvisions = false
   private isAddingResolutionDate = false
 
-  // Global getters
+  // Store getters
   @Getter(useStore) getBusinessInformation!: BusinessInformationIF
   @Getter(useStore) getNewResolutionDates!: string[]
   @Getter(useStore) areProvisionsRemoved!: boolean
@@ -68,7 +68,7 @@ export default class Articles extends Mixins(CommonMixin) {
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) isAlterationFiling!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setProvisionsRemoved!: (x: boolean) => void
   @Action(useStore) setNewResolutionDates!: (x: string[]) => void
   @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
diff --git a/src/components/Alteration/Articles/ResolutionDates.vue b/src/components/Alteration/Articles/ResolutionDates.vue
index 57538a88d..d3bc0b42e 100644
--- a/src/components/Alteration/Articles/ResolutionDates.vue
+++ b/src/components/Alteration/Articles/ResolutionDates.vue
@@ -197,7 +197,7 @@ export default class ResolutionDates extends Mixins(CommonMixin, DateMixin) {
   /** Boolean indicating rights or restrictions in ShareStructure. */
   @Prop({ default: false }) readonly hasRightsOrRestrictions!: boolean
 
-  // Global getters
+  // Store getters
   @Getter(useStore) getBusinessFoundingDateTime!: string
   @Getter(useStore) getCurrentDate!: string
   @Getter(useStore) haveNewResolutionDates!: boolean
diff --git a/src/components/Alteration/BcRegEntityDetails.vue b/src/components/Alteration/BcRegEntityDetails.vue
index 5d197af26..b0e2e7cce 100644
--- a/src/components/Alteration/BcRegEntityDetails.vue
+++ b/src/components/Alteration/BcRegEntityDetails.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <template v-if="isBenefit">
+    <template v-if="isBenefitCompany">
       <div class="my-6">
         <p class="subtitle">
           {{ updatedArticleTitle }}
@@ -240,7 +240,7 @@ import { ResourceUtilities } from '@/utils'
 })
 export default class BcRegEntityDetails extends Vue {
   @Prop({ default: false }) readonly confirmArticles!: boolean
-  @Prop({ default: false }) readonly isBenefit!: boolean
+  @Prop({ default: false }) readonly isBenefitCompany!: boolean
   @Prop({ default: false }) readonly isUnlimitedLiability!: boolean
   @Prop({ default: false }) readonly isCommunityContribution!: boolean
   @Prop({ default: false }) readonly isBcLimited!: boolean
diff --git a/src/components/Alteration/index.ts b/src/components/Alteration/index.ts
index 199dff633..c9fc99fe0 100644
--- a/src/components/Alteration/index.ts
+++ b/src/components/Alteration/index.ts
@@ -1,4 +1,3 @@
 export * from './Articles'
 export { default as AlterationSummary } from './AlterationSummary.vue'
-export { default as BcRegEntityDetails } from './BcRegEntityDetails.vue'
 export { default as HelpSectionToggle } from './HelpSectionToggle.vue'
diff --git a/src/components/Alteration/summary/BusinessType.vue b/src/components/Alteration/summary/BusinessType.vue
index 395c956f9..a7103b847 100644
--- a/src/components/Alteration/summary/BusinessType.vue
+++ b/src/components/Alteration/summary/BusinessType.vue
@@ -45,6 +45,9 @@ import { ResourceUtilities } from '@/utils/resource-utils'
 export default class BusinessType extends Mixins(FilingTemplateMixin) {
   readonly GetCorpFullDescription = GetCorpFullDescription // for template
 
+  // Store getters
+  // @Getter(useStore) getOriginalLegalType!: CorpTypeCd
+
   get articleInfo (): string {
     return ResourceUtilities.articleInfo(this.getEntityType)
   }
diff --git a/src/components/Change/ChangeSummary.vue b/src/components/Change/ChangeSummary.vue
index e1cd28ab0..c65573052 100644
--- a/src/components/Change/ChangeSummary.vue
+++ b/src/components/Change/ChangeSummary.vue
@@ -91,7 +91,7 @@
             cols="12"
             sm="3"
           >
-            <label>{{ isSoleProp ? 'Proprietor' : 'Partner' }} Information</label>
+            <label>{{ isEntitySoleProp ? 'Proprietor' : 'Partner' }} Information</label>
           </v-col>
         </v-row>
         <v-row
@@ -125,7 +125,7 @@ import { useStore } from '@/store/store'
   }
 })
 export default class ChangeSummary extends Vue {
-  // Global getters
+  // Store getters
   @Getter(useStore) getBusinessNumber!: string
   @Getter(useStore) getCurrentNaics!: NaicsIF
   @Getter(useStore) getNameRequestLegalName!: string
@@ -134,7 +134,7 @@ export default class ChangeSummary extends Vue {
   @Getter(useStore) hasNaicsChanged!: boolean
   @Getter(useStore) haveOfficeAddressesChanged!: boolean
   @Getter(useStore) havePeopleAndRolesChanged!: boolean
-  @Getter(useStore) isSoleProp!: boolean
+  @Getter(useStore) isEntitySoleProp!: boolean
 
   /** Whether to perform validation. */
   @Prop() readonly validate!: boolean
diff --git a/src/components/Conversion/ConversionSummary.vue b/src/components/Conversion/ConversionSummary.vue
index 832bfd583..a46090d87 100644
--- a/src/components/Conversion/ConversionSummary.vue
+++ b/src/components/Conversion/ConversionSummary.vue
@@ -60,7 +60,7 @@
             cols="12"
             sm="3"
           >
-            <label>{{ isSoleProp ? 'Proprietor' : 'Partner' }} Information</label>
+            <label>{{ isEntitySoleProp ? 'Proprietor' : 'Partner' }} Information</label>
           </v-col>
         </v-row>
         <v-row
@@ -95,12 +95,12 @@ import { useStore } from '@/store/store'
   }
 })
 export default class ConversionSummary extends Vue {
-  // Global getters
+  // Store getters
+  @Getter(useStore) getCurrentNaics!: NaicsIF
   @Getter(useStore) hasNaicsChanged!: boolean
   @Getter(useStore) haveOfficeAddressesChanged!: boolean
   @Getter(useStore) havePeopleAndRolesChanged!: boolean
-  @Getter(useStore) getCurrentNaics!: NaicsIF
-  @Getter(useStore) isSoleProp!: boolean
+  @Getter(useStore) isEntitySoleProp!: boolean
 
   /** Whether to perform validation. */
   @Prop() readonly validate!: boolean
diff --git a/src/components/Restoration/RestorationSummary.vue b/src/components/Restoration/RestorationSummary.vue
index e21e756ba..b415b3402 100644
--- a/src/components/Restoration/RestorationSummary.vue
+++ b/src/components/Restoration/RestorationSummary.vue
@@ -51,7 +51,7 @@ import { useStore } from '@/store/store'
   }
 })
 export default class RestorationSummary extends Mixins(DateMixin, FeeMixin, FilingTemplateMixin) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getBusinessNumber!: string
   @Getter(useStore) getCurrentFees!: FeesIF[]
   // @Getter(useStore) getNameRequestLegalName!: string
diff --git a/src/components/SpecialResolution/SpecialResolutionSummary.vue b/src/components/SpecialResolution/SpecialResolutionSummary.vue
index a5a08dc57..11f7cc2d5 100644
--- a/src/components/SpecialResolution/SpecialResolutionSummary.vue
+++ b/src/components/SpecialResolution/SpecialResolutionSummary.vue
@@ -138,7 +138,7 @@ import { useStore } from '@/store/store'
   }
 })
 export default class SpecialResolutionSummary extends Mixins(DateMixin, FeeMixin, FilingTemplateMixin) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getBusinessNumber!: string
   @Getter(useStore) getCurrentFees!: FeesIF[]
   // @Getter(useStore) getNameRequestLegalName!: string
diff --git a/src/components/ViewWrapper.vue b/src/components/ViewWrapper.vue
index 5cda73990..f636a3480 100644
--- a/src/components/ViewWrapper.vue
+++ b/src/components/ViewWrapper.vue
@@ -95,7 +95,7 @@ export default class ViewWrapper extends Mixins(CommonMixin, FilingTemplateMixin
     confirm: ConfirmDialogType
   }
 
-  // Global getters
+  // Store getters
   // @Getter(useStore) getCurrentJsDate!: Date
   @Getter(useStore) getAppValidate!: boolean
   @Getter(useStore) getComponentValidate!: boolean
@@ -117,7 +117,7 @@ export default class ViewWrapper extends Mixins(CommonMixin, FilingTemplateMixin
   @Getter(useStore) isSpecialResolutionFiling!: boolean
   @Getter(useStore) showFeeSummary!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setAppValidate!: (x: boolean) => void
   @Action(useStore) setComponentValidate!: (x: boolean) => void
   @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
diff --git a/src/components/common/Actions.vue b/src/components/common/Actions.vue
index 37a14dde1..6665049fa 100644
--- a/src/components/common/Actions.vue
+++ b/src/components/common/Actions.vue
@@ -72,7 +72,7 @@ import { useStore } from '@/store/store'
 /** This component is only implemented for Correction filings atm. */
 @Component({})
 export default class Actions extends Mixins(DateMixin, FilingTemplateMixin, NameRequestMixin) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getFilingId!: number
   // @Getter(useStore) getNameRequestNumber!: string
   @Getter(useStore) hasAlterationDataChanged!: boolean // for testing state-getters
@@ -85,7 +85,7 @@ export default class Actions extends Mixins(DateMixin, FilingTemplateMixin, Name
   @Getter(useStore) isSaving!: boolean
   @Getter(useStore) isSavingResuming!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setIsSaving!: (x: boolean) => void
   @Action(useStore) setIsSavingResuming!: (x: boolean) => void
   @Action(useStore) setIsFilingPaying!: (x: boolean) => void
diff --git a/src/components/common/DocumentsDelivery.vue b/src/components/common/DocumentsDelivery.vue
index 39c64b7f5..5f694eb16 100644
--- a/src/components/common/DocumentsDelivery.vue
+++ b/src/components/common/DocumentsDelivery.vue
@@ -93,7 +93,7 @@ import { useStore } from '@/store/store'
 
 @Component({})
 export default class DocumentsDelivery extends Mixins(CommonMixin) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getUserEmail!: string
   @Getter(useStore) getBusinessContact!: ContactPointIF
   @Getter(useStore) isRoleStaff!: boolean
@@ -102,7 +102,7 @@ export default class DocumentsDelivery extends Mixins(CommonMixin) {
   @Getter(useStore) getFilingName!: FilingNames
   @Getter(useStore) getResource!: ResourceIF
 
-  // Global actions
+  // Store actions
   @Action(useStore) setDocumentOptionalEmail!: (x: string) => void
   @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
 
diff --git a/src/components/common/EntityInfo.vue b/src/components/common/EntityInfo.vue
index b0fba6f91..1399f0977 100644
--- a/src/components/common/EntityInfo.vue
+++ b/src/components/common/EntityInfo.vue
@@ -56,7 +56,7 @@ import { useStore } from '@/store/store'
 
 @Component({})
 export default class EntityInfo extends Mixins(CommonMixin) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getBusinessId!: string
   @Getter(useStore) getBusinessInformation!: BusinessInformationIF
   @Getter(useStore) getOriginalLegalType!: CorpTypeCd
diff --git a/src/components/common/PeopleAndRoles/CurrentDirectors.vue b/src/components/common/PeopleAndRoles/CurrentDirectors.vue
index 058549bc4..04d546ef4 100644
--- a/src/components/common/PeopleAndRoles/CurrentDirectors.vue
+++ b/src/components/common/PeopleAndRoles/CurrentDirectors.vue
@@ -107,7 +107,7 @@ export default class CurrentDirectors extends Mixins(CommonMixin) {
   readonly RoleTypes = RoleTypes
   readonly IsSame = IsSame
 
-  // Global getters
+  // Store getters
   @Getter(useStore) getOrgPeople!: OrgPersonIF[]
 
   /** Headers for the person table. */
diff --git a/src/components/common/PeopleAndRoles/ListPeopleAndRoles.vue b/src/components/common/PeopleAndRoles/ListPeopleAndRoles.vue
index 1ee45db9c..a3c377b7f 100644
--- a/src/components/common/PeopleAndRoles/ListPeopleAndRoles.vue
+++ b/src/components/common/PeopleAndRoles/ListPeopleAndRoles.vue
@@ -568,7 +568,7 @@ export default class ListPeopleAndRoles extends Mixins(CommonMixin, OrgPersonMix
   @Getter(useStore) getOrgPeople!: OrgPersonIF[]
   @Getter(useStore) hideChangeButtonForSoleProps!: boolean
   @Getter(useStore) isAlterationFiling!: boolean
-  @Getter(useStore) isBenBcCccUlcCorrectionFiling!: boolean
+  @Getter(useStore) isBaseCorrectionFiling!: boolean
   @Getter(useStore) isCoopCorrectionFiling!: boolean
   @Getter(useStore) isCorrectionFiling!: boolean
   @Getter(useStore) isFirmChangeFiling!: boolean
@@ -628,7 +628,7 @@ export default class ListPeopleAndRoles extends Mixins(CommonMixin, OrgPersonMix
     if (this.isFirmConversionFiling) {
       return true
     }
-    if (this.isBenBcCccUlcCorrectionFiling) {
+    if (this.isBaseCorrectionFiling) {
       return true
     }
     if (this.isCoopCorrectionFiling) {
diff --git a/src/components/common/PeopleAndRoles/OrgPerson.vue b/src/components/common/PeopleAndRoles/OrgPerson.vue
index 310ebdb6c..8b937281e 100644
--- a/src/components/common/PeopleAndRoles/OrgPerson.vue
+++ b/src/components/common/PeopleAndRoles/OrgPerson.vue
@@ -323,7 +323,7 @@
 
               <!-- Roles (base corrections only) -->
               <article
-                v-if="isBenBcCccUlcCorrectionFiling"
+                v-if="isBaseCorrectionFiling"
                 class="roles mt-6"
               >
                 <label class="sub-header">Roles</label>
@@ -490,14 +490,14 @@ export default class OrgPerson extends Mixins(CommonMixin, OrgPersonMixin) {
   /** The index of the org/person to edit, or NaN to add. */
   @Prop() readonly activeIndex!: number
 
-  // Global getters
+  // Store getters
   @Getter(useStore) getCurrentDate!: string
   @Getter(useStore) getResource!: ResourceIF
   @Getter(useStore) isAlterationFiling!: boolean
-  @Getter(useStore) isBenBcCccUlcCorrectionFiling!: boolean
+  @Getter(useStore) isBaseCorrectionFiling!: boolean
   @Getter(useStore) isCoopCorrectionFiling!: boolean
+  @Getter(useStore) isEntityFirm!: boolean
   @Getter(useStore) isFirmCorrectionFiling!: boolean
-  @Getter(useStore) isFirm!: boolean
   @Getter(useStore) isFirmChangeFiling!: boolean
   @Getter(useStore) isFirmConversionFiling!: boolean
   @Getter(useStore) isLimitedRestorationExtension!: boolean
@@ -646,7 +646,7 @@ export default class OrgPerson extends Mixins(CommonMixin, OrgPersonMixin) {
     if (this.isFirmConversionFiling) {
       return true
     }
-    if (this.isBenBcCccUlcCorrectionFiling) {
+    if (this.isBaseCorrectionFiling) {
       return true
     }
     if (this.isFirmCorrectionFiling) {
@@ -682,7 +682,7 @@ export default class OrgPerson extends Mixins(CommonMixin, OrgPersonMixin) {
       // can add proprietor or partner
       return (this.isNew && (this.isProprietor || this.isPartner))
     }
-    if (this.isBenBcCccUlcCorrectionFiling) {
+    if (this.isBaseCorrectionFiling) {
       // base corrections don't use this component
       return false
     }
@@ -855,7 +855,7 @@ export default class OrgPerson extends Mixins(CommonMixin, OrgPersonMixin) {
     }
     // Note: For corrections if the appointmentDate isn't included - you may run into some issues where adding a new
     // director as it wont show up in the parties or directors call.
-    if (this.isBenBcCccUlcCorrectionFiling || this.isCoopCorrectionFiling) {
+    if (this.isBaseCorrectionFiling || this.isCoopCorrectionFiling) {
       person.roles = this.setPersonRoles(this.orgPerson)
     } else {
       person.roles = this.orgPerson.roles
@@ -970,7 +970,7 @@ export default class OrgPerson extends Mixins(CommonMixin, OrgPersonMixin) {
       (v: string) => (v?.length <= 30) || 'Cannot exceed 30 characters' // maximum character count
     ]
 
-    if (this.isFirm) {
+    if (this.isEntityFirm) {
       this.orgNameRules = [
         (v: string) => !!v?.trim() || 'Business or corporation name is required',
         (v: string) => (v?.length <= 150) || 'Cannot exceed 150 characters' // maximum character count
diff --git a/src/components/common/PeopleAndRoles/PeopleAndRoles.vue b/src/components/common/PeopleAndRoles/PeopleAndRoles.vue
index d7c720504..281122600 100644
--- a/src/components/common/PeopleAndRoles/PeopleAndRoles.vue
+++ b/src/components/common/PeopleAndRoles/PeopleAndRoles.vue
@@ -102,7 +102,7 @@
 
         <!-- Instructional people and roles text (base corrections only)-->
         <article
-          v-if="isBenBcCccUlcCorrectionFiling || isCoopCorrectionFiling"
+          v-if="isBaseCorrectionFiling || isCoopCorrectionFiling"
           class="section-container"
         >
           This application must include the following:
@@ -123,8 +123,15 @@
                 mdi-close
               </v-icon>
               <span class="ml-2">
-                <template v-if="isBcCompany || isBenefitCompany || isBcUlcCompany">At least one Director</template>
-                <template v-if="isBcCcc || isCoopCorrectionFiling">At least three Directors</template>
+                <template
+                  v-if="isEntityBcCompany || isEntityBenefitCompany || isEntityBcUlcCompany ||
+                    isEntityContinueIn || isEntityBenContinueIn || isEntityUlcContinueIn"
+                >
+                  <span>At least one Director</span>
+                </template>
+                <template v-if="isEntityBcCcc || isEntityCccContinueIn || isCoopCorrectionFiling">
+                  <span>At least three Directors</span>
+                </template>
               </span>
             </li>
             <li v-if="isCoopCorrectionFiling">
@@ -166,7 +173,7 @@
 
         <!-- Correction section (base corrections only) -->
         <article
-          v-if="isBenBcCccUlcCorrectionFiling || isCoopCorrectionFiling"
+          v-if="isBaseCorrectionFiling || isCoopCorrectionFiling"
           class="section-container"
         >
           <v-btn
@@ -201,7 +208,7 @@
 
           <!-- SP add buttons (conversion filing only) -->
           <div
-            v-if="isSoleProp && isFirmConversionFiling && !haveRequiredProprietor"
+            v-if="isEntitySoleProp && isFirmConversionFiling && !haveRequiredProprietor"
             class="mt-8"
           >
             <v-btn
@@ -247,7 +254,7 @@
 
           <!-- GP add buttons (change or conversion filings only)-->
           <div
-            v-if="isPartnership && (isFirmChangeFiling || isFirmConversionFiling)"
+            v-if="isEntityPartnership && (isFirmChangeFiling || isFirmConversionFiling)"
             class="mt-8"
           >
             <v-btn
@@ -305,7 +312,7 @@
           :validate="getComponentValidate"
           :validOrgPersons="validOrgPersons"
           :showDeliveryAddressColumn="!(isLimitedRestorationExtension || isLimitedRestorationToFull)"
-          :showRolesColumn="isBenBcCccUlcCorrectionFiling || isCoopCorrectionFiling"
+          :showRolesColumn="isBaseCorrectionFiling || isCoopCorrectionFiling"
           :showEmailColumn="isLimitedRestorationExtension || isLimitedRestorationToFull"
           :showEmailUnderName="showEmailUnderName"
           @initEdit="initEdit($event)"
@@ -344,18 +351,22 @@ export default class PeopleAndRoles extends Mixins(CommonMixin, DateMixin, OrgPe
   readonly RoleTypes = RoleTypes
   readonly PartyTypes = PartyTypes
 
-  // Global getters
+  // Store getters
   @Getter(useStore) getCurrentJsDate!: Date
   @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
   @Getter(useStore) getOrgPeople!: OrgPersonIF[]
   @Getter(useStore) getResource!: ResourceIF
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) isAlterationFiling!: boolean
-  @Getter(useStore) isBcCcc!: boolean
-  @Getter(useStore) isBcCompany!: boolean
-  @Getter(useStore) isBcUlcCompany!: boolean
-  @Getter(useStore) isBenefitCompany!: boolean
-  @Getter(useStore) isBenBcCccUlcCorrectionFiling!: boolean
+  @Getter(useStore) isEntityBcCcc!: boolean
+  @Getter(useStore) isEntityBcCompany!: boolean
+  @Getter(useStore) isEntityBcUlcCompany!: boolean
+  @Getter(useStore) isEntityBenefitCompany!: boolean
+  @Getter(useStore) isEntityBenContinueIn!: boolean
+  @Getter(useStore) isEntityCccContinueIn!: boolean
+  @Getter(useStore) isEntityContinueIn!: boolean
+  @Getter(useStore) isEntityUlcContinueIn!: boolean
+  @Getter(useStore) isBaseCorrectionFiling!: boolean
   @Getter(useStore) isCoopCorrectionFiling!: boolean
   @Getter(useStore) isCorrectionFiling!: boolean
   @Getter(useStore) isFirmChangeFiling!: boolean
@@ -363,12 +374,12 @@ export default class PeopleAndRoles extends Mixins(CommonMixin, DateMixin, OrgPe
   @Getter(useStore) isFirmCorrectionFiling!: boolean
   @Getter(useStore) isLimitedRestorationExtension!: boolean
   @Getter(useStore) isLimitedRestorationToFull!: boolean
-  @Getter(useStore) isPartnership!: boolean
+  @Getter(useStore) isEntityPartnership!: boolean
   @Getter(useStore) isRestorationFiling!: boolean
   @Getter(useStore) isRoleStaff!: boolean
-  @Getter(useStore) isSoleProp!: boolean
+  @Getter(useStore) isEntitySoleProp!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setEditingPeopleAndRoles!: (x: boolean) => void
   @Action(useStore) setPeopleAndRoles!: (x: OrgPersonIF[]) => void
   @Action(useStore) setPeopleAndRolesChanged!: (x: boolean) => void
@@ -398,10 +409,13 @@ export default class PeopleAndRoles extends Mixins(CommonMixin, DateMixin, OrgPe
   // FUTURE: should move rules and text to resource files
   /** True when the minimum director count is met. */
   get haveMinimumDirectors (): boolean {
-    if (this.isBcCompany || this.isBenefitCompany || this.isBcUlcCompany) {
+    if (
+      this.isEntityBcCompany || this.isEntityBenefitCompany || this.isEntityBcUlcCompany ||
+      this.isEntityContinueIn || this.isEntityBenContinueIn || this.isEntityUlcContinueIn
+    ) {
       return this.hasRole(RoleTypes.DIRECTOR, 1, CompareModes.AT_LEAST)
     }
-    if (this.isBcCcc || this.isCoopCorrectionFiling) {
+    if (this.isEntityBcCcc || this.isEntityCccContinueIn || this.isCoopCorrectionFiling) {
       return this.hasRole(RoleTypes.DIRECTOR, 3, CompareModes.AT_LEAST)
     }
     return false // should never happen
@@ -474,19 +488,23 @@ export default class PeopleAndRoles extends Mixins(CommonMixin, DateMixin, OrgPe
       return false
     }
     if (this.isFirmChangeFiling) {
-      if (this.isPartnership) return this.haveMinimumPartners
-      if (this.isSoleProp) return this.haveRequiredProprietor
+      if (this.isEntityPartnership) return this.haveMinimumPartners
+      if (this.isEntitySoleProp) return this.haveRequiredProprietor
       return false
     }
     if (this.isFirmConversionFiling) {
-      if (this.isPartnership) return this.haveMinimumPartners
-      if (this.isSoleProp) return this.haveRequiredProprietor
+      if (this.isEntityPartnership) return this.haveMinimumPartners
+      if (this.isEntitySoleProp) return this.haveRequiredProprietor
       return false
     }
     if (this.isCorrectionFiling) {
-      if (this.isPartnership) return this.haveMinimumPartners
-      if (this.isSoleProp) return this.haveRequiredProprietor
-      if (this.isBcCompany || this.isBenefitCompany || this.isBcCcc || this.isBcUlcCompany) {
+      if (this.isEntityPartnership) return this.haveMinimumPartners
+      if (this.isEntitySoleProp) return this.haveRequiredProprietor
+      if (
+        this.isEntityBcCompany || this.isEntityBenefitCompany || this.isEntityBcCcc ||
+        this.isEntityBcUlcCompany || this.isEntityContinueIn || this.isEntityBenContinueIn ||
+        this.isEntityUlcContinueIn || this.isEntityCccContinueIn
+      ) {
         return this.haveMinimumDirectors
       }
       if (this.isCoopCorrectionFiling) {
@@ -640,7 +658,7 @@ export default class PeopleAndRoles extends Mixins(CommonMixin, DateMixin, OrgPe
     this.currentOrgPerson.actions = actions
 
     // for firms and restoration (extension and conversion) applciations, use business lookup initially
-    if (this.isPartnership || this.isSoleProp || this.isLimitedRestorationExtension ||
+    if (this.isEntityPartnership || this.isEntitySoleProp || this.isLimitedRestorationExtension ||
        this.isLimitedRestorationToFull) {
       this.currentOrgPerson.isLookupBusiness = true
     }
diff --git a/src/components/common/ShareStructure/ShareStructures.vue b/src/components/common/ShareStructure/ShareStructures.vue
index 8bd13ddc1..90f7abc87 100644
--- a/src/components/common/ShareStructure/ShareStructures.vue
+++ b/src/components/common/ShareStructure/ShareStructures.vue
@@ -49,7 +49,7 @@ export default class ShareStructures extends Mixins(CommonMixin) {
   /** Whether this component should be in edit mode or review mode. */
   @Prop({ default: true }) readonly isEditMode!: boolean
 
-  // Global getters
+  // Store getters
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) getEditLabel!: string
   @Getter(useStore) getEditedLabel!: string
@@ -61,7 +61,7 @@ export default class ShareStructures extends Mixins(CommonMixin) {
   @Getter(useStore) hasMinimumShareClass!: boolean
   @Getter(useStore) isAlterationFiling!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setCreateShareStructureStepValidity!: (x: boolean) => void
   @Action(useStore) setEditingShareStructure!: (x: boolean) => void
   @Action(useStore) setShareClasses!: (x: ShareClassIF[]) => void
diff --git a/src/components/common/StaffPayment.vue b/src/components/common/StaffPayment.vue
index af73fd0f0..8ba7e6ed9 100644
--- a/src/components/common/StaffPayment.vue
+++ b/src/components/common/StaffPayment.vue
@@ -48,12 +48,12 @@ import { useStore } from '@/store/store'
   }
 })
 export default class StaffPayment extends Vue {
-  // Global getters
+  // Store getters
   @Getter(useStore) getFlagsReviewCertify!: FlagsReviewCertifyIF
   @Getter(useStore) getAppValidate!: boolean
   @Getter(useStore) getStaffPayment!: StaffPaymentIF
 
-  // Global actions
+  // Store actions
   @Action(useStore) setStaffPayment!: (x: StaffPaymentIF) => void
   @Action(useStore) setStaffPaymentValidity!: (x: boolean) => void
 
diff --git a/src/components/common/TransactionalFolioNumber.vue b/src/components/common/TransactionalFolioNumber.vue
index 87a212e8c..fda77d471 100644
--- a/src/components/common/TransactionalFolioNumber.vue
+++ b/src/components/common/TransactionalFolioNumber.vue
@@ -66,12 +66,12 @@ export default class TransactionalFolioNumber extends Mixins(CommonMixin) {
     folioNumberInput: FormFieldType
   }
 
-  // Global getters
+  // Store getters
   @Getter(useStore) getFolioNumber!: string
   @Getter(useStore) getTransactionalFolioNumber!: string
   @Getter(useStore) getFlagsReviewCertify!: FlagsReviewCertifyIF
 
-  // Global actions
+  // Store actions
   @Action(useStore) setTransactionalFolioNumber!: (x: string) => void
   @Action(useStore) setTransactionalFolioNumberValidity!: (x: boolean) => void
 
diff --git a/src/components/common/YourCompany/AssociationType.vue b/src/components/common/YourCompany/AssociationType.vue
index 873584000..2e0428b92 100644
--- a/src/components/common/YourCompany/AssociationType.vue
+++ b/src/components/common/YourCompany/AssociationType.vue
@@ -174,7 +174,7 @@ import { useStore } from '@/store/store'
 
 @Component({})
 export default class AssociationType extends Mixins(CommonMixin) {
-  /** Global getters */
+  /** Store getters */
   @Getter(useStore) getAssociationType!: CoopTypes
   @Getter(useStore) getBusinessInformation!: BusinessInformationIF
   @Getter(useStore) getComponentValidate!: boolean
@@ -183,7 +183,7 @@ export default class AssociationType extends Mixins(CommonMixin) {
   @Getter(useStore) getOriginalBusinessInfo!: BusinessInformationIF
   @Getter(useStore) hasAssociationTypeChanged!: boolean
 
-  /** Global actions */
+  /** Store actions */
   @Action(useStore) setBusinessInformation!: (x: BusinessInformationIF) => void
   @Action(useStore) setEditingAssociationType!: (x: boolean) => void
   @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
diff --git a/src/components/common/YourCompany/BusinessContactInfo.vue b/src/components/common/YourCompany/BusinessContactInfo.vue
index 512a9b1d5..6d95eebdd 100644
--- a/src/components/common/YourCompany/BusinessContactInfo.vue
+++ b/src/components/common/YourCompany/BusinessContactInfo.vue
@@ -37,7 +37,7 @@ import { useStore } from '@/store/store'
   }
 })
 export default class BusinessContactInfo extends Mixins(CommonMixin) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getBusinessContact!: ContactPointIF
   @Getter(useStore) getBusinessId!: string
   @Getter(useStore) getComponentValidate!: boolean
diff --git a/src/components/common/YourCompany/BusinessStartDate.vue b/src/components/common/YourCompany/BusinessStartDate.vue
index 4ebacb7d9..c5d4d56bc 100644
--- a/src/components/common/YourCompany/BusinessStartDate.vue
+++ b/src/components/common/YourCompany/BusinessStartDate.vue
@@ -182,7 +182,7 @@ import { useStore } from '@/store/store'
   }
 })
 export default class BusinessStartDate extends Mixins(CommonMixin, DateMixin) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getBusinessFoundingDateTime!: string
   @Getter(useStore) getBusinessStartDate!: string
   @Getter(useStore) getComponentValidate!: boolean
diff --git a/src/components/common/YourCompany/BusinessType.vue b/src/components/common/YourCompany/BusinessType.vue
index e753a7fe9..45004e1d6 100644
--- a/src/components/common/YourCompany/BusinessType.vue
+++ b/src/components/common/YourCompany/BusinessType.vue
@@ -32,7 +32,7 @@ export default class BusinessType extends Vue {
   @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // local variable
-  protected isEditingType = false
+  isEditingType = false
 
   /** The section validity state (when prompted by app). */
   get invalidSection (): boolean {
diff --git a/src/components/common/YourCompany/ChangeBusinessType.vue b/src/components/common/YourCompany/ChangeBusinessType.vue
index 683aac6ea..4eb18f962 100644
--- a/src/components/common/YourCompany/ChangeBusinessType.vue
+++ b/src/components/common/YourCompany/ChangeBusinessType.vue
@@ -165,7 +165,7 @@
         <BcRegContacts :direction="'col'" />
 
         <BcRegEntityDetails
-          :isBenefit="isBenefit"
+          :isBenefitCompany="isBenefitCompany"
           :isUnlimitedLiability="isUnlimitedLiability"
           :isCommunityContribution="isCommunityContribution"
           :isBcLimited="isBcLimited"
@@ -301,7 +301,7 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
 
   @Prop({ default: false }) readonly invalidSection!: boolean
 
-  // Global getters
+  // Store getters
   @Getter(useStore) getEditLabel!: string
   @Getter(useStore) getEditedLabel!: string
   @Getter(useStore) getEntityType!: CorpTypeCd
@@ -313,9 +313,7 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
   @Getter(useStore) getResource!: ResourceIF
   @Getter(useStore) hasBusinessNameChanged!: boolean
   @Getter(useStore) hasBusinessTypeChanged!: boolean
-  @Getter(useStore) isBcCompany!: boolean
-  @Getter(useStore) isBcUlcCompany!: boolean
-  @Getter(useStore) isBenefitCompany!: boolean
+  @Getter(useStore) isEntityBenefitCompany!: boolean
   @Getter(useStore) isConflictingLegalType!: boolean
   @Getter(useStore) isEntityTypeChangedByName!: boolean
   @Getter(useStore) isNameChangedByType!: boolean
@@ -329,8 +327,8 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
   selectedEntityType = null as CorpTypeCd
   confirmArticles = false
   isEditingType = false
-  dropdown: boolean = null
-  supportedEntityTypes: Array<string> = []
+  dropdown = null as boolean
+  supportedEntityTypes = [] as Array<string>
 
   /** Called when component is mounted. */
   mounted (): void {
@@ -356,7 +354,7 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
     this.isEditingType = val
   }
 
-  /** Verify New Business name. */
+  /** Whether this is a new business name. */
   get isNewName (): boolean {
     return (
       this.getNameRequestLegalName &&
@@ -364,22 +362,25 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
     )
   }
 
-  /** Type change helper information */
+  /** The type change information. */
   get typeChangeInfo (): string {
     return this.getResource.changeData?.typeChangeInfo
   }
 
-  /** Entity type options based on the company type */
+  /** The entity type options based on the company type. */
   get entityTypeOptions (): EntityTypeOption[] {
     const entityTypeOptions = this.getResource.changeData?.entityTypeOptions || []
-    return entityTypeOptions.filter((option: EntityTypeOption) => {
-      return this.supportedEntityTypes?.includes(option.value)
-    })
+    return entityTypeOptions.filter((option: EntityTypeOption) =>
+      this.supportedEntityTypes?.includes(option.value)
+    )
   }
 
   get enableEditButton (): boolean {
-    // Exclude CCC - Originally: isBcCompany || isBcUlcCompany || isBenefitCompany
-    if (this.getOriginalLegalType === CorpTypeCd.BC_CCC) {
+    // Exclude CC and CCC
+    if (
+      this.getOriginalLegalType === CorpTypeCd.BC_CCC ||
+      this.getOriginalLegalType === CorpTypeCd.CCC_CONTINUE_IN
+    ) {
       return false
     }
     return this.supportedEntityTypes?.includes(this.getOriginalLegalType)
@@ -393,16 +394,23 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
     if (this.isCommunityContribution || this.isUnlimitedLiability) {
       return true
     }
-    // Named ULC to BC Limited require a name request.
+    // Named ULC to BC Limited (or Benefit Company) requires a name request.
     if (this.getOriginalLegalType === CorpTypeCd.BC_ULC_COMPANY &&
-      (this.isBcLimited || this.isBenefitCompany)) {
+      (this.isBcLimited || this.isBenefitCompany)
+    ) {
+      return true
+    }
+    // Named CUL to BC Limited (or Benefit Company) requires a name request.
+    if (this.getOriginalLegalType === CorpTypeCd.ULC_CONTINUE_IN &&
+      (this.isBcLimited || this.isBenefitCompany)
+    ) {
       return true
     }
     return false
   }
 
   get minimumThreeDirectorError (): boolean {
-    return this.isCommunityContribution && this.getNumberOfDirectors < 3
+    return (this.isCommunityContribution && this.getNumberOfDirectors < 3)
   }
 
   /** Reset company type values to original. */
@@ -444,40 +452,42 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
   }
 
   getUpdatedName (originalName: string): string {
-    if (this.isBcUlcCompany) {
+    if (this.isUnlimitedLiability) {
       originalName = originalName.replace(' LTD.', '')
       originalName += ' UNLIMITED LIABILITY COMPANY'
       return originalName
-    } else if (this.isCommunityContribution) {
+    }
+    if (this.isCommunityContribution) {
       originalName = originalName.replace(' LTD.', '')
       originalName += ' COMMUNITY CONTRIBUTION COMPANY'
       return originalName
-    } else if (this.isBcLimited || this.isBenefitCompany) {
+    }
+    if (this.isBcLimited || this.isBenefitCompany) {
       originalName = originalName.replace(' UNLIMITED LIABILITY COMPANY', '').replace(' ULC', '')
       originalName = originalName.replace(' COMMUNITY CONTRIBUTION COMPANY', '').replace(' CCC', '')
       originalName = originalName.replace(' LTD.', '')
       originalName += ' LTD.'
       return originalName
     }
-    return originalName
+    return originalName // should never happen
   }
 
-  /** Check if current entity selection is a Benefit Company */
-  get isBenefit (): boolean {
+  /** Whether current entity selection is a Benefit Company. */
+  get isBenefitCompany (): boolean {
     return (this.selectedEntityType === CorpTypeCd.BENEFIT_COMPANY)
   }
 
-  /** Check if current entity selection is a Unlimited Liability Company */
+  /** Whether current entity selection is a BC ULC Company. */
   get isUnlimitedLiability (): boolean {
     return (this.selectedEntityType === CorpTypeCd.BC_ULC_COMPANY)
   }
 
-  /** Check if current entity selection is a Community Contribution Company */
+  /** Whether current entity selection is a BC CCC. */
   get isCommunityContribution (): boolean {
     return (this.selectedEntityType === CorpTypeCd.BC_CCC)
   }
 
-  /** Check if current entity selection is a BC Limited Company */
+  /** Whether current entity selection is a BC Company. */
   get isBcLimited (): boolean {
     return (this.selectedEntityType === CorpTypeCd.BC_COMPANY)
   }
diff --git a/src/components/common/YourCompany/FolioInformation.vue b/src/components/common/YourCompany/FolioInformation.vue
index feeb21905..e85069378 100644
--- a/src/components/common/YourCompany/FolioInformation.vue
+++ b/src/components/common/YourCompany/FolioInformation.vue
@@ -34,7 +34,7 @@ import { useStore } from '@/store/store'
   }
 })
 export default class FolioInformation extends Mixins(CommonMixin) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getBusinessId!: string
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) getEditLabel!: string
diff --git a/src/components/common/YourCompany/NameTranslations/NameTranslation.vue b/src/components/common/YourCompany/NameTranslations/NameTranslation.vue
index ec4c7b492..2f1b4105c 100644
--- a/src/components/common/YourCompany/NameTranslations/NameTranslation.vue
+++ b/src/components/common/YourCompany/NameTranslations/NameTranslation.vue
@@ -228,7 +228,7 @@ export default class NameTranslation extends Mixins(CommonMixin) {
 
   @Prop({ default: false }) readonly isSummaryMode!: boolean
 
-  // Global getters
+  // Store getters
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) getEditLabel!: string
   @Getter(useStore) getEditedLabel!: string
@@ -237,7 +237,7 @@ export default class NameTranslation extends Mixins(CommonMixin) {
   @Getter(useStore) isLimitedRestorationExtension!: boolean
   @Getter(useStore) isLimitedRestorationToFull!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setEditingNameTranslations!: (x: boolean) => void
   @Action(useStore) setNameTranslations!: (x: NameTranslationIF[]) => void
   @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
diff --git a/src/components/common/YourCompany/OfficeAddresses.vue b/src/components/common/YourCompany/OfficeAddresses.vue
index aa0c9a279..a912eee45 100644
--- a/src/components/common/YourCompany/OfficeAddresses.vue
+++ b/src/components/common/YourCompany/OfficeAddresses.vue
@@ -192,9 +192,9 @@
         </template>
       </v-row>
 
-      <!-- Records office (BC/BEN/CCC/ULC only) -->
+      <!-- Records office (base companies only) -->
       <v-row
-        v-if="isBenBcCccUlc"
+        v-if="isBaseCompany"
         id="summary-records-address"
         class="mt-4 mx-0"
         no-gutters
@@ -467,9 +467,9 @@
           </li>
         </div>
 
-        <!-- "Same as" checkbox -->
+        <!-- "Same as" checkbox (base companies only)-->
         <div
-          v-if="isBenBcCccUlc"
+          v-if="isBaseCompany"
           id="edit-records-address"
         >
           <div
@@ -605,7 +605,7 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
   /** Prop to set readonly state (ie disable form actions). */
   @Prop({ default: false }) readonly isSummaryView!: boolean
 
-  // Global getters
+  // Store getters
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) getEditLabel!: string
   @Getter(useStore) getEditedLabel!: string
@@ -619,8 +619,8 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
   @Getter(useStore) hasRecMailingChanged!: boolean
   @Getter(useStore) haveOfficeAddressesChanged!: boolean
   @Getter(useStore) isAlterationFiling!: boolean
-  @Getter(useStore) isBenBcCccUlc!: boolean
-  @Getter(useStore) isBenBcCccUlcCorrectionFiling!: boolean
+  @Getter(useStore) isBaseCompany!: boolean
+  @Getter(useStore) isBaseCorrectionFiling!: boolean
   @Getter(useStore) isCoopCorrectionFiling!: boolean
   @Getter(useStore) isCorrectionFiling!: boolean
   @Getter(useStore) isFirmChangeFiling!: boolean
@@ -629,7 +629,7 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
   @Getter(useStore) isRestorationFiling!: boolean
   @Getter(useStore) isSpecialResolutionFiling!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setEditingOfficeAddresses!: (x: boolean) => void
   @Action(useStore) setOfficeAddresses!: (x: AddressesIF) => void
   @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
@@ -652,15 +652,15 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
   }
 
   /** Whether to show the editable forms for the addresses (true) or the static display addresses (false). */
-  protected isEditing = false
+  isEditing = false
 
-  protected dropdown = false // v-model for dropdown menu
+  dropdown = false // v-model for dropdown menu
 
   // The 4 addresses that are the current state of the BaseAddress sub-components:
-  protected mailingAddress = {} as AddressIF
-  protected deliveryAddress = {} as AddressIF
-  protected recMailingAddress = {} as AddressIF
-  protected recDeliveryAddress = {} as AddressIF
+  mailingAddress = {} as AddressIF
+  deliveryAddress = {} as AddressIF
+  recMailingAddress = {} as AddressIF
+  recDeliveryAddress = {} as AddressIF
 
   // The 4 validation events from each BaseAddress sub-component:
   private mailingAddressValid = true
@@ -669,13 +669,13 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
   private recDeliveryAddressValid = true
 
   /** Model value for "same as (registered) mailing address" checkbox. */
-  protected inheritMailingAddress = true
+  inheritMailingAddress = true
 
   /** Model value for "same as registered address" checkbox. */
-  protected inheritRegisteredAddress = true
+  inheritRegisteredAddress = true
 
   /** Model value for "same as (records) mailing address" checkbox. */
-  protected inheritRecMailingAddress = true
+  inheritRecMailingAddress = true
 
   /** The section validity state (when prompted by app). */
   get invalidSection (): boolean {
@@ -712,7 +712,7 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
    * Sets local address data and "inherit" flags from store.
    */
   private setLocalProperties (): void {
-    if (this.isBenBcCccUlcCorrectionFiling || this.isAlterationFiling ||
+    if (this.isBaseCorrectionFiling || this.isAlterationFiling ||
       this.isRestorationFiling) {
       // assign registered office addresses (may be {})
       this.mailingAddress = { ...this.getOfficeAddresses?.registeredOffice?.mailingAddress }
@@ -792,7 +792,7 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
    * sets the Registered Delivery Address to the Registered Mailing Address.
    * NB: retain original address IDs
    */
-  protected setDeliveryAddressToMailingAddress (): void {
+  setDeliveryAddressToMailingAddress (): void {
     if (this.inheritMailingAddress) {
       this.deliveryAddress = { ...this.mailingAddress, addressType: 'delivery', id: this.deliveryAddress.id }
     } else {
@@ -811,7 +811,7 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
    * sets the Records office addresses to the Registered office addresses.
    * NB: retain original address IDs
    */
-  protected setRecordOfficeToRegisteredOffice (): void {
+  setRecordOfficeToRegisteredOffice (): void {
     if (this.inheritRegisteredAddress) {
       this.recMailingAddress = { ...this.mailingAddress, id: this.recMailingAddress.id }
       this.recDeliveryAddress = { ...this.deliveryAddress, id: this.recDeliveryAddress.id }
@@ -828,7 +828,7 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
    * sets the Records Delivery Address to Records Mailing Address.
    * NB: retain original address IDs
    */
-  protected setRecordDeliveryAddressToMailingAddress (): void {
+  setRecordDeliveryAddressToMailingAddress (): void {
     if (this.inheritRecMailingAddress) {
       this.recDeliveryAddress = { ...this.recMailingAddress, addressType: 'delivery', id: this.recDeliveryAddress.id }
     } else {
@@ -842,7 +842,7 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
    * NB: addresses must keep their original IDs
    * NB: retain original address IDs
    */
-  protected updateAddress (addressToUpdate: AddressTypes, newAddress: AddressIF): void {
+  updateAddress (addressToUpdate: AddressTypes, newAddress: AddressIF): void {
     // BaseAddress component returns empty Delivery Instructions as ''
     // but Legal API returns empty Delivery Instructions as null
     // so nullify empty Delivery Instructions for future comparisons.
@@ -903,7 +903,7 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
    * @param addressToValidate the address to set the validity of
    * @param isValid whether the address is valid
    */
-  protected onAddressValid (addressToValidate: AddressTypes, isValid: boolean): void {
+  onAddressValid (addressToValidate: AddressTypes, isValid: boolean): void {
     switch (addressToValidate) {
       case AddressTypes.MAILING_ADDRESS:
         this.mailingAddressValid = isValid
@@ -928,8 +928,8 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
    * Sets updated office addresses in store.
    */
   private storeAddresses (): void {
-    if (this.isBenBcCccUlcCorrectionFiling || this.isRestorationFiling) {
-      // at the moment, only corp corrections and restorations are supported
+    if (this.isBaseCorrectionFiling || this.isRestorationFiling) {
+      // at the moment, only base corrections and restorations are supported
       this.setOfficeAddresses({
         registeredOffice: {
           deliveryAddress: this.deliveryAddress,
@@ -942,8 +942,7 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
       })
     }
 
-    if (this.isFirmChangeFiling || this.isFirmConversionFiling ||
-      this.isFirmCorrectionFiling) {
+    if (this.isFirmChangeFiling || this.isFirmConversionFiling || this.isFirmCorrectionFiling) {
       // at the moment, only firm changes, conversions and corrections are supported
       this.setOfficeAddresses({
         businessOffice: {
@@ -995,7 +994,7 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
   /**
    * When Undo is clicked, resets original addresses from original IA filing.
    */
-  protected resetOfficeAddresses (): void {
+  resetOfficeAddresses (): void {
     // reset store value
     // NB: this will cause setLocalProperties() to be called to reset local properties
     // NB: this will cause updateAddresses() to be called to update state
@@ -1027,7 +1026,7 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
    * Also called when we know what kind of correction this is.
    */
   @Watch('getOfficeAddresses', { deep: true, immediate: true })
-  @Watch('isBenBcCccUlcCorrectionFiling')
+  @Watch('isBaseCorrectionFiling')
   @Watch('isFirmCorrectionFiling')
   @Watch('isRestorationFiling')
   @Watch('isCoopCorrectionFiling')
diff --git a/src/components/common/YourCompany/RecognitionDateTime.vue b/src/components/common/YourCompany/RecognitionDateTime.vue
index dd883a782..0ec4947c6 100644
--- a/src/components/common/YourCompany/RecognitionDateTime.vue
+++ b/src/components/common/YourCompany/RecognitionDateTime.vue
@@ -31,13 +31,13 @@ export default class RecognitionDateTime extends Vue {
   @Getter(useStore) getBusinessFoundingDateTime!: string
   @Getter(useStore) getCorrectedFilingDate!: string
   @Getter(useStore) isAlterationFiling!: boolean
-  @Getter(useStore) isBenBcCccUlcCorrectionFiling!: boolean
+  @Getter(useStore) isBaseCorrectionFiling!: boolean
   @Getter(useStore) isCoopCorrectionFiling!: boolean
   @Getter(useStore) isRestorationFiling!: boolean
 
   /** The recognition date or business start date string. */
   get recognitionDateTime (): string {
-    if (this.isBenBcCccUlcCorrectionFiling || this.isRestorationFiling || this.isCoopCorrectionFiling) {
+    if (this.isBaseCorrectionFiling || this.isRestorationFiling || this.isCoopCorrectionFiling) {
       if (this.getBusinessFoundingDateTime) {
         return DateUtilities.apiToPacificDateTime(this.getBusinessFoundingDateTime)
       }
diff --git a/src/dialogs/ResolutionDateDialog.vue b/src/dialogs/ResolutionDateDialog.vue
index 2d972f3d8..76a247ad4 100644
--- a/src/dialogs/ResolutionDateDialog.vue
+++ b/src/dialogs/ResolutionDateDialog.vue
@@ -75,7 +75,7 @@ export default class ResolutionDateDialog extends Mixins(DateMixin) {
   /** Prop to display the dialog. */
   @Prop() readonly dialog!: boolean
 
-  // Global getters
+  // Store getters
   @Getter(useStore) getBusinessFoundingDateTime!: string
   @Getter(useStore) getCurrentDate!: string
   @Getter(useStore) getNewResolutionDates!: string []
diff --git a/src/interfaces/resource-interfaces/entity-type-option-interface.ts b/src/interfaces/resource-interfaces/entity-type-option-interface.ts
index 6a8df9fc3..2afe0522d 100644
--- a/src/interfaces/resource-interfaces/entity-type-option-interface.ts
+++ b/src/interfaces/resource-interfaces/entity-type-option-interface.ts
@@ -1,5 +1,7 @@
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
+
 export interface EntityTypeOption {
-    value: string;
-    shortDesc: string;
-    text: string;
+    value: CorpTypeCd
+    shortDesc: string
+    text: string
 }
diff --git a/src/interfaces/stepper-interfaces/YourCompany/address-interfaces.ts b/src/interfaces/stepper-interfaces/YourCompany/address-interfaces.ts
index ff3d73800..07de53bdf 100644
--- a/src/interfaces/stepper-interfaces/YourCompany/address-interfaces.ts
+++ b/src/interfaces/stepper-interfaces/YourCompany/address-interfaces.ts
@@ -30,10 +30,10 @@ export interface OfficeIF {
 /** Interface to define various office address types. */
 export interface AddressesIF {
   registeredOffice?: OfficeIF
-  // Records Office is required for BCOMPs.
+  // Records Office is required for BC/BEN/CC/ULC and C/CBEN/CCC/CUL.
   // Records Office may be optional for other app types.
   recordsOffice?: OfficeIF
-  // Business Office is required for Firms.
+  // Business Office is required for SP/GP.
   // Business Office may be optional for other app types.
   businessOffice?: OfficeIF
 }
diff --git a/src/mixins/fee-mixin.ts b/src/mixins/fee-mixin.ts
index eff474d31..990544377 100644
--- a/src/mixins/fee-mixin.ts
+++ b/src/mixins/fee-mixin.ts
@@ -13,12 +13,12 @@ import { useStore } from '@/store/store'
  */
 @Component({})
 export default class FeeMixin extends Vue {
-  // Global getters
+  // Store getters
   @Getter(useStore) getFeePrices!: FeesIF[]
   @Getter(useStore) getFilingData!: FilingDataIF[]
   @Getter(useStore) getStaffPayment!: StaffPaymentIF
 
-  // Global actions
+  // Store actions
   @Action(useStore) setCurrentFees!: (x: FeesIF[]) => void
   @Action(useStore) setFeePrices!: (x: FeesIF[]) => void
   @Action(useStore) setFilingData!: (x: FilingDataIF[]) => void
diff --git a/src/mixins/filing-template-mixin.ts b/src/mixins/filing-template-mixin.ts
index c6c6882d9..ecc8fc4e1 100644
--- a/src/mixins/filing-template-mixin.ts
+++ b/src/mixins/filing-template-mixin.ts
@@ -24,7 +24,7 @@ export default class FilingTemplateMixin extends DateMixin {
   // FUTURE: import entire store instead of individual getters, actions and mutations?
   // Ref: https://pinia.vuejs.org/cookbook/options-api.html#giving-access-to-the-whole-store
 
-  // Global getters
+  // Store getters
   @Getter(useStore) areProvisionsRemoved!: boolean
   @Getter(useStore) getAssociationType!: CoopTypes
   @Getter(useStore) getBusinessContact!: ContactPointIF
@@ -78,14 +78,14 @@ export default class FilingTemplateMixin extends DateMixin {
   @Getter(useStore) hasSpecialResolutionRulesChanged!: boolean
   @Getter(useStore) haveNameTranslationsChanged!: boolean
   @Getter(useStore) haveOfficeAddressesChanged!: boolean
-  @Getter(useStore) isBenBcCccUlcCorrectionFiling!: boolean
+  @Getter(useStore) isBaseCorrectionFiling!: boolean
   @Getter(useStore) isClientErrorCorrection!: boolean
   @Getter(useStore) isCoopCorrectionFiling!: boolean
   @Getter(useStore) isEntityTypeFirm!: boolean
   @Getter(useStore) isFirmCorrectionFiling!: boolean
   @Getter(useStore) isLimitedRestorationToFull!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setBusinessContact!: (x: ContactPointIF) => void
   @Action(useStore) setBusinessInformation!: (x: BusinessInformationIF) => void
   @Action(useStore) setCertifyState!: (x: CertifyIF) => void
@@ -187,8 +187,8 @@ export default class FilingTemplateMixin extends DateMixin {
       filing.correction.parties = parties
     }
 
-    // add in data specific to BEN/BC/CCC/ULC corrections
-    if (this.isBenBcCccUlcCorrectionFiling) {
+    // add in data specific to base corrections
+    if (this.isBaseCorrectionFiling) {
       filing.correction.nameTranslations = isDraft ? this.getNameTranslations : this.prepareNameTranslations()
       filing.correction.shareStructure = {
         shareClasses: isDraft ? this.getShareClasses : this.prepareShareClasses(),
@@ -774,8 +774,8 @@ export default class FilingTemplateMixin extends DateMixin {
     // store Correction Information
     this.setCorrectionInformation(cloneDeep(filing.correction))
 
-    // store Business Information for BEN/BC/CCC/ULC corrections
-    if (this.isBenBcCccUlcCorrectionFiling) {
+    // store Business Information for base corrections
+    if (this.isBaseCorrectionFiling) {
       this.setBusinessInformation({
         ...entitySnapshot?.businessInfo,
         ...filing.business,
@@ -842,8 +842,8 @@ export default class FilingTemplateMixin extends DateMixin {
       this.setSpecialResolution(cloneDeep(specialResolution))
     }
 
-    // store Name Translations (BEN/BC/CCC?ULC corrections only)
-    if (this.isBenBcCccUlcCorrectionFiling) {
+    // store Name Translations (base corrections only)
+    if (this.isBaseCorrectionFiling) {
       this.setNameTranslations(cloneDeep(
         this.mapNameTranslations(filing.correction.nameTranslations) ||
         this.mapNameTranslations(entitySnapshot?.nameTranslations) ||
@@ -868,8 +868,8 @@ export default class FilingTemplateMixin extends DateMixin {
     orgPersons = orgPersons.filter(op => !(op?.roles.some(role => role.roleType === RoleTypes.COMPLETING_PARTY)))
     this.setPeopleAndRoles(cloneDeep(orgPersons))
 
-    // store Share Classes and Resolution Dates (BEN/BC/CCC/ULC corrections only)
-    if (this.isBenBcCccUlcCorrectionFiling) {
+    // store Share Classes and Resolution Dates (base corrections only)
+    if (this.isBaseCorrectionFiling) {
       this.setShareClasses(cloneDeep(
         filing.correction.shareStructure?.shareClasses ||
         entitySnapshot?.shareStructure?.shareClasses ||
@@ -1379,10 +1379,14 @@ export default class FilingTemplateMixin extends DateMixin {
 
     // handle entity-specific values
     switch (entitySnapshot?.businessInfo?.legalType) {
-      case CorpTypeCd.BENEFIT_COMPANY:
-      case CorpTypeCd.BC_COMPANY:
       case CorpTypeCd.BC_CCC:
-      case CorpTypeCd.BC_ULC_COMPANY: {
+      case CorpTypeCd.BC_COMPANY:
+      case CorpTypeCd.BC_ULC_COMPANY:
+      case CorpTypeCd.BEN_CONTINUE_IN:
+      case CorpTypeCd.BENEFIT_COMPANY:
+      case CorpTypeCd.CCC_CONTINUE_IN:
+      case CorpTypeCd.CONTINUE_IN:
+      case CorpTypeCd.ULC_CONTINUE_IN: {
         // store Name Translations
         // don't need cloneDeep because mapNameTranslations already returns new array
         this.setNameTranslations(this.mapNameTranslations(entitySnapshot?.nameTranslations || []))
diff --git a/src/resources/Alteration/BC.ts b/src/resources/Alteration/BC.ts
index d979ac983..c7756b250 100644
--- a/src/resources/Alteration/BC.ts
+++ b/src/resources/Alteration/BC.ts
@@ -2,7 +2,7 @@ import { CorrectNameOptions, FilingCodes } from '@/enums/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const BcAlterationResource: ResourceIF = {
+export const AlterationResourceBc: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
   displayName: GetCorpFullDescription(CorpTypeCd.BC_COMPANY),
@@ -25,22 +25,22 @@ export const BcAlterationResource: ResourceIF = {
     ],
     entityTypeOptions: [
       {
-        value: 'BC',
+        value: CorpTypeCd.BC_COMPANY,
         shortDesc: 'BC Limited Company',
         text: 'BC Limited Company'
       },
       {
-        value: 'BEN',
+        value: CorpTypeCd.BENEFIT_COMPANY,
         shortDesc: 'BC Benefit Company',
         text: 'BC Benefit Company'
       },
       {
-        value: 'ULC',
+        value: CorpTypeCd.BC_ULC_COMPANY,
         shortDesc: 'BC Unlimited Liability Company',
         text: 'BC Unlimited Liability Company'
       },
       {
-        value: 'CC',
+        value: CorpTypeCd.BC_CCC,
         shortDesc: 'BC Community Contribution Company',
         text: 'BC Community Contribution Company'
       }
diff --git a/src/resources/Alteration/BEN.ts b/src/resources/Alteration/BEN.ts
index 27e7cb456..bea70d9c6 100644
--- a/src/resources/Alteration/BEN.ts
+++ b/src/resources/Alteration/BEN.ts
@@ -2,7 +2,7 @@ import { CorrectNameOptions, FilingCodes } from '@/enums/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const BenAlterationResource: ResourceIF = {
+export const AlterationResourceBen: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
   displayName: GetCorpFullDescription(CorpTypeCd.BENEFIT_COMPANY),
@@ -19,17 +19,17 @@ export const BenAlterationResource: ResourceIF = {
     ],
     entityTypeOptions: [
       {
-        value: 'BEN',
+        value: CorpTypeCd.BENEFIT_COMPANY,
         shortDesc: 'BC Benefit Company',
         text: 'BC Benefit Company'
       },
       {
-        value: 'BC',
+        value: CorpTypeCd.BC_COMPANY,
         shortDesc: 'BC Limited Company',
         text: 'BC Limited Company'
       },
       {
-        value: 'CC',
+        value: CorpTypeCd.BC_CCC,
         shortDesc: 'BC Community Contribution Company',
         text: 'BC Community Contribution Company'
       }
diff --git a/src/resources/Alteration/C.ts b/src/resources/Alteration/C.ts
new file mode 100644
index 000000000..cab9b591b
--- /dev/null
+++ b/src/resources/Alteration/C.ts
@@ -0,0 +1,55 @@
+import { CorrectNameOptions, FilingCodes } from '@/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const AlterationResourceC: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: GetCorpFullDescription(CorpTypeCd.CONTINUE_IN),
+  addressLabel: 'Registered Office',
+  filingData: {
+    filingTypeCode: FilingCodes.ALTERATION,
+    entityType: CorpTypeCd.CONTINUE_IN,
+    priority: false
+  },
+  // Conditionally used in place of filingData when switching from BC (or C) to ULC:
+  additionalFilingData: {
+    filingTypeCode: FilingCodes.ALTERATION_BC_TO_ULC,
+    entityType: CorpTypeCd.BC_COMPANY,
+    priority: false
+  },
+  changeData: {
+    correctNameOptions: [
+      CorrectNameOptions.CORRECT_NEW_NR,
+      CorrectNameOptions.CORRECT_NAME_TO_NUMBER
+    ],
+    entityTypeOptions: [
+      {
+        value: CorpTypeCd.BC_COMPANY,
+        shortDesc: 'BC Limited Company',
+        text: 'BC Limited Company'
+      },
+      {
+        value: CorpTypeCd.BENEFIT_COMPANY,
+        shortDesc: 'BC Benefit Company',
+        text: 'BC Benefit Company'
+      },
+      {
+        value: CorpTypeCd.BC_ULC_COMPANY,
+        shortDesc: 'BC Unlimited Liability Company',
+        text: 'BC Unlimited Liability Company'
+      },
+      {
+        value: CorpTypeCd.BC_CCC,
+        shortDesc: 'BC Community Contribution Company',
+        text: 'BC Community Contribution Company'
+      }
+    ],
+    articleTitle: 'Limited Company Articles',
+    articleInfo: `The company has completed a set of BC LTD Company Articles, and a copy of these articles has been
+      added to company's record book.`
+  },
+  certifyClause: 'Note: It is an offence to make a false or misleading statement in respect ' +
+    'of a material fact in a record submitted to the Corporate Registry for filing. ' +
+    'See section 427 of the Business Corporations Act.'
+}
diff --git a/src/resources/Alteration/CBEN.ts b/src/resources/Alteration/CBEN.ts
new file mode 100644
index 000000000..2ad809106
--- /dev/null
+++ b/src/resources/Alteration/CBEN.ts
@@ -0,0 +1,44 @@
+import { CorrectNameOptions, FilingCodes } from '@/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const AlterationResourceCben: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: GetCorpFullDescription(CorpTypeCd.BEN_CONTINUE_IN),
+  addressLabel: 'Registered Office',
+  filingData: {
+    filingTypeCode: FilingCodes.ALTERATION,
+    entityType: CorpTypeCd.BEN_CONTINUE_IN,
+    priority: false
+  },
+  changeData: {
+    correctNameOptions: [
+      CorrectNameOptions.CORRECT_NEW_NR,
+      CorrectNameOptions.CORRECT_NAME_TO_NUMBER
+    ],
+    entityTypeOptions: [
+      {
+        value: CorpTypeCd.BENEFIT_COMPANY,
+        shortDesc: 'BC Benefit Company',
+        text: 'BC Benefit Company'
+      },
+      {
+        value: CorpTypeCd.BC_COMPANY,
+        shortDesc: 'BC Limited Company',
+        text: 'BC Limited Company'
+      },
+      {
+        value: CorpTypeCd.BC_CCC,
+        shortDesc: 'BC Community Contribution Company',
+        text: 'BC Community Contribution Company'
+      }
+    ],
+    articleTitle: 'Benefit Company Articles',
+    articleInfo: `The company has completed a set Benefit Company Articles containing a benefit provision, 
+      and a copy of these articles has been added to the company's record book.`
+  },
+  certifyClause: 'Note: It is an offence to make a false or misleading statement in respect ' +
+    'of a material fact in a record submitted to the Corporate Registry for filing. ' +
+    'See section 427 of the Business Corporations Act.'
+}
diff --git a/src/resources/Alteration/CC.ts b/src/resources/Alteration/CC.ts
new file mode 100644
index 000000000..f518b7e0d
--- /dev/null
+++ b/src/resources/Alteration/CC.ts
@@ -0,0 +1,27 @@
+import { CorrectNameOptions, FilingCodes } from '@/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const AlterationResourceCc: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: GetCorpFullDescription(CorpTypeCd.BC_CCC),
+  addressLabel: 'Registered Office',
+  filingData: {
+    filingTypeCode: FilingCodes.ALTERATION,
+    entityType: CorpTypeCd.BC_CCC,
+    priority: false
+  },
+  changeData: {
+    correctNameOptions: [
+      CorrectNameOptions.CORRECT_NEW_NR,
+      CorrectNameOptions.CORRECT_NAME_TO_NUMBER
+    ],
+    articleTitle: 'Community Contribution Company Articles',
+    articleInfo: `The company has completed a set of Community Contribution Company Articles
+      containing a community provision, and a copy of these articles has been added to company's record book.`
+  },
+  certifyClause: 'Note: It is an offence to make a false or misleading statement in respect ' +
+    'of a material fact in a record submitted to the Corporate Registry for filing. ' +
+    'See section 427 of the Business Corporations Act.'
+}
diff --git a/src/resources/Alteration/CCC.ts b/src/resources/Alteration/CCC.ts
index def2b1836..03da95972 100644
--- a/src/resources/Alteration/CCC.ts
+++ b/src/resources/Alteration/CCC.ts
@@ -2,14 +2,14 @@ import { CorrectNameOptions, FilingCodes } from '@/enums/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const CccAlterationResource: ResourceIF = {
+export const AlterationResourceCcc: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
-  displayName: GetCorpFullDescription(CorpTypeCd.BC_CCC),
+  displayName: GetCorpFullDescription(CorpTypeCd.CCC_CONTINUE_IN),
   addressLabel: 'Registered Office',
   filingData: {
     filingTypeCode: FilingCodes.ALTERATION,
-    entityType: CorpTypeCd.BC_CCC,
+    entityType: CorpTypeCd.CCC_CONTINUE_IN,
     priority: false
   },
   changeData: {
diff --git a/src/resources/Alteration/CUL.ts b/src/resources/Alteration/CUL.ts
new file mode 100644
index 000000000..14419b181
--- /dev/null
+++ b/src/resources/Alteration/CUL.ts
@@ -0,0 +1,44 @@
+import { CorrectNameOptions, FilingCodes } from '@/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const AlterationResourceCul: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: GetCorpFullDescription(CorpTypeCd.ULC_CONTINUE_IN),
+  addressLabel: 'Registered Office',
+  filingData: {
+    filingTypeCode: FilingCodes.ALTERATION,
+    entityType: CorpTypeCd.ULC_CONTINUE_IN,
+    priority: false
+  },
+  changeData: {
+    correctNameOptions: [
+      CorrectNameOptions.CORRECT_NEW_NR,
+      CorrectNameOptions.CORRECT_NAME_TO_NUMBER
+    ],
+    entityTypeOptions: [
+      {
+        value: CorpTypeCd.BC_ULC_COMPANY,
+        shortDesc: 'BC Unlimited Liability Company',
+        text: 'BC Unlimited Liability Company'
+      },
+      {
+        value: CorpTypeCd.BENEFIT_COMPANY,
+        shortDesc: 'BC Benefit Company',
+        text: 'BC Benefit Company'
+      },
+      {
+        value: CorpTypeCd.BC_COMPANY,
+        shortDesc: 'BC Limited Company',
+        text: 'BC Limited Company'
+      }
+    ],
+    articleTitle: 'Unlimited Liability Company Articles',
+    articleInfo: `The company has completed a set of Unlimited Liability Company Articles containing a liability
+      provision, and a copy of these articles has been added to company's record book.`
+  },
+  certifyClause: 'Note: It is an offence to make a false or misleading statement in respect ' +
+    'of a material fact in a record submitted to the Corporate Registry for filing. ' +
+    'See section 427 of the Business Corporations Act.'
+}
diff --git a/src/resources/Alteration/ULC.ts b/src/resources/Alteration/ULC.ts
index 281c2929c..e073e4506 100644
--- a/src/resources/Alteration/ULC.ts
+++ b/src/resources/Alteration/ULC.ts
@@ -2,7 +2,7 @@ import { CorrectNameOptions, FilingCodes } from '@/enums/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const UlcAlterationResource: ResourceIF = {
+export const AlterationResourceUlc: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
   displayName: GetCorpFullDescription(CorpTypeCd.BC_ULC_COMPANY),
@@ -19,17 +19,17 @@ export const UlcAlterationResource: ResourceIF = {
     ],
     entityTypeOptions: [
       {
-        value: 'ULC',
+        value: CorpTypeCd.BC_ULC_COMPANY,
         shortDesc: 'BC Unlimited Liability Company',
         text: 'BC Unlimited Liability Company'
       },
       {
-        value: 'BEN',
+        value: CorpTypeCd.BENEFIT_COMPANY,
         shortDesc: 'BC Benefit Company',
         text: 'BC Benefit Company'
       },
       {
-        value: 'BC',
+        value: CorpTypeCd.BC_COMPANY,
         shortDesc: 'BC Limited Company',
         text: 'BC Limited Company'
       }
diff --git a/src/resources/Alteration/index.ts b/src/resources/Alteration/index.ts
index af281564f..607278f2b 100644
--- a/src/resources/Alteration/index.ts
+++ b/src/resources/Alteration/index.ts
@@ -1,4 +1,8 @@
 export * from './BC'
 export * from './BEN'
+export * from './C'
+export * from './CBEN'
+export * from './CC'
 export * from './CCC'
+export * from './CUL'
 export * from './ULC'
diff --git a/src/resources/Change/GP.ts b/src/resources/Change/GP.ts
index fb3acde66..00718eaea 100644
--- a/src/resources/Change/GP.ts
+++ b/src/resources/Change/GP.ts
@@ -3,7 +3,7 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const GpChangeResource: ResourceIF = {
+export const ChangeResourceGp: ResourceIF = {
   entityReference: 'Business',
   contactLabel: 'Business',
   displayName: GetCorpFullDescription(CorpTypeCd.PARTNERSHIP),
diff --git a/src/resources/Change/SP.ts b/src/resources/Change/SP.ts
index 1fdc441dc..adc2b2e2a 100644
--- a/src/resources/Change/SP.ts
+++ b/src/resources/Change/SP.ts
@@ -3,7 +3,7 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const SpChangeResource: ResourceIF = {
+export const ChangeResourceSp: ResourceIF = {
   entityReference: 'Business',
   contactLabel: 'Business',
   displayName: GetCorpFullDescription(CorpTypeCd.SOLE_PROP),
diff --git a/src/resources/Change/SPOrganization.ts b/src/resources/Change/SPOrganization.ts
index 467ea7d5f..21372a5d9 100644
--- a/src/resources/Change/SPOrganization.ts
+++ b/src/resources/Change/SPOrganization.ts
@@ -3,7 +3,7 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const SpOrganizationChangeResource: ResourceIF = {
+export const ChangeResourceSpOrganization: ResourceIF = {
   entityReference: 'Business',
   contactLabel: 'Business',
   displayName: GetCorpFullDescription(CorpTypeCd.SOLE_PROP),
diff --git a/src/resources/Conversion/GP.ts b/src/resources/Conversion/GP.ts
index 8c6e9bf3a..2c9eb5bb1 100644
--- a/src/resources/Conversion/GP.ts
+++ b/src/resources/Conversion/GP.ts
@@ -2,7 +2,7 @@ import { CorrectNameOptions, FilingCodes } from '@/enums/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const GpConversionResource: ResourceIF = {
+export const ConversionResourceGp: ResourceIF = {
   entityReference: 'Business',
   contactLabel: 'Business',
   displayName: GetCorpFullDescription(CorpTypeCd.PARTNERSHIP),
diff --git a/src/resources/Conversion/SP.ts b/src/resources/Conversion/SP.ts
index 11faffd1b..50692bee6 100644
--- a/src/resources/Conversion/SP.ts
+++ b/src/resources/Conversion/SP.ts
@@ -2,7 +2,7 @@ import { CorrectNameOptions, FilingCodes } from '@/enums/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const SpConversionResource: ResourceIF = {
+export const ConversionResourceSp: ResourceIF = {
   entityReference: 'Business',
   contactLabel: 'Business',
   displayName: GetCorpFullDescription(CorpTypeCd.SOLE_PROP),
diff --git a/src/resources/Correction/BC.ts b/src/resources/Correction/BC.ts
index a36e609c8..3016a7e83 100644
--- a/src/resources/Correction/BC.ts
+++ b/src/resources/Correction/BC.ts
@@ -3,7 +3,7 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const BcCorrectionResource: ResourceIF = {
+export const CorrectionResourceBc: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
   displayName: null, // not used
diff --git a/src/resources/Correction/BEN.ts b/src/resources/Correction/BEN.ts
index 694c065cf..a2293696a 100644
--- a/src/resources/Correction/BEN.ts
+++ b/src/resources/Correction/BEN.ts
@@ -3,7 +3,7 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const BenCorrectionResource: ResourceIF = {
+export const CorrectionResourceBen: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
   displayName: null, // not used
diff --git a/src/resources/Correction/C.ts b/src/resources/Correction/C.ts
new file mode 100644
index 000000000..843f6982d
--- /dev/null
+++ b/src/resources/Correction/C.ts
@@ -0,0 +1,38 @@
+import { CorrectNameOptions, FilingCodes } from '@/enums/'
+import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const CorrectionResourceC: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: null, // not used
+  entityType: CorpTypeCd.CONTINUE_IN,
+  addressLabel: 'Registered Office',
+  title: 'Benefit Company Statement',
+  description: 'This company is a benefit company and, as such, has purposes that include conducting its business in' +
+               ' a responsible and sustainable manner and promoting one or more public benefits.',
+  filingData: {
+    filingTypeCode: FilingCodes.CORRECTION,
+    entityType: CorpTypeCd.CONTINUE_IN,
+    priority: false
+  },
+  changeData: {
+    correctNameOptions: [
+      CorrectNameOptions.CORRECT_NEW_NR,
+      CorrectNameOptions.CORRECT_NAME_TO_NUMBER,
+      CorrectNameOptions.CORRECT_NAME
+    ],
+    orgPersonInfo: {
+      orgPersonLabel: 'Directors',
+      subtitle: null // not used
+    },
+    nameRequestTypes: [
+      NrRequestActionCodes.CHANGE_NAME,
+      NrRequestActionCodes.CONVERSION
+    ]
+  },
+  certifyClause: 'Note: It is an offence to make a false or misleading statement in respect ' +
+    'of a material fact in a record submitted to the Corporate Registry for filing. ' +
+    'See section 427 of the Business Corporations Act.'
+}
diff --git a/src/resources/Correction/CBEN.ts b/src/resources/Correction/CBEN.ts
new file mode 100644
index 000000000..0c0d76413
--- /dev/null
+++ b/src/resources/Correction/CBEN.ts
@@ -0,0 +1,38 @@
+import { CorrectNameOptions, FilingCodes } from '@/enums/'
+import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const CorrectionResourceCben: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: null, // not used
+  entityType: CorpTypeCd.BEN_CONTINUE_IN,
+  addressLabel: 'Registered Office',
+  title: 'Benefit Company Statement',
+  description: 'This company is a benefit company and, as such, has purposes that include conducting its business in' +
+               ' a responsible and sustainable manner and promoting one or more public benefits.',
+  filingData: {
+    filingTypeCode: FilingCodes.CORRECTION,
+    entityType: CorpTypeCd.BEN_CONTINUE_IN,
+    priority: false
+  },
+  changeData: {
+    correctNameOptions: [
+      CorrectNameOptions.CORRECT_NEW_NR,
+      CorrectNameOptions.CORRECT_NAME_TO_NUMBER,
+      CorrectNameOptions.CORRECT_NAME
+    ],
+    orgPersonInfo: {
+      orgPersonLabel: 'Directors',
+      subtitle: null // not used
+    },
+    nameRequestTypes: [
+      NrRequestActionCodes.CHANGE_NAME,
+      NrRequestActionCodes.CONVERSION
+    ]
+  },
+  certifyClause: 'Note: It is an offence to make a false or misleading statement in respect ' +
+    'of a material fact in a record submitted to the Corporate Registry for filing. ' +
+    'See section 427 of the Business Corporations Act.'
+}
diff --git a/src/resources/Correction/CC.ts b/src/resources/Correction/CC.ts
new file mode 100644
index 000000000..8d161fa9d
--- /dev/null
+++ b/src/resources/Correction/CC.ts
@@ -0,0 +1,38 @@
+import { CorrectNameOptions, FilingCodes } from '@/enums/'
+import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const CorrectionResourceCc: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: null, // not used
+  entityType: CorpTypeCd.BC_CCC,
+  addressLabel: 'Registered Office',
+  title: 'Benefit Company Statement',
+  description: 'This company is a benefit company and, as such, has purposes that include conducting its business in' +
+               ' a responsible and sustainable manner and promoting one or more public benefits.',
+  filingData: {
+    filingTypeCode: FilingCodes.CORRECTION,
+    entityType: CorpTypeCd.BC_CCC,
+    priority: false
+  },
+  changeData: {
+    correctNameOptions: [
+      CorrectNameOptions.CORRECT_NEW_NR,
+      CorrectNameOptions.CORRECT_NAME_TO_NUMBER,
+      CorrectNameOptions.CORRECT_NAME
+    ],
+    orgPersonInfo: {
+      orgPersonLabel: 'Directors',
+      subtitle: null // not used
+    },
+    nameRequestTypes: [
+      NrRequestActionCodes.CHANGE_NAME,
+      NrRequestActionCodes.CONVERSION
+    ]
+  },
+  certifyClause: 'Note: It is an offence to make a false or misleading statement in respect ' +
+    'of a material fact in a record submitted to the Corporate Registry for filing. ' +
+    'See section 427 of the Business Corporations Act.'
+}
diff --git a/src/resources/Correction/CCC.ts b/src/resources/Correction/CCC.ts
index 82400a0ba..d8137fdbc 100644
--- a/src/resources/Correction/CCC.ts
+++ b/src/resources/Correction/CCC.ts
@@ -3,18 +3,18 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const CccCorrectionResource: ResourceIF = {
+export const CorrectionResourceCcc: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
   displayName: null, // not used
-  entityType: CorpTypeCd.BC_CCC,
+  entityType: CorpTypeCd.CCC_CONTINUE_IN,
   addressLabel: 'Registered Office',
   title: 'Benefit Company Statement',
   description: 'This company is a benefit company and, as such, has purposes that include conducting its business in' +
                ' a responsible and sustainable manner and promoting one or more public benefits.',
   filingData: {
     filingTypeCode: FilingCodes.CORRECTION,
-    entityType: CorpTypeCd.BC_CCC,
+    entityType: CorpTypeCd.CCC_CONTINUE_IN,
     priority: false
   },
   changeData: {
diff --git a/src/resources/Correction/CP.ts b/src/resources/Correction/CP.ts
index f186bc874..77310812c 100644
--- a/src/resources/Correction/CP.ts
+++ b/src/resources/Correction/CP.ts
@@ -3,7 +3,7 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const CpCorrectionResource: ResourceIF = {
+export const CorrectionResourceCp: ResourceIF = {
   entityReference: 'Business',
   contactLabel: 'Registered Office',
   displayName: null, // not used
diff --git a/src/resources/Correction/CUL.ts b/src/resources/Correction/CUL.ts
new file mode 100644
index 000000000..56b470c32
--- /dev/null
+++ b/src/resources/Correction/CUL.ts
@@ -0,0 +1,38 @@
+import { CorrectNameOptions, FilingCodes } from '@/enums/'
+import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const CorrectionResourceCul: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: null, // not used
+  entityType: CorpTypeCd.ULC_CONTINUE_IN,
+  addressLabel: 'Registered Office',
+  title: 'Benefit Company Statement',
+  description: 'This company is a benefit company and, as such, has purposes that include conducting its business in' +
+               ' a responsible and sustainable manner and promoting one or more public benefits.',
+  filingData: {
+    filingTypeCode: FilingCodes.CORRECTION,
+    entityType: CorpTypeCd.ULC_CONTINUE_IN,
+    priority: false
+  },
+  changeData: {
+    correctNameOptions: [
+      CorrectNameOptions.CORRECT_NEW_NR,
+      CorrectNameOptions.CORRECT_NAME_TO_NUMBER,
+      CorrectNameOptions.CORRECT_NAME
+    ],
+    orgPersonInfo: {
+      orgPersonLabel: 'Directors',
+      subtitle: null // not used
+    },
+    nameRequestTypes: [
+      NrRequestActionCodes.CHANGE_NAME,
+      NrRequestActionCodes.CONVERSION
+    ]
+  },
+  certifyClause: 'Note: It is an offence to make a false or misleading statement in respect ' +
+    'of a material fact in a record submitted to the Corporate Registry for filing. ' +
+    'See section 427 of the Business Corporations Act.'
+}
diff --git a/src/resources/Correction/GP.ts b/src/resources/Correction/GP.ts
index 1c091e116..fe42086e5 100644
--- a/src/resources/Correction/GP.ts
+++ b/src/resources/Correction/GP.ts
@@ -3,7 +3,7 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const GpCorrectionResource: ResourceIF = {
+export const CorrectionResourceGp: ResourceIF = {
   entityReference: 'Business',
   contactLabel: 'Business',
   displayName: null, // not used
diff --git a/src/resources/Correction/SP.ts b/src/resources/Correction/SP.ts
index 1451c795a..61f3f5e8c 100644
--- a/src/resources/Correction/SP.ts
+++ b/src/resources/Correction/SP.ts
@@ -3,7 +3,7 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const SpCorrectionResource: ResourceIF = {
+export const CorrectionResourceSp: ResourceIF = {
   entityReference: 'Business',
   contactLabel: 'Business',
   displayName: null, // not used
diff --git a/src/resources/Correction/ULC.ts b/src/resources/Correction/ULC.ts
index 8d042c579..eacd98140 100644
--- a/src/resources/Correction/ULC.ts
+++ b/src/resources/Correction/ULC.ts
@@ -3,7 +3,7 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const UlcCorrectionResource: ResourceIF = {
+export const CorrectionResourceUlc: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
   displayName: null, // not used
diff --git a/src/resources/Correction/index.ts b/src/resources/Correction/index.ts
index 210134647..50d6e144a 100644
--- a/src/resources/Correction/index.ts
+++ b/src/resources/Correction/index.ts
@@ -1,7 +1,11 @@
 export * from './BC'
 export * from './BEN'
+export * from './C'
+export * from './CBEN'
+export * from './CC'
 export * from './CCC'
 export * from './CP'
+export * from './CUL'
 export * from './GP'
 export * from './SP'
 export * from './ULC'
diff --git a/src/resources/LimitedRestorationExtension/BC.ts b/src/resources/LimitedRestorationExtension/BC.ts
index 7d8d0f945..0411d5614 100644
--- a/src/resources/LimitedRestorationExtension/BC.ts
+++ b/src/resources/LimitedRestorationExtension/BC.ts
@@ -2,7 +2,7 @@ import { FilingCodes } from '@/enums/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const BcRestorationResource: ResourceIF = {
+export const RestorationResourceBc: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
   displayName: GetCorpFullDescription(CorpTypeCd.BC_COMPANY),
diff --git a/src/resources/LimitedRestorationExtension/BEN.ts b/src/resources/LimitedRestorationExtension/BEN.ts
index b20e85e69..22d9506e2 100644
--- a/src/resources/LimitedRestorationExtension/BEN.ts
+++ b/src/resources/LimitedRestorationExtension/BEN.ts
@@ -2,7 +2,7 @@ import { FilingCodes } from '@/enums/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const BenRestorationResource: ResourceIF = {
+export const RestorationResourceBen: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
   displayName: GetCorpFullDescription(CorpTypeCd.BENEFIT_COMPANY),
diff --git a/src/resources/LimitedRestorationExtension/C.ts b/src/resources/LimitedRestorationExtension/C.ts
new file mode 100644
index 000000000..cf19c4413
--- /dev/null
+++ b/src/resources/LimitedRestorationExtension/C.ts
@@ -0,0 +1,30 @@
+import { FilingCodes } from '@/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const RestorationResourceC: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: GetCorpFullDescription(CorpTypeCd.CONTINUE_IN),
+  addressLabel: 'Registered Office',
+  showEmailUnderName: false,
+  userEmailOptional: false,
+  userEmailLabel: 'Applicant',
+  filingData: {
+    entityType: CorpTypeCd.CONTINUE_IN,
+    filingTypeCode: FilingCodes.RESTORATION_LTD_EXTEND,
+    priority: false
+  },
+  changeData: {
+    orgPersonInfo: {
+      orgPersonLabel: 'Applicant',
+      orgTypesLabel: 'Business or Corporation',
+      subtitle: null // not used
+    },
+    correctNameOptions: []
+  },
+  certifyClause: 'Note: It is an offence to make or assist in making a false or misleading statement in a record ' +
+    'filed under the BC Corporations Act. ' +
+    'A person who commits this offence is subject to a maximum fine of $5000.',
+  certifyText: 'BC Corporations Act'
+}
diff --git a/src/resources/LimitedRestorationExtension/CBEN.ts b/src/resources/LimitedRestorationExtension/CBEN.ts
new file mode 100644
index 000000000..96cd924d4
--- /dev/null
+++ b/src/resources/LimitedRestorationExtension/CBEN.ts
@@ -0,0 +1,30 @@
+import { FilingCodes } from '@/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const RestorationResourceCben: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: GetCorpFullDescription(CorpTypeCd.BEN_CONTINUE_IN),
+  addressLabel: 'Registered Office',
+  showEmailUnderName: false,
+  userEmailOptional: false,
+  userEmailLabel: 'Applicant',
+  filingData: {
+    entityType: CorpTypeCd.BEN_CONTINUE_IN,
+    filingTypeCode: FilingCodes.RESTORATION_LTD_EXTEND,
+    priority: false
+  },
+  changeData: {
+    orgPersonInfo: {
+      orgPersonLabel: 'Applicant',
+      orgTypesLabel: 'Business or Corporation',
+      subtitle: null // not used
+    },
+    correctNameOptions: []
+  },
+  certifyClause: 'Note: It is an offence to make or assist in making a false or misleading statement in a record ' +
+    'filed under the BC Corporations Act. ' +
+    'A person who commits this offence is subject to a maximum fine of $5000.',
+  certifyText: 'BC Corporations Act'
+}
diff --git a/src/resources/LimitedRestorationExtension/CC.ts b/src/resources/LimitedRestorationExtension/CC.ts
new file mode 100644
index 000000000..a031efe6d
--- /dev/null
+++ b/src/resources/LimitedRestorationExtension/CC.ts
@@ -0,0 +1,30 @@
+import { FilingCodes } from '@/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const RestorationResourceCc: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: GetCorpFullDescription(CorpTypeCd.BC_CCC),
+  addressLabel: 'Registered Office',
+  showEmailUnderName: false,
+  userEmailOptional: false,
+  userEmailLabel: 'Applicant',
+  filingData: {
+    entityType: CorpTypeCd.BC_CCC,
+    filingTypeCode: FilingCodes.RESTORATION_LTD_EXTEND,
+    priority: false
+  },
+  changeData: {
+    orgPersonInfo: {
+      orgPersonLabel: 'Applicant',
+      orgTypesLabel: 'Business or Corporation',
+      subtitle: null // not used
+    },
+    correctNameOptions: []
+  },
+  certifyClause: 'Note: It is an offence to make or assist in making a false or misleading statement in a record ' +
+    'filed under the BC Corporations Act. ' +
+    'A person who commits this offence is subject to a maximum fine of $5000.',
+  certifyText: 'BC Corporations Act'
+}
diff --git a/src/resources/LimitedRestorationExtension/CCC.ts b/src/resources/LimitedRestorationExtension/CCC.ts
index fcbe77c71..d07dfce8e 100644
--- a/src/resources/LimitedRestorationExtension/CCC.ts
+++ b/src/resources/LimitedRestorationExtension/CCC.ts
@@ -2,16 +2,16 @@ import { FilingCodes } from '@/enums/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const CccRestorationResource: ResourceIF = {
+export const RestorationResourceCcc: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
-  displayName: GetCorpFullDescription(CorpTypeCd.BC_CCC),
+  displayName: GetCorpFullDescription(CorpTypeCd.CCC_CONTINUE_IN),
   addressLabel: 'Registered Office',
   showEmailUnderName: false,
   userEmailOptional: false,
   userEmailLabel: 'Applicant',
   filingData: {
-    entityType: CorpTypeCd.BC_CCC,
+    entityType: CorpTypeCd.CCC_CONTINUE_IN,
     filingTypeCode: FilingCodes.RESTORATION_LTD_EXTEND,
     priority: false
   },
diff --git a/src/resources/LimitedRestorationExtension/CUL.ts b/src/resources/LimitedRestorationExtension/CUL.ts
new file mode 100644
index 000000000..70fd42c82
--- /dev/null
+++ b/src/resources/LimitedRestorationExtension/CUL.ts
@@ -0,0 +1,30 @@
+import { FilingCodes } from '@/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const RestorationResourceCul: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: GetCorpFullDescription(CorpTypeCd.ULC_CONTINUE_IN),
+  addressLabel: 'Registered Office',
+  showEmailUnderName: false,
+  userEmailOptional: false,
+  userEmailLabel: 'Applicant',
+  filingData: {
+    entityType: CorpTypeCd.ULC_CONTINUE_IN,
+    filingTypeCode: FilingCodes.RESTORATION_LTD_EXTEND,
+    priority: false
+  },
+  changeData: {
+    orgPersonInfo: {
+      orgPersonLabel: 'Applicant',
+      orgTypesLabel: 'Business or Corporation',
+      subtitle: null // not used
+    },
+    correctNameOptions: []
+  },
+  certifyClause: 'Note: It is an offence to make or assist in making a false or misleading statement in a record ' +
+    'filed under the BC Corporations Act. ' +
+    'A person who commits this offence is subject to a maximum fine of $5000.',
+  certifyText: 'BC Corporations Act'
+}
diff --git a/src/resources/LimitedRestorationExtension/ULC.ts b/src/resources/LimitedRestorationExtension/ULC.ts
index f7a31041c..80d98c868 100644
--- a/src/resources/LimitedRestorationExtension/ULC.ts
+++ b/src/resources/LimitedRestorationExtension/ULC.ts
@@ -2,7 +2,7 @@ import { FilingCodes } from '@/enums/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const UlcRestorationResource: ResourceIF = {
+export const RestorationResourceUlc: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
   displayName: GetCorpFullDescription(CorpTypeCd.BC_ULC_COMPANY),
diff --git a/src/resources/LimitedRestorationExtension/index.ts b/src/resources/LimitedRestorationExtension/index.ts
index af281564f..607278f2b 100644
--- a/src/resources/LimitedRestorationExtension/index.ts
+++ b/src/resources/LimitedRestorationExtension/index.ts
@@ -1,4 +1,8 @@
 export * from './BC'
 export * from './BEN'
+export * from './C'
+export * from './CBEN'
+export * from './CC'
 export * from './CCC'
+export * from './CUL'
 export * from './ULC'
diff --git a/src/resources/LimitedRestorationToFull/BC.ts b/src/resources/LimitedRestorationToFull/BC.ts
index 496c9be23..97294efba 100644
--- a/src/resources/LimitedRestorationToFull/BC.ts
+++ b/src/resources/LimitedRestorationToFull/BC.ts
@@ -3,7 +3,7 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const BcRestorationResource: ResourceIF = {
+export const RestorationResourceBc: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
   displayName: GetCorpFullDescription(CorpTypeCd.BC_COMPANY),
diff --git a/src/resources/LimitedRestorationToFull/BEN.ts b/src/resources/LimitedRestorationToFull/BEN.ts
index b4902787a..f24d6bfa7 100644
--- a/src/resources/LimitedRestorationToFull/BEN.ts
+++ b/src/resources/LimitedRestorationToFull/BEN.ts
@@ -3,7 +3,7 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const BenRestorationResource: ResourceIF = {
+export const RestorationResourceBen: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
   displayName: GetCorpFullDescription(CorpTypeCd.BENEFIT_COMPANY),
diff --git a/src/resources/LimitedRestorationToFull/C.ts b/src/resources/LimitedRestorationToFull/C.ts
new file mode 100644
index 000000000..1859b6899
--- /dev/null
+++ b/src/resources/LimitedRestorationToFull/C.ts
@@ -0,0 +1,37 @@
+import { CorrectNameOptions, FilingCodes } from '@/enums/'
+import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const RestorationResourceC: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: GetCorpFullDescription(CorpTypeCd.CONTINUE_IN),
+  addressLabel: 'Registered Office',
+  showEmailUnderName: false,
+  userEmailOptional: false,
+  userEmailLabel: 'Applicant',
+  filingData: {
+    entityType: CorpTypeCd.CONTINUE_IN,
+    filingTypeCode: FilingCodes.RESTORATION_LTD_TO_FULL,
+    priority: false
+  },
+  changeData: {
+    correctNameOptions: [
+      CorrectNameOptions.CORRECT_NEW_NR,
+      CorrectNameOptions.CORRECT_NAME_TO_NUMBER
+    ],
+    orgPersonInfo: {
+      orgPersonLabel: 'Applicant',
+      orgTypesLabel: 'Business or Corporation',
+      subtitle: null // not used
+    },
+    nameRequestTypes: [
+      NrRequestActionCodes.RESTORE
+    ]
+  },
+  certifyClause: 'Note: It is an offence to make or assist in making a false or misleading statement in a record ' +
+    'filed under the BC Corporations Act. ' +
+    'A person who commits this offence is subject to a maximum fine of $5000.',
+  certifyText: 'BC Corporations Act'
+}
diff --git a/src/resources/LimitedRestorationToFull/CBEN.ts b/src/resources/LimitedRestorationToFull/CBEN.ts
new file mode 100644
index 000000000..d33afafbf
--- /dev/null
+++ b/src/resources/LimitedRestorationToFull/CBEN.ts
@@ -0,0 +1,37 @@
+import { CorrectNameOptions, FilingCodes } from '@/enums/'
+import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const RestorationResourceCben: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: GetCorpFullDescription(CorpTypeCd.BEN_CONTINUE_IN),
+  addressLabel: 'Registered Office',
+  showEmailUnderName: false,
+  userEmailOptional: false,
+  userEmailLabel: 'Applicant',
+  filingData: {
+    entityType: CorpTypeCd.BEN_CONTINUE_IN,
+    filingTypeCode: FilingCodes.RESTORATION_LTD_TO_FULL,
+    priority: false
+  },
+  changeData: {
+    correctNameOptions: [
+      CorrectNameOptions.CORRECT_NEW_NR,
+      CorrectNameOptions.CORRECT_NAME_TO_NUMBER
+    ],
+    orgPersonInfo: {
+      orgPersonLabel: 'Applicant',
+      orgTypesLabel: 'Business or Corporation',
+      subtitle: null // not used
+    },
+    nameRequestTypes: [
+      NrRequestActionCodes.RESTORE
+    ]
+  },
+  certifyClause: 'Note: It is an offence to make or assist in making a false or misleading statement in a record ' +
+    'filed under the BC Corporations Act. ' +
+    'A person who commits this offence is subject to a maximum fine of $5000.',
+  certifyText: 'BC Corporations Act'
+}
diff --git a/src/resources/LimitedRestorationToFull/CC.ts b/src/resources/LimitedRestorationToFull/CC.ts
new file mode 100644
index 000000000..e9108912f
--- /dev/null
+++ b/src/resources/LimitedRestorationToFull/CC.ts
@@ -0,0 +1,37 @@
+import { CorrectNameOptions, FilingCodes } from '@/enums/'
+import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const RestorationResourceCc: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: GetCorpFullDescription(CorpTypeCd.BC_CCC),
+  addressLabel: 'Registered Office',
+  showEmailUnderName: false,
+  userEmailOptional: false,
+  userEmailLabel: 'Applicant',
+  filingData: {
+    entityType: CorpTypeCd.BC_CCC,
+    filingTypeCode: FilingCodes.RESTORATION_LTD_TO_FULL,
+    priority: false
+  },
+  changeData: {
+    correctNameOptions: [
+      CorrectNameOptions.CORRECT_NEW_NR,
+      CorrectNameOptions.CORRECT_NAME_TO_NUMBER
+    ],
+    orgPersonInfo: {
+      orgPersonLabel: 'Applicant',
+      orgTypesLabel: 'Business or Corporation',
+      subtitle: null // not used
+    },
+    nameRequestTypes: [
+      NrRequestActionCodes.RESTORE
+    ]
+  },
+  certifyClause: 'Note: It is an offence to make or assist in making a false or misleading statement in a record ' +
+    'filed under the BC Corporations Act. ' +
+    'A person who commits this offence is subject to a maximum fine of $5000.',
+  certifyText: 'BC Corporations Act'
+}
diff --git a/src/resources/LimitedRestorationToFull/CCC.ts b/src/resources/LimitedRestorationToFull/CCC.ts
index b7d648250..87cf4f28b 100644
--- a/src/resources/LimitedRestorationToFull/CCC.ts
+++ b/src/resources/LimitedRestorationToFull/CCC.ts
@@ -3,16 +3,16 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const CccRestorationResource: ResourceIF = {
+export const RestorationResourceCcc: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
-  displayName: GetCorpFullDescription(CorpTypeCd.BC_CCC),
+  displayName: GetCorpFullDescription(CorpTypeCd.CCC_CONTINUE_IN),
   addressLabel: 'Registered Office',
   showEmailUnderName: false,
   userEmailOptional: false,
   userEmailLabel: 'Applicant',
   filingData: {
-    entityType: CorpTypeCd.BC_CCC,
+    entityType: CorpTypeCd.CCC_CONTINUE_IN,
     filingTypeCode: FilingCodes.RESTORATION_LTD_TO_FULL,
     priority: false
   },
diff --git a/src/resources/LimitedRestorationToFull/CUL.ts b/src/resources/LimitedRestorationToFull/CUL.ts
new file mode 100644
index 000000000..ffa029bcb
--- /dev/null
+++ b/src/resources/LimitedRestorationToFull/CUL.ts
@@ -0,0 +1,37 @@
+import { CorrectNameOptions, FilingCodes } from '@/enums/'
+import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { ResourceIF } from '@/interfaces/'
+
+export const RestorationResourceCul: ResourceIF = {
+  entityReference: 'Company',
+  contactLabel: 'Registered Office',
+  displayName: GetCorpFullDescription(CorpTypeCd.ULC_CONTINUE_IN),
+  addressLabel: 'Registered Office',
+  showEmailUnderName: false,
+  userEmailOptional: false,
+  userEmailLabel: 'Applicant',
+  filingData: {
+    entityType: CorpTypeCd.ULC_CONTINUE_IN,
+    filingTypeCode: FilingCodes.RESTORATION_LTD_TO_FULL,
+    priority: false
+  },
+  changeData: {
+    correctNameOptions: [
+      CorrectNameOptions.CORRECT_NEW_NR,
+      CorrectNameOptions.CORRECT_NAME_TO_NUMBER
+    ],
+    orgPersonInfo: {
+      orgPersonLabel: 'Applicant',
+      orgTypesLabel: 'Business or Corporation',
+      subtitle: null // not used
+    },
+    nameRequestTypes: [
+      NrRequestActionCodes.RESTORE
+    ]
+  },
+  certifyClause: 'Note: It is an offence to make or assist in making a false or misleading statement in a record ' +
+    'filed under the BC Corporations Act. ' +
+    'A person who commits this offence is subject to a maximum fine of $5000.',
+  certifyText: 'BC Corporations Act'
+}
diff --git a/src/resources/LimitedRestorationToFull/ULC.ts b/src/resources/LimitedRestorationToFull/ULC.ts
index 606a5bee9..2f57b02bb 100644
--- a/src/resources/LimitedRestorationToFull/ULC.ts
+++ b/src/resources/LimitedRestorationToFull/ULC.ts
@@ -3,7 +3,7 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const UlcRestorationResource: ResourceIF = {
+export const RestorationResourceUlc: ResourceIF = {
   entityReference: 'Company',
   contactLabel: 'Registered Office',
   displayName: GetCorpFullDescription(CorpTypeCd.BC_ULC_COMPANY),
diff --git a/src/resources/LimitedRestorationToFull/index.ts b/src/resources/LimitedRestorationToFull/index.ts
index af281564f..607278f2b 100644
--- a/src/resources/LimitedRestorationToFull/index.ts
+++ b/src/resources/LimitedRestorationToFull/index.ts
@@ -1,4 +1,8 @@
 export * from './BC'
 export * from './BEN'
+export * from './C'
+export * from './CBEN'
+export * from './CC'
 export * from './CCC'
+export * from './CUL'
 export * from './ULC'
diff --git a/src/resources/SpecialResolution/CP.ts b/src/resources/SpecialResolution/CP.ts
index 8b7287fcd..d63b01c85 100644
--- a/src/resources/SpecialResolution/CP.ts
+++ b/src/resources/SpecialResolution/CP.ts
@@ -3,7 +3,7 @@ import { NrRequestActionCodes } from '@bcrs-shared-components/enums'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceIF } from '@/interfaces/'
 
-export const CpSpecialResolutionResource: ResourceIF = {
+export const SpecialResolutionResourceCp: ResourceIF = {
   entityReference: 'Business',
   contactLabel: 'Registered Office',
   displayName: GetCorpFullDescription(CorpTypeCd.COOP),
diff --git a/src/store/store.ts b/src/store/store.ts
index 5f49a3271..98dfae6d2 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -113,27 +113,27 @@ export const useStore = defineStore('store', {
 
     /** Whether the current filing is a Change of Registration for a firm corp class. */
     isFirmChangeFiling (): boolean {
-      return (this.isFirm && this.isChangeRegFiling)
+      return (this.isEntityFirm && this.isChangeRegFiling)
     },
 
-    /** Whether the current filing is a Correction for a BEN/BC/CCC/ULC. */
-    isBenBcCccUlcCorrectionFiling (): boolean {
-      return (this.isBenBcCccUlc && this.isCorrectionFiling)
+    /** Whether the current filing is a Correction for a base company. */
+    isBaseCorrectionFiling (): boolean {
+      return (this.isBaseCompany && this.isCorrectionFiling)
     },
 
     /* Whether the current filing is a Correction for a cooperative. */
     isCoopCorrectionFiling (): boolean {
-      return (this.isCoop && this.isCorrectionFiling)
+      return (this.isEntityCoop && this.isCorrectionFiling)
     },
 
-    /** Whether the current filing is a Correction for a firm corp class. */
+    /** Whether the current filing is a Correction for a firm. */
     isFirmCorrectionFiling (): boolean {
-      return (this.isFirm && this.isCorrectionFiling)
+      return (this.isEntityFirm && this.isCorrectionFiling)
     },
 
-    /** Whether the current filing is a Conversion for a firm corp class. */
+    /** Whether the current filing is a Conversion for a firm. */
     isFirmConversionFiling (): boolean {
-      return (this.isFirm && this.isConversionFiling)
+      return (this.isEntityFirm && this.isConversionFiling)
     },
 
     /** Whether the corrected filing is an Incorporation Application. */
@@ -166,81 +166,83 @@ export const useStore = defineStore('store', {
       return this.getOriginalBusinessInfo?.nrNumber || ''
     },
 
-    // Original entity type getters
-    isOriginBcCompany (): boolean {
-      return (this.getOriginalLegalType === CorpTypeCd.BC_COMPANY)
-    },
-
-    isOriginBenefitCompany (): boolean {
-      return (this.getOriginalLegalType === CorpTypeCd.BENEFIT_COMPANY)
-    },
-
-    isOriginBcUlcCompany (): boolean {
-      return (this.getOriginalLegalType === CorpTypeCd.BC_ULC_COMPANY)
-    },
-
-    isOriginBcCcc (): boolean {
-      return (this.getOriginalLegalType === CorpTypeCd.BC_CCC)
-    },
-
     /** The entity type. */
     getEntityType (): CorpTypeCd {
       return this.stateModel.tombstone.entityType
     },
 
     /** Whether the entity is a Benefit Company. */
-    isBenefitCompany (): boolean {
+    isEntityBenefitCompany (): boolean {
       return (this.getEntityType === CorpTypeCd.BENEFIT_COMPANY)
     },
 
-    /** Whether the entity is a BC Corporation. */
-    isBcCorporation (): boolean {
-      return (this.getEntityType === CorpTypeCd.BC_CORPORATION)
-    },
-
-    /** Whether the entity is a Cooperative. */
-    isCoop (): boolean {
+    /** Whether the entity is a Cooperative Assocation. */
+    isEntityCoop (): boolean {
       return (this.getEntityType === CorpTypeCd.COOP)
     },
 
-    /** Whether the entity is a BC Company. */
-    isBcCompany (): boolean {
+    /** Whether the entity is a BC (Limited) Company. */
+    isEntityBcCompany (): boolean {
       return (this.getEntityType === CorpTypeCd.BC_COMPANY)
     },
 
-    /** Whether the entity is a Community Contribution Company. */
-    isBcCcc (): boolean {
+    /** Whether the entity is a BC Community Contribution Company. */
+    isEntityBcCcc (): boolean {
       return (this.getEntityType === CorpTypeCd.BC_CCC)
     },
 
-    /** Whether the entity is an Unlimited Liability Company. */
-    isBcUlcCompany (): boolean {
+    /** Whether the entity is a BC Unlimited Liability Company. */
+    isEntityBcUlcCompany (): boolean {
       return (this.getEntityType === CorpTypeCd.BC_ULC_COMPANY)
     },
 
     /** Whether the entity is a Sole Proprietorship. */
-    isSoleProp (): boolean {
+    isEntitySoleProp (): boolean {
       return (this.getEntityType === CorpTypeCd.SOLE_PROP)
     },
 
     /** Whether the entity is a General Partnership. */
-    isPartnership (): boolean {
+    isEntityPartnership (): boolean {
       return (this.getEntityType === CorpTypeCd.PARTNERSHIP)
     },
 
-    /** Whether the entity is a BEN/BC/CCC/ULC. */
-    isBenBcCccUlc (): boolean {
+    /** Whether the entity is a Continued In BC Limited Company. */
+    isEntityContinueIn (): boolean {
+      return (this.getEntityType === CorpTypeCd.CONTINUE_IN)
+    },
+
+    /** Whether the entity is a Continued In Benefit Company. */
+    isEntityBenContinueIn (): boolean {
+      return (this.getEntityType === CorpTypeCd.BEN_CONTINUE_IN)
+    },
+
+    /** Whether the entity is a Continued In Community Contribution Company. */
+    isEntityCccContinueIn (): boolean {
+      return (this.getEntityType === CorpTypeCd.CCC_CONTINUE_IN)
+    },
+
+    /** Whether the entity is a Continued In Unlimited Liability Company. */
+    isEntityUlcContinueIn (): boolean {
+      return (this.getEntityType === CorpTypeCd.ULC_CONTINUE_IN)
+    },
+
+    /** Whether the entity is a base company (BC/BEN/CC/ULC or C/CBEN/CCC/CUL). */
+    isBaseCompany (): boolean {
       return (
-        this.isBcCompany ||
-        this.isBenefitCompany ||
-        this.isBcCcc ||
-        this.isBcUlcCompany
+        this.isEntityBcCompany ||
+        this.isEntityBenefitCompany ||
+        this.isEntityBcCcc ||
+        this.isEntityBcUlcCompany ||
+        this.isEntityContinueIn ||
+        this.isEntityBenContinueIn ||
+        this.isEntityCccContinueIn ||
+        this.isEntityUlcContinueIn
       )
     },
 
-    /** Whether the entity is a GP/SP. */
-    isFirm (): boolean {
-      return (this.isPartnership || this.isSoleProp)
+    /** Whether the entity is a Sole Proprietorship or General Partnership. */
+    isEntityFirm (): boolean {
+      return (this.isEntityPartnership || this.isEntitySoleProp)
     },
 
     /** Whether the current account is a premium account. */
@@ -321,7 +323,7 @@ export const useStore = defineStore('store', {
     /** The original legal name (or alternate name if this is a firm). */
     getOriginalLegalName (): string {
       if (!GetFeatureFlag('enable-legal-name-fix')) return this.getOriginalBusinessInfo?.legalName
-      if (this.isFirm) {
+      if (this.isEntityFirm) {
         // return the alternate name, if it exists
         const alternateNames = this.getOriginalBusinessInfo?.alternateNames || []
         const alternateName = alternateNames.find(x => x.identifier === this.getBusinessId)
@@ -565,7 +567,7 @@ export const useStore = defineStore('store', {
      * - staff payment
      */
     hasCorrectionDataChanged (): boolean {
-      if (this.isBenBcCccUlcCorrectionFiling) {
+      if (this.isBaseCorrectionFiling) {
         return (
           this.hasBusinessNameChanged ||
           this.hasBusinessTypeChanged ||
@@ -701,7 +703,7 @@ export const useStore = defineStore('store', {
 
     /** Whether the subject correction filing is valid. */
     isCorrectionValid (): boolean {
-      if (this.isBenBcCccUlcCorrectionFiling) {
+      if (this.isBaseCorrectionFiling) {
         if (this.isClientErrorCorrection) {
           return (
             this.getFlagsCompanyInfo.isValidCompanyName &&
@@ -950,7 +952,7 @@ export const useStore = defineStore('store', {
     hasMailingChanged (): boolean {
       if (
         this.isAlterationFiling ||
-        this.isBenBcCccUlcCorrectionFiling ||
+        this.isBaseCorrectionFiling ||
         this.isRestorationFiling
       ) {
         return !IsSame(
@@ -986,7 +988,7 @@ export const useStore = defineStore('store', {
     hasDeliveryChanged (): boolean {
       if (
         this.isAlterationFiling ||
-        this.isBenBcCccUlcCorrectionFiling ||
+        this.isBaseCorrectionFiling ||
         this.isRestorationFiling
       ) {
         return !IsSame(
diff --git a/src/utils/resource-utils.ts b/src/utils/resource-utils.ts
index cc8f6192d..e1dc6edba 100644
--- a/src/utils/resource-utils.ts
+++ b/src/utils/resource-utils.ts
@@ -1,17 +1,17 @@
 import {
-  BcAlterationResource,
-  BenAlterationResource,
-  CccAlterationResource,
-  UlcAlterationResource
+  AlterationResourceBc,
+  AlterationResourceBen,
+  AlterationResourceCc,
+  AlterationResourceUlc
 } from '@/resources/Alteration'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
 export class ResourceUtilities {
     private static entityTypeToResourceMap = {
-      [CorpTypeCd.BC_COMPANY]: BcAlterationResource,
-      [CorpTypeCd.BENEFIT_COMPANY]: BenAlterationResource,
-      [CorpTypeCd.BC_CCC]: CccAlterationResource,
-      [CorpTypeCd.BC_ULC_COMPANY]: UlcAlterationResource
+      [CorpTypeCd.BC_COMPANY]: AlterationResourceBc,
+      [CorpTypeCd.BENEFIT_COMPANY]: AlterationResourceBen,
+      [CorpTypeCd.BC_CCC]: AlterationResourceCc,
+      [CorpTypeCd.BC_ULC_COMPANY]: AlterationResourceUlc
     }
 
     /**
diff --git a/src/views/Alteration.vue b/src/views/Alteration.vue
index f520e75ed..0202dc1c1 100644
--- a/src/views/Alteration.vue
+++ b/src/views/Alteration.vue
@@ -135,11 +135,9 @@ import { NameTranslation } from '@/components/common/YourCompany/NameTranslation
 import { AuthServices, LegalServices } from '@/services/'
 import { CommonMixin, FeeMixin, FilingTemplateMixin } from '@/mixins/'
 import { EntitySnapshotIF, ResourceIF } from '@/interfaces/'
-import { FilingDataIF } from '@bcrs-shared-components/interfaces/'
 import { FilingStatus } from '@/enums/'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
-import { BcAlterationResource, BenAlterationResource, CccAlterationResource, UlcAlterationResource }
-  from '@/resources/Alteration/'
+import * as Resources from '@/resources/Alteration/'
 import ViewWrapper from '@/components/ViewWrapper.vue'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { useStore } from '@/store/store'
@@ -167,20 +165,18 @@ import { useStore } from '@/store/store'
   }
 })
 export default class Alteration extends Mixins(CommonMixin, FeeMixin, FilingTemplateMixin) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getAppValidate!: boolean
+  // @Getter(useStore) getEntityType!: CorpTypeCd
   @Getter(useStore) getUserFirstName!: string
   @Getter(useStore) getUserLastName!: string
-  @Getter(useStore) isOriginBcCompany!: boolean
-  @Getter(useStore) isOriginBenefitCompany!: boolean
-  @Getter(useStore) isOriginBcCcc!: boolean
-  @Getter(useStore) isOriginBcUlcCompany!: boolean
+  // @Getter(useStore) getOriginalLegalType!: CorpTypeCd
   @Getter(useStore) isPremiumAccount!: boolean
   @Getter(useStore) isRoleStaff!: boolean
   @Getter(useStore) isSummaryMode!: boolean
   @Getter(useStore) showFeeSummary!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
   @Action(useStore) setFilingId!: (x: number) => void
   @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
@@ -206,34 +202,40 @@ export default class Alteration extends Mixins(CommonMixin, FeeMixin, FilingTemp
 
   /** The resource object for an alteration filing. */
   get alterationResource (): ResourceIF {
-    switch (true) {
-      case this.isOriginBcCompany: return BcAlterationResource
-      case this.isOriginBenefitCompany: return BenAlterationResource
-      case this.isOriginBcCcc: return CccAlterationResource
-      case this.isOriginBcUlcCompany: return UlcAlterationResource
+    switch (this.getOriginalLegalType) {
+      case CorpTypeCd.BC_CCC: return Resources.AlterationResourceCc
+      case CorpTypeCd.BC_COMPANY: return Resources.AlterationResourceBc
+      case CorpTypeCd.BC_ULC_COMPANY: return Resources.AlterationResourceUlc
+      case CorpTypeCd.BEN_CONTINUE_IN: return Resources.AlterationResourceCben
+      case CorpTypeCd.BENEFIT_COMPANY: return Resources.AlterationResourceBen
+      case CorpTypeCd.CCC_CONTINUE_IN: return Resources.AlterationResourceCcc
+      case CorpTypeCd.CONTINUE_IN: return Resources.AlterationResourceC
+      case CorpTypeCd.ULC_CONTINUE_IN: return Resources.AlterationResourceCul
+      default: return null // should never happen
     }
-    return null
   }
 
   @Watch('hasBusinessTypeChanged')
   onBusinessTypeChanged () {
     const filingData = this.getFilingData
-    // When we are converting from BC to ULC, it's $1000 not $100.
+    // when altering from BC (or C) to ULC, use specific filing data
     if (
-      this.getOriginalLegalType === CorpTypeCd.BC_COMPANY &&
+      (
+        this.getOriginalLegalType === CorpTypeCd.BC_COMPANY ||
+        this.getOriginalLegalType === CorpTypeCd.CONTINUE_IN
+      ) &&
       this.getEntityType === CorpTypeCd.BC_ULC_COMPANY
     ) {
       this.setFilingData([{
-        filingTypeCode: BcAlterationResource.additionalFilingData.filingTypeCode,
-        entityType: BcAlterationResource.additionalFilingData.entityType as any,
+        filingTypeCode: Resources.AlterationResourceBc.additionalFilingData.filingTypeCode,
+        entityType: Resources.AlterationResourceBc.additionalFilingData.entityType as any,
         priority: filingData[0].priority,
         futureEffective: filingData[0].futureEffective
       }])
     } else {
-      const resourceFilingData = this.alterationResource.filingData as unknown as FilingDataIF
       this.setFilingData([{
-        filingTypeCode: resourceFilingData.filingTypeCode,
-        entityType: resourceFilingData.entityType as any,
+        filingTypeCode: this.alterationResource.filingData.filingTypeCode,
+        entityType: this.alterationResource.filingData.entityType as any,
         priority: filingData[0].priority,
         futureEffective: filingData[0].futureEffective
       }])
@@ -255,13 +257,17 @@ export default class Alteration extends Mixins(CommonMixin, FeeMixin, FilingTemp
       const entitySnapshot = await this.fetchEntitySnapshot()
 
       switch (entitySnapshot?.businessInfo?.legalType) {
-        case CorpTypeCd.BC_COMPANY:
-        case CorpTypeCd.BENEFIT_COMPANY:
         case CorpTypeCd.BC_CCC:
+        case CorpTypeCd.BC_COMPANY:
         case CorpTypeCd.BC_ULC_COMPANY:
+        case CorpTypeCd.BEN_CONTINUE_IN:
+        case CorpTypeCd.BENEFIT_COMPANY:
+        case CorpTypeCd.CCC_CONTINUE_IN:
+        case CorpTypeCd.CONTINUE_IN:
+        case CorpTypeCd.ULC_CONTINUE_IN:
           break // acceptable types
         default:
-          throw new Error(`Invalid entity type, alterations are for corporations (BC/BEN/CCC/ULC) only`)
+          throw new Error('Invalid entity type, alterations are for corporations (BC/BEN/CCC/ULC) only')
       }
 
       if (this.alterationId) {
@@ -296,9 +302,9 @@ export default class Alteration extends Mixins(CommonMixin, FeeMixin, FilingTemp
       this.setResource(this.alterationResource)
 
       // initialize Fee Summary data
-      const filingData = [this.alterationResource.filingData as unknown as FilingDataIF]
+      const filingData = [this.alterationResource.filingData]
       filingData.forEach(fd => {
-        (fd as FilingDataIF).futureEffective = this.getEffectiveDateTime.isFutureEffective
+        fd.futureEffective = this.getEffectiveDateTime.isFutureEffective
       })
       this.setFilingData(filingData)
 
diff --git a/src/views/Change.vue b/src/views/Change.vue
index 0b8457940..edfa50c52 100644
--- a/src/views/Change.vue
+++ b/src/views/Change.vue
@@ -109,7 +109,7 @@ import { CommonMixin, FeeMixin, FilingTemplateMixin } from '@/mixins/'
 import { EntitySnapshotIF, ResourceIF } from '@/interfaces/'
 import { FilingStatus, PartyTypes } from '@/enums/'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
-import { SpChangeResource, GpChangeResource, SpOrganizationChangeResource } from '@/resources/Change/'
+import { ChangeResourceSp, ChangeResourceGp, ChangeResourceSpOrganization } from '@/resources/Change/'
 import ViewWrapper from '@/components/ViewWrapper.vue'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { useStore } from '@/store/store'
@@ -135,19 +135,19 @@ import { useStore } from '@/store/store'
   }
 })
 export default class Change extends Mixins(CommonMixin, FeeMixin, FilingTemplateMixin) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getAppValidate!: boolean
   @Getter(useStore) getUserFirstName!: string
   @Getter(useStore) getUserLastName!: string
-  @Getter(useStore) isPartnership!: boolean
+  @Getter(useStore) isEntityPartnership!: boolean
+  @Getter(useStore) isEntitySoleProp!: boolean
   @Getter(useStore) isPremiumAccount!: boolean
   @Getter(useStore) isRoleStaff!: boolean
   @Getter(useStore) isSbcStaff!: boolean
-  @Getter(useStore) isSoleProp!: boolean
   @Getter(useStore) isSummaryMode!: boolean
   @Getter(useStore) showFeeSummary!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
   @Action(useStore) setFilingId!: (x: number) => void
   @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
@@ -174,9 +174,9 @@ export default class Change extends Mixins(CommonMixin, FeeMixin, FilingTemplate
   /** The resource object for a firm change filing. */
   get firmChangeResource (): ResourceIF {
     const isOfficerOrganization = this.getOrgPeople[0]?.officer?.partyType === PartyTypes.ORGANIZATION
-    if (this.isPartnership) return GpChangeResource
-    if (this.isSoleProp && isOfficerOrganization) return SpOrganizationChangeResource
-    if (this.isSoleProp) return SpChangeResource
+    if (this.isEntityPartnership) return ChangeResourceGp
+    if (this.isEntitySoleProp && isOfficerOrganization) return ChangeResourceSpOrganization
+    if (this.isEntitySoleProp) return ChangeResourceSp
     return null
   }
 
diff --git a/src/views/Conversion.vue b/src/views/Conversion.vue
index a70dd457d..a2fd5f291 100644
--- a/src/views/Conversion.vue
+++ b/src/views/Conversion.vue
@@ -72,7 +72,7 @@ import { CommonMixin, FeeMixin, FilingTemplateMixin } from '@/mixins/'
 import { EntitySnapshotIF, ResourceIF } from '@/interfaces/'
 import { FilingStatus } from '@/enums/'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
-import { SpConversionResource, GpConversionResource } from '@/resources/Conversion/'
+import { ConversionResourceSp, ConversionResourceGp } from '@/resources/Conversion/'
 import { StatusCodes } from 'http-status-codes'
 import ViewWrapper from '@/components/ViewWrapper.vue'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
@@ -94,15 +94,15 @@ import { useStore } from '@/store/store'
   }
 })
 export default class Conversion extends Mixins(CommonMixin, FeeMixin, FilingTemplateMixin) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getAppValidate!: boolean
-  @Getter(useStore) isPartnership!: boolean
+  @Getter(useStore) isEntityPartnership!: boolean
+  @Getter(useStore) isEntitySoleProp!: boolean
   @Getter(useStore) isRoleStaff!: boolean
-  @Getter(useStore) isSoleProp!: boolean
   @Getter(useStore) isSummaryMode!: boolean
   @Getter(useStore) showFeeSummary!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setCertifyStateValidity!: (x: boolean) => void
   @Action(useStore) setFilingId!: (x: number) => void
   @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
@@ -123,8 +123,8 @@ export default class Conversion extends Mixins(CommonMixin, FeeMixin, FilingTemp
 
   /** The resource object for a firm conversion filing. */
   get firmConversionResource (): ResourceIF {
-    if (this.isPartnership) return GpConversionResource
-    if (this.isSoleProp) return SpConversionResource
+    if (this.isEntityPartnership) return ConversionResourceGp
+    if (this.isEntitySoleProp) return ConversionResourceSp
     return null
   }
 
diff --git a/src/views/Correction.vue b/src/views/Correction.vue
index 652c6bdd8..84bdb0e29 100644
--- a/src/views/Correction.vue
+++ b/src/views/Correction.vue
@@ -37,15 +37,15 @@ export default class Correction extends Mixins(CommonMixin) {
   /** Whether App is ready. */
   @Prop({ default: false }) readonly appReady!: boolean
 
-  // Global getters
+  // Store getters
   @Getter(useStore) getBusinessId!: string
   @Getter(useStore) getEntityType!: CorpTypeCd
+  @Getter(useStore) isBaseCompany!: boolean
+  @Getter(useStore) isEntityCoop!: boolean
+  @Getter(useStore) isEntityFirm!: boolean
   @Getter(useStore) isRoleStaff!: boolean
-  @Getter(useStore) isBenBcCccUlc!: boolean
-  @Getter(useStore) isCoop!: boolean
-  @Getter(useStore) isFirm!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setFilingId!: (x: number) => void
   @Action(useStore) setEntityType!: (x: CorpTypeCd) => void
 
@@ -53,9 +53,9 @@ export default class Correction extends Mixins(CommonMixin) {
 
   /** The dynamic component to render. */
   get component (): string {
-    if (this.isCoop) return 'CoopCorrection'
-    if (this.isBenBcCccUlc) return 'CorpCorrection'
-    if (this.isFirm) return 'FirmCorrection'
+    if (this.isEntityCoop) return 'CoopCorrection'
+    if (this.isBaseCompany) return 'CorpCorrection'
+    if (this.isEntityFirm) return 'FirmCorrection'
     return null // should never happen
   }
 
@@ -116,9 +116,9 @@ export default class Correction extends Mixins(CommonMixin) {
       }
 
       // set entity type for misc functionality to work
-      // do not proceed if this isn't a BC/Firm/Coop correction
+      // do not proceed if this isn't a base company / firm / coop correction
       this.setEntityType(filing.business?.legalType || null)
-      if (!this.isBenBcCccUlc && !this.isFirm && !this.isCoop) {
+      if (!this.isBaseCompany && !this.isEntityFirm && !this.isEntityCoop) {
         throw new Error('Invalid correction type')
       }
 
diff --git a/src/views/Correction/CoopCorrection.vue b/src/views/Correction/CoopCorrection.vue
index cca477eb7..9b3ff7f1d 100644
--- a/src/views/Correction/CoopCorrection.vue
+++ b/src/views/Correction/CoopCorrection.vue
@@ -88,7 +88,7 @@ import Memorandum from '@/components/SpecialResolution/Memorandum.vue'
 import { Action, Getter } from 'pinia-class'
 import { useStore } from '@/store/store'
 import { CorrectionFilingIF, ResourceIF, EntitySnapshotIF } from '@/interfaces'
-import { CpCorrectionResource } from '@/resources/Correction'
+import { CorrectionResourceCp } from '@/resources/Correction'
 import { LegalServices, AuthServices } from '@/services'
 import { StaffPaymentOptions } from '@bcrs-shared-components/enums'
 import { CorrectionErrorTypes } from '@/enums'
@@ -120,12 +120,10 @@ import { CorrectionErrorTypes } from '@/enums'
   }
 })
 export default class CoopCorrection extends Mixins(CommonMixin, DateMixin, FeeMixin, FilingTemplateMixin) {
-  // Global getters
-  @Getter(useStore) isPartnership!: boolean
-  @Getter(useStore) isSoleProp!: boolean
+  // Store getters
   @Getter(useStore) hasResolutionSection!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
   @Action(useStore) setResource!: (x: ResourceIF) => void
 
@@ -141,7 +139,7 @@ export default class CoopCorrection extends Mixins(CommonMixin, DateMixin, FeeMi
 
   /** The resource object for a firm correction filing. */
   get correctionResource (): ResourceIF {
-    return CpCorrectionResource
+    return CorrectionResourceCp
   }
 
   /**
diff --git a/src/views/Correction/CorpCorrection.vue b/src/views/Correction/CorpCorrection.vue
index 4d6e24e99..6ee8366ca 100644
--- a/src/views/Correction/CorpCorrection.vue
+++ b/src/views/Correction/CorpCorrection.vue
@@ -73,7 +73,7 @@
 
 <script lang="ts">
 import { Component, Emit, Mixins, Prop, Watch } from 'vue-property-decorator'
-import { Action, Getter } from 'pinia-class'
+import { Action } from 'pinia-class'
 import { Articles } from '@/components/Alteration/'
 import { BusinessContactInfo, CertifySection, CompletingParty, Detail, EntityName, FolioInformation,
   NameTranslation, OfficeAddresses, PeopleAndRoles, RecognitionDateTime, ShareStructures, StaffPayment,
@@ -82,9 +82,9 @@ import { CommonMixin, DateMixin, FeeMixin, FilingTemplateMixin } from '@/mixins/
 import { AuthServices, LegalServices } from '@/services/'
 import { StaffPaymentOptions } from '@bcrs-shared-components/enums/'
 import { CorrectionFilingIF, EntitySnapshotIF, ResourceIF } from '@/interfaces/'
-import { BcCorrectionResource, BenCorrectionResource, CccCorrectionResource, UlcCorrectionResource }
-  from '@/resources/Correction/'
+import * as Resources from '@/resources/Correction/'
 import { useStore } from '@/store/store'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
 /** Correction sub-component for corp class "BC" entities. */
 @Component({
@@ -106,13 +106,10 @@ import { useStore } from '@/store/store'
   }
 })
 export default class CorpCorrection extends Mixins(CommonMixin, DateMixin, FeeMixin, FilingTemplateMixin) {
-  // Global getters
-  @Getter(useStore) isBcCcc!: boolean
-  @Getter(useStore) isBcCompany!: boolean
-  @Getter(useStore) isBcUlcCompany!: boolean
-  @Getter(useStore) isBenefitCompany!: boolean
+  // Store getters
+  // @Getter(useStore) getEntityType!: CorpTypeCd
 
-  // Global actions
+  // Store actions
   @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
   @Action(useStore) setResource!: (x: ResourceIF) => void
 
@@ -126,13 +123,17 @@ export default class CorpCorrection extends Mixins(CommonMixin, DateMixin, FeeMi
 
   /** The resource object for a correction filing. */
   get correctionResource (): ResourceIF {
-    switch (true) {
-      case this.isBcCompany: return BcCorrectionResource
-      case this.isBenefitCompany: return BenCorrectionResource
-      case this.isBcCcc: return CccCorrectionResource
-      case this.isBcUlcCompany: return UlcCorrectionResource
+    switch (this.getEntityType) {
+      case CorpTypeCd.BC_CCC: return Resources.CorrectionResourceCc
+      case CorpTypeCd.BC_COMPANY: return Resources.CorrectionResourceBc
+      case CorpTypeCd.BC_ULC_COMPANY: return Resources.CorrectionResourceUlc
+      case CorpTypeCd.BEN_CONTINUE_IN: return Resources.CorrectionResourceCben
+      case CorpTypeCd.BENEFIT_COMPANY: return Resources.CorrectionResourceBen
+      case CorpTypeCd.CCC_CONTINUE_IN: return Resources.CorrectionResourceCcc
+      case CorpTypeCd.CONTINUE_IN: return Resources.CorrectionResourceC
+      case CorpTypeCd.ULC_CONTINUE_IN: return Resources.CorrectionResourceCul
+      default: return null // should never happen
     }
-    return null // should never happen
   }
 
   /**
diff --git a/src/views/Correction/FirmCorrection.vue b/src/views/Correction/FirmCorrection.vue
index 7e8a454c7..b4e3f7622 100644
--- a/src/views/Correction/FirmCorrection.vue
+++ b/src/views/Correction/FirmCorrection.vue
@@ -58,7 +58,7 @@ import { CorrectionFilingIF, EntitySnapshotIF, ResourceIF }
   from '@/interfaces/'
 import { AuthServices, LegalServices } from '@/services/'
 import { StaffPaymentOptions } from '@bcrs-shared-components/enums/'
-import { GpCorrectionResource, SpCorrectionResource } from '@/resources/Correction/'
+import { CorrectionResourceGp, CorrectionResourceSp } from '@/resources/Correction/'
 import { useStore } from '@/store/store'
 
 /** Correction sub-component for corp class "Firm" entities. */
@@ -79,11 +79,11 @@ import { useStore } from '@/store/store'
   }
 })
 export default class FirmCorrection extends Mixins(CommonMixin, FeeMixin, FilingTemplateMixin) {
-  // Global getters
-  @Getter(useStore) isPartnership!: boolean
-  @Getter(useStore) isSoleProp!: boolean
+  // Store getters
+  @Getter(useStore) isEntityPartnership!: boolean
+  @Getter(useStore) isEntitySoleProp!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
   @Action(useStore) setResource!: (x: ResourceIF) => void
 
@@ -92,8 +92,8 @@ export default class FirmCorrection extends Mixins(CommonMixin, FeeMixin, Filing
 
   /** The resource object for a firm correction filing. */
   get correctionResource (): ResourceIF {
-    if (this.isPartnership) return GpCorrectionResource
-    if (this.isSoleProp) return SpCorrectionResource
+    if (this.isEntityPartnership) return CorrectionResourceGp
+    if (this.isEntitySoleProp) return CorrectionResourceSp
     return null // should never happen
   }
 
diff --git a/src/views/LimitedRestorationExtension.vue b/src/views/LimitedRestorationExtension.vue
index c0bf0cb95..238aac1b3 100644
--- a/src/views/LimitedRestorationExtension.vue
+++ b/src/views/LimitedRestorationExtension.vue
@@ -121,15 +121,14 @@ import { BusinessContactInfo, CertifySection, DocumentsDelivery, EntityName, Fol
   ListPeopleAndRoles, NameTranslation, OfficeAddresses, PeopleAndRoles, QuestionWrapper,
   RecognitionDateTime, StaffPayment, YourCompanyWrapper } from '@/components/common/'
 import { CommonMixin, FeeMixin, FilingTemplateMixin, OrgPersonMixin } from '@/mixins/'
-import { EntitySnapshotIF, OrgPersonIF, ResourceIF, RestorationFilingIF }
-  from '@/interfaces/'
+import { EntitySnapshotIF, OrgPersonIF, ResourceIF, RestorationFilingIF } from '@/interfaces/'
 import { FilingStatus, RoleTypes } from '@/enums/'
-import { BcRestorationResource, BenRestorationResource, CccRestorationResource, UlcRestorationResource }
-  from '@/resources/LimitedRestorationExtension/'
+import * as Resources from '@/resources/LimitedRestorationExtension/'
 import ExtendTimeLimit from '@/components/Restoration/ExtendTimeLimit.vue'
 import ViewWrapper from '@/components/ViewWrapper.vue'
 import { AuthServices, LegalServices } from '@/services'
 import { useStore } from '@/store/store'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
 @Component({
   components: {
@@ -158,18 +157,15 @@ export default class LimitedRestorationExtension extends Mixins(
   FilingTemplateMixin,
   OrgPersonMixin
 ) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getAppValidate!: boolean
+  // @Getter(useStore) getEntityType!: CorpTypeCd
   @Getter(useStore) getResource!: ResourceIF
-  @Getter(useStore) isBcCcc!: boolean
-  @Getter(useStore) isBcCompany!: boolean
-  @Getter(useStore) isBcUlcCompany!: boolean
-  @Getter(useStore) isBenefitCompany!: boolean
   @Getter(useStore) isRoleStaff!: boolean
   @Getter(useStore) isSummaryMode!: boolean
   @Getter(useStore) showFeeSummary!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
   @Action(useStore) setFilingId!: (x: number) => void
   @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
@@ -190,13 +186,17 @@ export default class LimitedRestorationExtension extends Mixins(
 
   /** The resource object for a restoration filing. */
   get restorationResource (): ResourceIF {
-    switch (true) {
-      case this.isBcCompany: return BcRestorationResource
-      case this.isBenefitCompany: return BenRestorationResource
-      case this.isBcCcc: return CccRestorationResource
-      case this.isBcUlcCompany: return UlcRestorationResource
+    switch (this.getEntityType) {
+      case CorpTypeCd.BC_CCC: return Resources.RestorationResourceCc
+      case CorpTypeCd.BC_COMPANY: return Resources.RestorationResourceBc
+      case CorpTypeCd.BC_ULC_COMPANY: return Resources.RestorationResourceUlc
+      case CorpTypeCd.BEN_CONTINUE_IN: return Resources.RestorationResourceCben
+      case CorpTypeCd.BENEFIT_COMPANY: return Resources.RestorationResourceBen
+      case CorpTypeCd.CCC_CONTINUE_IN: return Resources.RestorationResourceCcc
+      case CorpTypeCd.CONTINUE_IN: return Resources.RestorationResourceC
+      case CorpTypeCd.ULC_CONTINUE_IN: return Resources.RestorationResourceCul
+      default: return null // should never happen
     }
-    return null // should never happen
   }
 
   /** Called when App is ready and this component can load its data. */
diff --git a/src/views/LimitedRestorationToFull.vue b/src/views/LimitedRestorationToFull.vue
index d48890635..d96bc38ac 100644
--- a/src/views/LimitedRestorationToFull.vue
+++ b/src/views/LimitedRestorationToFull.vue
@@ -143,21 +143,15 @@ import { BusinessContactInfo, CertifySection, CourtOrderPoa, DocumentsDelivery,
   QuestionWrapper, RecognitionDateTime, StaffPayment, YourCompanyWrapper } from '@/components/common/'
 import { AuthServices, LegalServices } from '@/services/'
 import { CommonMixin, FeeMixin, FilingTemplateMixin, OrgPersonMixin } from '@/mixins/'
-import {
-  ActionKvIF,
-  EntitySnapshotIF,
-  OrgPersonIF,
-  ResourceIF,
-  RestorationFilingIF
-} from '@/interfaces/'
-import { BcRestorationResource, BenRestorationResource, CccRestorationResource, UlcRestorationResource }
-  from '@/resources/LimitedRestorationToFull/'
+import { ActionKvIF, EntitySnapshotIF, OrgPersonIF, ResourceIF, RestorationFilingIF } from '@/interfaces/'
+import * as Resources from '@/resources/LimitedRestorationToFull/'
 import { ApprovalTypes, FilingStatus, RoleTypes } from '@/enums/'
 import { RelationshipTypes } from '@bcrs-shared-components/enums'
 import { RelationshipsPanel } from '@bcrs-shared-components/relationships-panel'
 import { ApprovalType } from '@bcrs-shared-components/approval-type'
 import ViewWrapper from '@/components/ViewWrapper.vue'
 import { useStore } from '@/store/store'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
 @Component({
   components: {
@@ -188,22 +182,19 @@ export default class LimitedRestorationToFull extends Mixins(
   FilingTemplateMixin,
   OrgPersonMixin
 ) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getAppValidate!: boolean
   @Getter(useStore) getApprovalTypeValid!: boolean
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) getCourtOrderNumberText!: string
+  // @Getter(useStore) getEntityType!: CorpTypeCd
   @Getter(useStore) getRelationships!: RelationshipTypes[]
   @Getter(useStore) getResource!: ResourceIF
-  @Getter(useStore) isBcCcc!: boolean
-  @Getter(useStore) isBcCompany!: boolean
-  @Getter(useStore) isBcUlcCompany!: boolean
-  @Getter(useStore) isBenefitCompany!: boolean
   @Getter(useStore) isRoleStaff!: boolean
   @Getter(useStore) isSummaryMode!: boolean
   @Getter(useStore) showFeeSummary!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
   @Action(useStore) setFilingId!: (x: number) => void
   @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
@@ -225,13 +216,17 @@ export default class LimitedRestorationToFull extends Mixins(
 
   /** The resource object for a restoration filing. */
   get restorationResource (): ResourceIF {
-    switch (true) {
-      case this.isBcCompany: return BcRestorationResource
-      case this.isBenefitCompany: return BenRestorationResource
-      case this.isBcCcc: return CccRestorationResource
-      case this.isBcUlcCompany: return UlcRestorationResource
+    switch (this.getEntityType) {
+      case CorpTypeCd.BC_CCC: return Resources.RestorationResourceCc
+      case CorpTypeCd.BC_COMPANY: return Resources.RestorationResourceBc
+      case CorpTypeCd.BC_ULC_COMPANY: return Resources.RestorationResourceUlc
+      case CorpTypeCd.BEN_CONTINUE_IN: return Resources.RestorationResourceCben
+      case CorpTypeCd.BENEFIT_COMPANY: return Resources.RestorationResourceBen
+      case CorpTypeCd.CCC_CONTINUE_IN: return Resources.RestorationResourceCcc
+      case CorpTypeCd.CONTINUE_IN: return Resources.RestorationResourceC
+      case CorpTypeCd.ULC_CONTINUE_IN: return Resources.RestorationResourceCul
+      default: return null // should never happen
     }
-    return null // should never happen
   }
 
   /** Called when App is ready and this component can load its data. */
diff --git a/src/views/SpecialResolution.vue b/src/views/SpecialResolution.vue
index 4c416c3f8..30157a399 100644
--- a/src/views/SpecialResolution.vue
+++ b/src/views/SpecialResolution.vue
@@ -150,7 +150,7 @@ import { CommonMixin, FeeMixin, FilingTemplateMixin } from '@/mixins/'
 import { EntitySnapshotIF, FilingDataIF, ResourceIF } from '@/interfaces/'
 import { FilingStatus } from '@/enums/'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
-import { CpSpecialResolutionResource } from '@/resources/SpecialResolution/'
+import { SpecialResolutionResourceCp } from '@/resources/SpecialResolution/'
 import ViewWrapper from '@/components/ViewWrapper.vue'
 import { useStore } from '@/store/store'
 import Rules from '@/components/SpecialResolution/Rules.vue'
@@ -179,17 +179,17 @@ import Memorandum from '@/components/SpecialResolution/Memorandum.vue'
   }
 })
 export default class SpecialResolution extends Mixins(CommonMixin, FeeMixin, FilingTemplateMixin) {
-  // Global getters
+  // Store getters
   @Getter(useStore) getAppValidate!: boolean
   @Getter(useStore) getUserFirstName!: string
   @Getter(useStore) getUserLastName!: string
-  @Getter(useStore) isCoop!: boolean
+  @Getter(useStore) isEntityCoop!: boolean
   @Getter(useStore) isPremiumAccount!: boolean
   @Getter(useStore) isRoleStaff!: boolean
   @Getter(useStore) isSummaryMode!: boolean
   @Getter(useStore) showFeeSummary!: boolean
 
-  // Global actions
+  // Store actions
   @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
   @Action(useStore) setFilingId!: (x: number) => void
   @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
@@ -217,7 +217,7 @@ export default class SpecialResolution extends Mixins(CommonMixin, FeeMixin, Fil
 
   /** The resource object for a special resolution filing. */
   get specialResolutionResource (): ResourceIF {
-    if (this.isCoop) return CpSpecialResolutionResource
+    if (this.isEntityCoop) return SpecialResolutionResourceCp
     return null
   }
 
diff --git a/tests/unit/AlterationSummary.spec.ts b/tests/unit/AlterationSummary.spec.ts
index 81e5599b8..8f4eb0742 100644
--- a/tests/unit/AlterationSummary.spec.ts
+++ b/tests/unit/AlterationSummary.spec.ts
@@ -3,7 +3,7 @@ import Vuetify from 'vuetify'
 import flushPromises from 'flush-promises'
 import sinon from 'sinon'
 import { createWrapper, mount } from '@vue/test-utils'
-import AlterationSummary from '@/components/Alteration/AlterationSummary.vue'
+import { AlterationSummary } from '@/components/Alteration'
 import { ConfirmDialog as ConfirmDialogShared } from '@bcrs-shared-components/confirm-dialog/'
 import EffectiveDateTime from '@/components/common/EffectiveDateTime.vue'
 import NameTranslation from '@/components/common/YourCompany/NameTranslations/NameTranslation.vue'
diff --git a/tests/unit/BcRegEntityDetails.spec.ts b/tests/unit/BcRegEntityDetails.spec.ts
index 87a457003..9f539d62f 100644
--- a/tests/unit/BcRegEntityDetails.spec.ts
+++ b/tests/unit/BcRegEntityDetails.spec.ts
@@ -19,7 +19,7 @@ describe('BC Reg Comments component', () => {
   const typeCommentTests: [Record<string, unknown>, string][] = [
     [{
       confirmArticles: false,
-      isBenefit: true,
+      isBenefitCompany: true,
       selectedEntityType: 'BEN'
     }, 'Benefit Company Articles'],
     [{
diff --git a/tests/unit/ChangeSummary.spec.ts b/tests/unit/ChangeSummary.spec.ts
index 83c9a3888..1a3c03e16 100644
--- a/tests/unit/ChangeSummary.spec.ts
+++ b/tests/unit/ChangeSummary.spec.ts
@@ -5,7 +5,7 @@ import { mount } from '@vue/test-utils'
 import ChangeSummary from '@/components/Change/ChangeSummary.vue'
 import NatureOfBusiness from '@/components/common/YourCompany/NatureOfBusiness.vue'
 import OfficeAddresses from '@/components/common/YourCompany/OfficeAddresses.vue'
-import { GpChangeResource } from '@/resources/Change/GP'
+import { ChangeResourceGp } from '@/resources/Change/GP'
 import { createPinia, setActivePinia } from 'pinia'
 import { useStore } from '@/store/store'
 import { FilingTypes } from '@/enums'
@@ -53,7 +53,7 @@ describe('Change Summary component', () => {
     store.stateModel.entitySnapshot = entitySnapshot
     store.stateModel.tombstone.filingType = FilingTypes.CHANGE_OF_REGISTRATION
     store.stateModel.businessInformation = { ...entitySnapshot.businessInfo }
-    store.resourceModel = GpChangeResource
+    store.resourceModel = ChangeResourceGp
   })
 
   beforeEach(() => {
diff --git a/tests/unit/ConversionSummary.spec.ts b/tests/unit/ConversionSummary.spec.ts
index 9ca2119f2..57d423ecb 100644
--- a/tests/unit/ConversionSummary.spec.ts
+++ b/tests/unit/ConversionSummary.spec.ts
@@ -5,7 +5,7 @@ import { mount } from '@vue/test-utils'
 import ConversionSummary from '@/components/Conversion/ConversionSummary.vue'
 import NatureOfBusiness from '@/components/common/YourCompany/NatureOfBusiness.vue'
 import OfficeAddresses from '@/components/common/YourCompany/OfficeAddresses.vue'
-import { GpChangeResource } from '@/resources/Change/GP'
+import { ConversionResourceGp } from '@/resources/Conversion/GP'
 import { createPinia, setActivePinia } from 'pinia'
 import { useStore } from '@/store/store'
 import { FilingTypes } from '@/enums'
@@ -54,7 +54,7 @@ describe('Conversion Summary component', () => {
     store.stateModel.entitySnapshot = entitySnapshot as any
     store.stateModel.tombstone.filingType = FilingTypes.CHANGE_OF_REGISTRATION
     store.stateModel.businessInformation = { ...entitySnapshot.businessInfo } as any
-    store.resourceModel = GpChangeResource
+    store.resourceModel = ConversionResourceGp
   })
 
   beforeEach(() => {
diff --git a/tests/unit/EntityName.spec.ts b/tests/unit/EntityName.spec.ts
index b1ce5b22c..889f59a65 100644
--- a/tests/unit/EntityName.spec.ts
+++ b/tests/unit/EntityName.spec.ts
@@ -3,25 +3,25 @@ import Vuetify from 'vuetify'
 import { mount, shallowMount } from '@vue/test-utils'
 import EntityName from '@/components/common/YourCompany/EntityName.vue'
 
-import { BcAlterationResource } from '@/resources/Alteration/BC'
-import { BenAlterationResource } from '@/resources/Alteration/BEN'
-import { CccAlterationResource } from '@/resources/Alteration/CCC'
-import { UlcAlterationResource } from '@/resources/Alteration/ULC'
+import { AlterationResourceBc } from '@/resources/Alteration/BC'
+import { AlterationResourceBen } from '@/resources/Alteration/BEN'
+import { AlterationResourceCc } from '@/resources/Alteration/CC'
+import { AlterationResourceUlc } from '@/resources/Alteration/ULC'
 
-import { GpChangeResource } from '@/resources/Change/GP'
-import { SpChangeResource } from '@/resources/Change/SP'
+import { ChangeResourceGp } from '@/resources/Change/GP'
+import { ChangeResourceSp } from '@/resources/Change/SP'
 
-import { GpConversionResource } from '@/resources/Conversion/GP'
-import { SpConversionResource } from '@/resources/Conversion/SP'
+import { ConversionResourceGp } from '@/resources/Conversion/GP'
+import { ConversionResourceSp } from '@/resources/Conversion/SP'
 
-import { BcCorrectionResource } from '@/resources/Correction/BC'
-import { BenCorrectionResource } from '@/resources/Correction/BEN'
-import { CccCorrectionResource } from '@/resources/Correction/CCC'
-import { GpCorrectionResource } from '@/resources/Correction/GP'
-import { SpCorrectionResource } from '@/resources/Correction/SP'
-import { UlcCorrectionResource } from '@/resources/Correction/ULC'
+import { CorrectionResourceBc } from '@/resources/Correction/BC'
+import { CorrectionResourceBen } from '@/resources/Correction/BEN'
+import { CorrectionResourceCc } from '@/resources/Correction/CC'
+import { CorrectionResourceGp } from '@/resources/Correction/GP'
+import { CorrectionResourceSp } from '@/resources/Correction/SP'
+import { CorrectionResourceUlc } from '@/resources/Correction/ULC'
 
-import { CpSpecialResolutionResource } from '@/resources/SpecialResolution/CP'
+import { SpecialResolutionResourceCp } from '@/resources/SpecialResolution/CP'
 
 import { createPinia, setActivePinia } from 'pinia'
 import { useStore } from '@/store/store'
@@ -38,14 +38,14 @@ const alterationTests = [
   {
     filingType: FilingTypes.ALTERATION,
     entityType: CorpTypeCd.BC_COMPANY,
-    resourceModel: BcAlterationResource,
+    resourceModel: AlterationResourceBc,
     isNumberedCompany: true,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   },
   {
     filingType: FilingTypes.ALTERATION,
     entityType: CorpTypeCd.BC_COMPANY,
-    resourceModel: BcAlterationResource,
+    resourceModel: AlterationResourceBc,
     isNumberedCompany: false,
     expectedOptions: [
       CorrectNameOptions.CORRECT_NEW_NR,
@@ -55,14 +55,14 @@ const alterationTests = [
   {
     filingType: FilingTypes.ALTERATION,
     entityType: CorpTypeCd.BENEFIT_COMPANY,
-    resourceModel: BenAlterationResource,
+    resourceModel: AlterationResourceBen,
     isNumberedCompany: true,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   },
   {
     filingType: FilingTypes.ALTERATION,
     entityType: CorpTypeCd.BENEFIT_COMPANY,
-    resourceModel: BenAlterationResource,
+    resourceModel: AlterationResourceBen,
     isNumberedCompany: false,
     expectedOptions: [
       CorrectNameOptions.CORRECT_NEW_NR,
@@ -72,14 +72,14 @@ const alterationTests = [
   {
     filingType: FilingTypes.ALTERATION,
     entityType: CorpTypeCd.BC_CCC,
-    resourceModel: CccAlterationResource,
+    resourceModel: AlterationResourceCc,
     isNumberedCompany: true,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   },
   {
     filingType: FilingTypes.ALTERATION,
     entityType: CorpTypeCd.BC_CCC,
-    resourceModel: CccAlterationResource,
+    resourceModel: AlterationResourceCc,
     isNumberedCompany: false,
     expectedOptions: [
       CorrectNameOptions.CORRECT_NEW_NR,
@@ -89,14 +89,14 @@ const alterationTests = [
   {
     filingType: FilingTypes.ALTERATION,
     entityType: CorpTypeCd.BC_ULC_COMPANY,
-    resourceModel: UlcAlterationResource,
+    resourceModel: AlterationResourceUlc,
     isNumberedCompany: true,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   },
   {
     filingType: FilingTypes.ALTERATION,
     entityType: CorpTypeCd.BC_ULC_COMPANY,
-    resourceModel: UlcAlterationResource,
+    resourceModel: AlterationResourceUlc,
     isNumberedCompany: false,
     expectedOptions: [
       CorrectNameOptions.CORRECT_NEW_NR,
@@ -109,14 +109,14 @@ const changeTests = [
   {
     filingType: FilingTypes.CHANGE_OF_REGISTRATION,
     entityType: CorpTypeCd.PARTNERSHIP,
-    resourceModel: GpChangeResource,
+    resourceModel: ChangeResourceGp,
     isNumberedCompany: null,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   },
   {
     filingType: FilingTypes.CHANGE_OF_REGISTRATION,
     entityType: CorpTypeCd.SOLE_PROP,
-    resourceModel: SpChangeResource,
+    resourceModel: ChangeResourceSp,
     isNumberedCompany: null,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   }
@@ -126,14 +126,14 @@ const conversionTests = [
   {
     filingType: FilingTypes.CONVERSION,
     entityType: CorpTypeCd.PARTNERSHIP,
-    resourceModel: GpConversionResource,
+    resourceModel: ConversionResourceGp,
     isNumberedCompany: null,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   },
   {
     filingType: FilingTypes.CONVERSION,
     entityType: CorpTypeCd.SOLE_PROP,
-    resourceModel: SpConversionResource,
+    resourceModel: ConversionResourceSp,
     isNumberedCompany: null,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   }
@@ -143,14 +143,14 @@ const correctionTests = [
   {
     filingType: FilingTypes.CORRECTION,
     entityType: CorpTypeCd.BENEFIT_COMPANY,
-    resourceModel: BenCorrectionResource,
+    resourceModel: CorrectionResourceBen,
     isNumberedCompany: true,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   },
   {
     filingType: FilingTypes.CORRECTION,
     entityType: CorpTypeCd.BENEFIT_COMPANY,
-    resourceModel: BenCorrectionResource,
+    resourceModel: CorrectionResourceBen,
     isNumberedCompany: false,
     expectedOptions: [
       CorrectNameOptions.CORRECT_NEW_NR,
@@ -161,14 +161,14 @@ const correctionTests = [
   {
     filingType: FilingTypes.CORRECTION,
     entityType: CorpTypeCd.BC_CCC,
-    resourceModel: CccCorrectionResource,
+    resourceModel: CorrectionResourceCc,
     isNumberedCompany: true,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   },
   {
     filingType: FilingTypes.CORRECTION,
     entityType: CorpTypeCd.BC_CCC,
-    resourceModel: CccCorrectionResource,
+    resourceModel: CorrectionResourceCc,
     isNumberedCompany: false,
     expectedOptions: [
       CorrectNameOptions.CORRECT_NEW_NR,
@@ -179,21 +179,21 @@ const correctionTests = [
   {
     filingType: FilingTypes.CORRECTION,
     entityType: CorpTypeCd.PARTNERSHIP,
-    resourceModel: GpCorrectionResource,
+    resourceModel: CorrectionResourceGp,
     isNumberedCompany: false,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   },
   {
     filingType: FilingTypes.CORRECTION,
     entityType: CorpTypeCd.BC_COMPANY,
-    resourceModel: BcCorrectionResource,
+    resourceModel: CorrectionResourceBc,
     isNumberedCompany: true,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   },
   {
     filingType: FilingTypes.CORRECTION,
     entityType: CorpTypeCd.BC_COMPANY,
-    resourceModel: BcCorrectionResource,
+    resourceModel: CorrectionResourceBc,
     isNumberedCompany: false,
     expectedOptions: [
       CorrectNameOptions.CORRECT_NEW_NR,
@@ -204,21 +204,21 @@ const correctionTests = [
   {
     filingType: FilingTypes.CORRECTION,
     entityType: CorpTypeCd.SOLE_PROP,
-    resourceModel: SpCorrectionResource,
+    resourceModel: CorrectionResourceSp,
     isNumberedCompany: false,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   },
   {
     filingType: FilingTypes.CORRECTION,
     entityType: CorpTypeCd.BC_ULC_COMPANY,
-    resourceModel: UlcCorrectionResource,
+    resourceModel: CorrectionResourceUlc,
     isNumberedCompany: true,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   },
   {
     filingType: FilingTypes.CORRECTION,
     entityType: CorpTypeCd.BC_ULC_COMPANY,
-    resourceModel: UlcCorrectionResource,
+    resourceModel: CorrectionResourceUlc,
     isNumberedCompany: false,
     expectedOptions: [
       CorrectNameOptions.CORRECT_NEW_NR,
@@ -232,7 +232,7 @@ const specialResolutionTests = [
   {
     filingType: FilingTypes.SPECIAL_RESOLUTION,
     entityType: CorpTypeCd.COOP,
-    resourceModel: CpSpecialResolutionResource,
+    resourceModel: SpecialResolutionResourceCp,
     isNumberedCompany: null,
     expectedOptions: [CorrectNameOptions.CORRECT_NEW_NR]
   }
@@ -313,7 +313,7 @@ describe('Name Changes for a SP alteration', () => {
     store.stateModel.entitySnapshot = entitySnapshot as any
     store.stateModel.tombstone.filingType = FilingTypes.ALTERATION
     store.stateModel.tombstone.entityType = CorpTypeCd.BENEFIT_COMPANY
-    store.resourceModel = BenAlterationResource
+    store.resourceModel = AlterationResourceBen
 
     wrapper = mount(EntityName, { vuetify })
   })
diff --git a/tests/unit/LimitedRestorationExtension.spec.ts b/tests/unit/LimitedRestorationExtension.spec.ts
index c1b8d2862..0482231a1 100644
--- a/tests/unit/LimitedRestorationExtension.spec.ts
+++ b/tests/unit/LimitedRestorationExtension.spec.ts
@@ -11,7 +11,7 @@ import DocumentsDelivery from '@/components/common/DocumentsDelivery.vue'
 import YourCompanySummary from '@/components/Restoration/YourCompanySummary.vue'
 import StaffPayment from '@/components/common/StaffPayment.vue'
 import BusinessContactInfo from '@/components/common/YourCompany/BusinessContactInfo.vue'
-import { BenRestorationResource } from '@/resources/LimitedRestorationExtension/BEN'
+import { RestorationResourceBen } from '@/resources/LimitedRestorationExtension/BEN'
 import { createPinia, setActivePinia } from 'pinia'
 import { useStore } from '@/store/store'
 import { FilingTypes } from '@/enums'
@@ -211,7 +211,7 @@ describe('Limited Restoration Extension component - edit page', () => {
   }
 
   beforeAll(async () => {
-    store.resourceModel = BenRestorationResource
+    store.resourceModel = RestorationResourceBen
 
     // mock the window.location.assign function
     delete window.location
@@ -246,7 +246,7 @@ describe('Limited Restoration Extension component - edit page', () => {
     store.stateModel.entitySnapshot.businessInfo.stateFiling = stateFiling as any
     store.stateModel.peopleAndRoles.orgPeople = stateFiling.restoration.parties[0] as any
     store.stateModel.businessInformation = { ...entitySnapshot.businessInfo } as any
-    store.resourceModel = BenRestorationResource
+    store.resourceModel = RestorationResourceBen
 
     wrapper = shallowMount(LimitedRestorationExtension, {
       vuetify,
@@ -320,7 +320,7 @@ describe('Limited Restoration Extension component - summary page (with no filing
     store.stateModel.entitySnapshot = entitySnapshot as any
     store.stateModel.entitySnapshot.businessInfo.stateFiling = stateFiling as any
     store.stateModel.peopleAndRoles.orgPeople = stateFiling.restoration.parties as any
-    store.resourceModel = BenRestorationResource
+    store.resourceModel = RestorationResourceBen
 
     // mock the window.location.assign function
     delete window.location
@@ -417,7 +417,7 @@ describe('Limited Restoration Extension component - summary page (with filing ch
     store.stateModel.entitySnapshot.businessInfo.stateFiling = stateFiling as any
     store.stateModel.peopleAndRoles.orgPeople = stateFiling.restoration.parties as any
     store.stateModel.businessInformation = { ...entitySnapshot.businessInfo } as any
-    store.resourceModel = BenRestorationResource
+    store.resourceModel = RestorationResourceBen
 
     wrapper = shallowMount(LimitedRestorationExtension, {
       vuetify,
diff --git a/tests/unit/LimitedRestorationToFull.spec.ts b/tests/unit/LimitedRestorationToFull.spec.ts
index d9d2ea5ad..9b15e39fe 100644
--- a/tests/unit/LimitedRestorationToFull.spec.ts
+++ b/tests/unit/LimitedRestorationToFull.spec.ts
@@ -11,7 +11,7 @@ import ListPeopleAndRoles from '@/components/common/PeopleAndRoles/ListPeopleAnd
 import DocumentsDelivery from '@/components/common/DocumentsDelivery.vue'
 import StaffPayment from '@/components/common/StaffPayment.vue'
 import YourCompanySummary from '@/components/Restoration/YourCompanySummary.vue'
-import { BenRestorationResource } from '@/resources/LimitedRestorationToFull/BEN'
+import { RestorationResourceBen } from '@/resources/LimitedRestorationToFull/BEN'
 import { createPinia, setActivePinia } from 'pinia'
 import { useStore } from '@/store/store'
 import { BusinessContactInfo, EntityName, FolioInformation, NameTranslation, OfficeAddresses, RecognitionDateTime,
@@ -221,7 +221,7 @@ describe('Limited Restoration To Full component - edit page', () => {
     store.stateModel.entitySnapshot.businessInfo.stateFiling = stateFiling as any
     store.stateModel.peopleAndRoles.orgPeople = stateFiling.restoration.parties[0] as any
     store.stateModel.businessInformation = { ...entitySnapshot.businessInfo } as any
-    store.resourceModel = BenRestorationResource
+    store.resourceModel = RestorationResourceBen
 
     // mock services function
     vi.spyOn((LegalServices as any), 'fetchFilingById').mockImplementation(
@@ -326,7 +326,7 @@ describe('Limited Restoration To Full component - summary page (with no filing c
       email: 'currentuser@mail.com',
       contacts: [{ email: 'currentuser@mail.com' }]
     }
-    store.resourceModel = BenRestorationResource
+    store.resourceModel = RestorationResourceBen
 
     // mock the window.location.assign function
     delete window.location
@@ -406,7 +406,7 @@ describe('Limited Restoration To Full component - summary page (with filing chan
     store.stateModel.restoration = filing.restoration as any
     store.stateModel.entitySnapshot = entitySnapshot as any
     store.stateModel.peopleAndRoles.orgPeople = stateFiling.restoration.parties as any
-    store.resourceModel = BenRestorationResource
+    store.resourceModel = RestorationResourceBen
 
     // mock the window.location.assign function
     delete window.location
diff --git a/tests/unit/ListPeopleAndRoles.spec.ts b/tests/unit/ListPeopleAndRoles.spec.ts
index 7cd7a0057..74d7cf30c 100644
--- a/tests/unit/ListPeopleAndRoles.spec.ts
+++ b/tests/unit/ListPeopleAndRoles.spec.ts
@@ -1,8 +1,8 @@
 import Vuetify from 'vuetify'
 import { mount } from '@vue/test-utils'
 import ListPeopleAndRoles from '@/components/common/PeopleAndRoles/ListPeopleAndRoles.vue'
-import { GpChangeResource } from '@/resources/Change/GP'
-import { BenCorrectionResource } from '@/resources/Correction/BEN'
+import { ChangeResourceGp } from '@/resources/Change/GP'
+import { CorrectionResourceBen } from '@/resources/Correction/BEN'
 import { createPinia, setActivePinia } from 'pinia'
 import { useStore } from '@/store/store'
 import { FilingTypes } from '@/enums'
@@ -340,7 +340,7 @@ describe('List People And Roles component for Corrections', () => {
   const wrapperFactory = (orgPeople, propsData = {}) => {
     store.stateModel.tombstone.filingType = FilingTypes.CORRECTION
     store.stateModel.tombstone.entityType = CorpTypeCd.BENEFIT_COMPANY
-    store.resourceModel = BenCorrectionResource
+    store.resourceModel = CorrectionResourceBen
     store.stateModel.peopleAndRoles.orgPeople = orgPeople
     return mount(ListPeopleAndRoles, { propsData, vuetify })
   }
@@ -490,7 +490,7 @@ describe('List People And Roles component for Change of Registration', () => {
   const wrapperFactory = (orgPeople, propsData = {}) => {
     store.stateModel.tombstone.entityType = CorpTypeCd.PARTNERSHIP
     store.stateModel.tombstone.filingType = FilingTypes.CHANGE_OF_REGISTRATION
-    store.resourceModel = GpChangeResource
+    store.resourceModel = ChangeResourceGp
     store.stateModel.peopleAndRoles.orgPeople = orgPeople
     return mount(ListPeopleAndRoles, { propsData, vuetify })
   }
diff --git a/tests/unit/OfficeAddresses.spec.ts b/tests/unit/OfficeAddresses.spec.ts
index 6f8a11de4..1d63fbfa9 100644
--- a/tests/unit/OfficeAddresses.spec.ts
+++ b/tests/unit/OfficeAddresses.spec.ts
@@ -3,7 +3,7 @@ import Vuetify from 'vuetify'
 import { mount } from '@vue/test-utils'
 import OfficeAddresses from '@/components/common/YourCompany/OfficeAddresses.vue'
 import { AddressIF, AddressesIF } from '@/interfaces/stepper-interfaces/YourCompany/address-interfaces'
-import { BenAlterationResource } from '@/resources/Alteration/BEN'
+import { AlterationResourceBen } from '@/resources/Alteration/BEN'
 import { createPinia, setActivePinia } from 'pinia'
 import { useStore } from '@/store/store'
 import { FilingTypes } from '@/enums'
@@ -59,7 +59,7 @@ describe('summary mode', () => {
   beforeAll(() => {
     // init entity type
     store.stateModel.tombstone.entityType = CorpTypeCd.BENEFIT_COMPANY
-    store.resourceModel = BenAlterationResource
+    store.resourceModel = AlterationResourceBen
   })
 
   it('displays the correct sections', () => {
diff --git a/tests/unit/OrgPerson.spec.ts b/tests/unit/OrgPerson.spec.ts
index 7bdacce7a..0555b79a7 100644
--- a/tests/unit/OrgPerson.spec.ts
+++ b/tests/unit/OrgPerson.spec.ts
@@ -2,9 +2,9 @@ import Vue from 'vue'
 import Vuetify from 'vuetify'
 import { mount, Wrapper } from '@vue/test-utils'
 import OrgPerson from '@/components/common/PeopleAndRoles/OrgPerson.vue'
-import { BenCorrectionResource } from '@/resources/Correction/BEN'
-import { SpChangeResource } from '@/resources/Change/SP'
-import { GpChangeResource } from '@/resources/Change/GP'
+import { CorrectionResourceBen } from '@/resources/Correction/BEN'
+import { ChangeResourceSp } from '@/resources/Change/SP'
+import { ChangeResourceGp } from '@/resources/Change/GP'
 import { createPinia, setActivePinia } from 'pinia'
 import { useStore } from '@/store/store'
 import { FilingTypes } from '@/enums'
@@ -174,7 +174,7 @@ describe('Org/Person component for a BEN Correction filing', () => {
     store.stateModel.tombstone.filingType = FilingTypes.CORRECTION
     store.stateModel.tombstone.entityType = CorpTypeCd.BENEFIT_COMPANY
     store.stateModel.tombstone.currentDate = '2020-03-30'
-    store.resourceModel = BenCorrectionResource
+    store.resourceModel = CorrectionResourceBen
   })
 
   it('Loads the component and sets data for person', async () => {
@@ -558,7 +558,7 @@ describe('Org/Person component for SP/GP filings', () => {
       filingType: 'changeOfRegistration',
       name: 'adds new GP partner-person',
       entityType: 'GP',
-      resourceModel: GpChangeResource,
+      resourceModel: ChangeResourceGp,
       currentOrgPerson: NewPersonPartner,
       activeIndex: NaN,
       addPersonHeader: 'Add Person',
@@ -580,7 +580,7 @@ describe('Org/Person component for SP/GP filings', () => {
       filingType: 'changeOfRegistration',
       name: 'adds new GP partner-organization',
       entityType: 'GP',
-      resourceModel: GpChangeResource,
+      resourceModel: ChangeResourceGp,
       currentOrgPerson: NewOrgPartner,
       activeIndex: NaN,
       addPersonHeader: false,
@@ -602,7 +602,7 @@ describe('Org/Person component for SP/GP filings', () => {
       filingType: 'changeOfRegistration',
       name: 'changes existing SP proprietor-person',
       entityType: 'SP',
-      resourceModel: SpChangeResource,
+      resourceModel: ChangeResourceSp,
       currentOrgPerson: ExistingProprietorPersonData,
       activeIndex: 0,
       addPersonHeader: 'Edit Person',
@@ -624,7 +624,7 @@ describe('Org/Person component for SP/GP filings', () => {
       filingType: 'changeOfRegistration',
       name: 'changes existing SP proprietor-organization',
       entityType: 'SP',
-      resourceModel: SpChangeResource,
+      resourceModel: ChangeResourceSp,
       currentOrgPerson: ExistingProprietorOrgData,
       activeIndex: 0,
       addPersonHeader: false,
@@ -646,7 +646,7 @@ describe('Org/Person component for SP/GP filings', () => {
       filingType: 'changeOfRegistration',
       name: 'changes existing GP partner-person',
       entityType: 'GP',
-      resourceModel: GpChangeResource,
+      resourceModel: ChangeResourceGp,
       currentOrgPerson: ExistingPartnerPersonData,
       activeIndex: 0,
       addPersonHeader: 'Edit Person',
@@ -668,7 +668,7 @@ describe('Org/Person component for SP/GP filings', () => {
       filingType: 'changeOfRegistration',
       name: 'changes existing GP partner - organization',
       entityType: 'GP',
-      resourceModel: GpChangeResource,
+      resourceModel: ChangeResourceGp,
       currentOrgPerson: ExistingPartnerOrgData,
       activeIndex: 0,
       addPersonHeader: false,
@@ -690,7 +690,7 @@ describe('Org/Person component for SP/GP filings', () => {
       filingType: 'conversion',
       name: 'adds new SP proprietor-person',
       entityType: 'SP',
-      resourceModel: SpChangeResource,
+      resourceModel: ChangeResourceSp,
       currentOrgPerson: NewPersonProprietor,
       activeIndex: NaN,
       addPersonHeader: 'Add Person',
@@ -712,7 +712,7 @@ describe('Org/Person component for SP/GP filings', () => {
       filingType: 'conversion',
       name: 'adds new SP proprietor-organization',
       entityType: 'SP',
-      resourceModel: SpChangeResource,
+      resourceModel: ChangeResourceSp,
       currentOrgPerson: NewOrgProprietor,
       activeIndex: NaN,
       addPersonHeader: false,
@@ -734,7 +734,7 @@ describe('Org/Person component for SP/GP filings', () => {
       filingType: 'conversion',
       name: 'adds new GP partner-person',
       entityType: 'GP',
-      resourceModel: GpChangeResource,
+      resourceModel: ChangeResourceGp,
       currentOrgPerson: NewPersonProprietor,
       activeIndex: NaN,
       addPersonHeader: 'Add Person',
@@ -756,7 +756,7 @@ describe('Org/Person component for SP/GP filings', () => {
       filingType: 'conversion',
       name: 'adds new GP partner-organization',
       entityType: 'GP',
-      resourceModel: GpChangeResource,
+      resourceModel: ChangeResourceGp,
       currentOrgPerson: NewOrgProprietor,
       activeIndex: NaN,
       addPersonHeader: false,
@@ -778,7 +778,7 @@ describe('Org/Person component for SP/GP filings', () => {
       filingType: 'conversion',
       name: 'changes existing SP proprietor - person',
       entityType: 'SP',
-      resourceModel: SpChangeResource,
+      resourceModel: ChangeResourceSp,
       currentOrgPerson: ExistingProprietorPersonData,
       activeIndex: 0,
       addPersonHeader: 'Edit Person',
@@ -800,7 +800,7 @@ describe('Org/Person component for SP/GP filings', () => {
       filingType: 'conversion',
       name: 'changes existing SP proprietor-organization',
       entityType: 'SP',
-      resourceModel: SpChangeResource,
+      resourceModel: ChangeResourceSp,
       currentOrgPerson: ExistingProprietorOrgData,
       activeIndex: 0,
       addPersonHeader: false,
@@ -822,7 +822,7 @@ describe('Org/Person component for SP/GP filings', () => {
       filingType: 'conversion',
       name: 'changes existing GP partner-person',
       entityType: 'GP',
-      resourceModel: GpChangeResource,
+      resourceModel: ChangeResourceGp,
       currentOrgPerson: ExistingPartnerPersonData,
       activeIndex: 0,
       addPersonHeader: 'Edit Person',
@@ -844,7 +844,7 @@ describe('Org/Person component for SP/GP filings', () => {
       filingType: 'conversion',
       name: 'changes existing GP partner-organization',
       entityType: 'GP',
-      resourceModel: GpChangeResource,
+      resourceModel: ChangeResourceGp,
       currentOrgPerson: ExistingPartnerOrgData,
       activeIndex: 0,
       addPersonHeader: false,
@@ -952,13 +952,13 @@ describe('Org/Person component for SP change of registration filing', () => {
     store.stateModel.tombstone.currentDate = '2020-03-30'
     store.stateModel.tombstone.filingType = FilingTypes.CHANGE_OF_REGISTRATION
     store.stateModel.tombstone.entityType = CorpTypeCd.SOLE_PROP
-    store.resourceModel = SpChangeResource
+    store.resourceModel = ChangeResourceSp
   })
 
   it('displays Confirm Documents checkbox for a replaced-added org-person', () => {
     store.stateModel.tombstone.filingType = FilingTypes.CHANGE_OF_REGISTRATION
     store.stateModel.tombstone.entityType = CorpTypeCd.SOLE_PROP
-    store.resourceModel = SpChangeResource
+    store.resourceModel = ChangeResourceSp
 
     const currentOrgPerson = {
       ...NewOrgProprietor,
diff --git a/tests/unit/PeopleAndRoles.spec.ts b/tests/unit/PeopleAndRoles.spec.ts
index 64e89a519..fef6476e7 100644
--- a/tests/unit/PeopleAndRoles.spec.ts
+++ b/tests/unit/PeopleAndRoles.spec.ts
@@ -1,6 +1,6 @@
 import Vuetify from 'vuetify'
-import { GpChangeResource } from '@/resources/Change/GP'
-import { BenCorrectionResource } from '@/resources/Correction/BEN'
+import { ChangeResourceGp } from '@/resources/Change/GP'
+import { CorrectionResourceBen } from '@/resources/Correction/BEN'
 import { mount, shallowMount } from '@vue/test-utils'
 import PeopleAndRoles from '@/components/common/PeopleAndRoles/PeopleAndRoles.vue'
 import { createPinia, setActivePinia } from 'pinia'
@@ -99,7 +99,7 @@ describe('People And Roles component for Correction', () => {
     store.stateModel.tombstone.entityType = CorpTypeCd.BENEFIT_COMPANY
     store.stateModel.tombstone.filingType = FilingTypes.CORRECTION
     store.stateModel.entitySnapshot = {} as any
-    store.resourceModel = BenCorrectionResource
+    store.resourceModel = CorrectionResourceBen
 
     wrapperFactory = () => {
       return mount(PeopleAndRoles, { vuetify })
@@ -215,7 +215,7 @@ describe('People And Roles component for Change of Registration', () => {
   beforeAll(() => {
     store.stateModel.tombstone.entityType = CorpTypeCd.PARTNERSHIP
     store.stateModel.tombstone.filingType = FilingTypes.CHANGE_OF_REGISTRATION
-    store.resourceModel = GpChangeResource
+    store.resourceModel = ChangeResourceGp
 
     wrapperFactory = () => {
       return mount(PeopleAndRoles, {
diff --git a/tests/unit/Resolution.spec.ts b/tests/unit/Resolution.spec.ts
index 43590db3b..e499383e9 100644
--- a/tests/unit/Resolution.spec.ts
+++ b/tests/unit/Resolution.spec.ts
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import Vuetify from 'vuetify'
 import { mount } from '@vue/test-utils'
 import Resolution from '@/components/SpecialResolution/Resolution.vue'
-import { CpSpecialResolutionResource } from '@/resources/SpecialResolution/CP'
+import { SpecialResolutionResourceCp } from '@/resources/SpecialResolution/CP'
 import { createPinia, setActivePinia } from 'pinia'
 import { useStore } from '@/store/store'
 import { FilingTypes } from '@/enums'
@@ -43,7 +43,7 @@ describe('Special Resolution Form component', () => {
         familyName: 't'
       }
     }
-    store.resourceModel = CpSpecialResolutionResource
+    store.resourceModel = SpecialResolutionResourceCp
     store.stateModel.nameRequestLegalName = entitySnapshot.businessInfo.legalName
     store.stateModel.tombstone.entityType = entitySnapshot.businessInfo.legalType as CorpTypeCd
     store.stateModel.summaryMode = false
diff --git a/tests/vitest-wrapper-factory.ts b/tests/vitest-wrapper-factory.ts
index b28f513cf..fc2354788 100644
--- a/tests/vitest-wrapper-factory.ts
+++ b/tests/vitest-wrapper-factory.ts
@@ -66,7 +66,6 @@ const applyStoreValues = (store, stateValues, resource) => {
   // Set individual state properties
   const stateKeys = Object.keys(stateValues)
   stateKeys.forEach((key) => {
-    console.log('*** setting key-val =', key, stateValues[key])
     store.stateModel[key] = stateValues[key]
   })
 }