diff --git a/src/components/Alteration/summary/BusinessType.vue b/src/components/Alteration/summary/BusinessType.vue
index 6af4f28d..395c956f 100644
--- a/src/components/Alteration/summary/BusinessType.vue
+++ b/src/components/Alteration/summary/BusinessType.vue
@@ -9,7 +9,7 @@
 
         <v-col cols="8">
           <span class="info-text">
-            Changing from a {{ GetCorpFullDescription(originalLegalType) }} to a
+            Changing from a {{ GetCorpFullDescription(getOriginalLegalType) }} to a
             {{ GetCorpFullDescription(getEntityType) }}
           </span>
 
@@ -38,17 +38,13 @@
 <script lang="ts">
 import { FilingTemplateMixin } from '@/mixins'
 import { Component, Mixins } from 'vue-property-decorator'
-import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceUtilities } from '@/utils/resource-utils'
 
 @Component({})
 export default class BusinessType extends Mixins(FilingTemplateMixin) {
   readonly GetCorpFullDescription = GetCorpFullDescription // for template
 
-  get originalLegalType (): CorpTypeCd {
-    return this.getEntitySnapshot?.businessInfo?.legalType
-  }
-
   get articleInfo (): string {
     return ResourceUtilities.articleInfo(this.getEntityType)
   }
diff --git a/src/components/SpecialResolution/Memorandum.vue b/src/components/SpecialResolution/Memorandum.vue
index 4540a7ab..bcf1d091 100644
--- a/src/components/SpecialResolution/Memorandum.vue
+++ b/src/components/SpecialResolution/Memorandum.vue
@@ -255,7 +255,7 @@
 <script lang="ts">
 import Vue from 'vue'
 import { HelpSection } from '@/components/common/'
-import { EntitySnapshotIF, RulesMemorandumIF } from '@/interfaces'
+import { RulesMemorandumIF } from '@/interfaces'
 import DateUtilities from '@/services/date-utilities'
 import { FormIF } from '@bcrs-shared-components/interfaces'
 import { Component, Watch } from 'vue-property-decorator'
@@ -272,7 +272,6 @@ export default class Memorandum extends Vue {
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) getEditedLabel!: string
   @Getter(useStore) getEditLabel!: string
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
   @Getter(useStore) getSpecialResolutionMemorandum!: RulesMemorandumIF
   @Getter(useStore) hasSpecialResolutionMemorandumChanged!: boolean
 
diff --git a/src/components/SpecialResolution/ResolutionSummary.vue b/src/components/SpecialResolution/ResolutionSummary.vue
index 9acf5bb7..a45262c1 100644
--- a/src/components/SpecialResolution/ResolutionSummary.vue
+++ b/src/components/SpecialResolution/ResolutionSummary.vue
@@ -149,7 +149,7 @@
 <script lang="ts">
 import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { FormIF, EntitySnapshotIF } from '@/interfaces/'
+import { FormIF } from '@/interfaces/'
 import { CommonMixin, DateMixin } from '@/mixins/'
 import { HelpSection } from '@/components/common/'
 import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker/'
@@ -163,10 +163,10 @@ import { useStore } from '@/store/store'
   }
 })
 export default class ResolutionSummary extends Mixins(CommonMixin, DateMixin) {
-  @Getter(useStore) getSpecialResolution!: SpecialResolutionIF
   @Getter(useStore) getAppValidate!: boolean
+  @Getter(useStore) getOriginalLegalName!: string
+  @Getter(useStore) getSpecialResolution!: SpecialResolutionIF
   @Getter(useStore) getSpecialResolutionConfirmValid!: boolean
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
 
   @Action(useStore) setSpecialResolution!: (x: SpecialResolutionIF) => void
   @Action(useStore) setSpecialResolutionConfirmStateValidity!: (x: boolean) => void
@@ -226,7 +226,7 @@ export default class ResolutionSummary extends Mixins(CommonMixin, DateMixin) {
   /** The company name. */
   get companyName (): string {
     // old company name need show even they change it
-    return this.getEntitySnapshot?.businessInfo?.legalName || ''
+    return this.getOriginalLegalName || ''
   }
 
   /** Set validate on file and pay click. */
diff --git a/src/components/SpecialResolution/Rules.vue b/src/components/SpecialResolution/Rules.vue
index 592c4dc6..a29bdd49 100644
--- a/src/components/SpecialResolution/Rules.vue
+++ b/src/components/SpecialResolution/Rules.vue
@@ -333,7 +333,7 @@
 <script lang="ts">
 import Vue from 'vue'
 import { HelpSection } from '@/components/common/'
-import { EntitySnapshotIF, RulesMemorandumIF } from '@/interfaces'
+import { BusinessDocumentsIF, RulesMemorandumIF } from '@/interfaces'
 import DateUtilities from '@/services/date-utilities'
 import { FormIF } from '@bcrs-shared-components/interfaces'
 import { Component, Watch } from 'vue-property-decorator'
@@ -350,14 +350,14 @@ import { LegalServices } from '@/services'
 })
 export default class Rules extends Vue {
     @Getter(useStore) getComponentValidate!: boolean
-    @Getter(useStore) getSpecialResolutionRules!: RulesMemorandumIF
-    @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
+    @Getter(useStore) getEditLabel!: string
+    @Getter(useStore) getEditedLabel!: string
+    @Getter(useStore) getNameRequestLegalName!: string
+    @Getter(useStore) getOriginalBusinessDocuments!: BusinessDocumentsIF
     @Getter(useStore) getUserFirstName!: string
     @Getter(useStore) getUserLastName!: string
-    @Getter(useStore) getEditedLabel!: string
-    @Getter(useStore) getEditLabel!: string
+    @Getter(useStore) getSpecialResolutionRules!: RulesMemorandumIF
     @Getter(useStore) getSpecialResolutionRulesValid!: boolean
-    @Getter(useStore) getNameRequestLegalName!: string
     @Getter(useStore) hasSpecialResolutionRulesChanged!: boolean
 
     @Action(useStore) setEditingRules!: (x: boolean) => void
@@ -423,8 +423,8 @@ export default class Rules extends Vue {
 
     /** Initial rules for the business, this is loaded in when undo or cancel is pressed. */
     initialRules (): RulesMemorandumIF {
-      const documentsInfo = this.getEntitySnapshot?.businessDocuments?.documentsInfo
-      const documents = this.getEntitySnapshot?.businessDocuments?.documents
+      const documentsInfo = this.getOriginalBusinessDocuments?.documentsInfo
+      const documents = this.getOriginalBusinessDocuments?.documents
       return {
         includedInResolution: false,
         key: documentsInfo?.certifiedRules?.key || null,
diff --git a/src/components/SpecialResolution/SpecialResolutionSummary.vue b/src/components/SpecialResolution/SpecialResolutionSummary.vue
index 279f4a20..574a2910 100644
--- a/src/components/SpecialResolution/SpecialResolutionSummary.vue
+++ b/src/components/SpecialResolution/SpecialResolutionSummary.vue
@@ -158,12 +158,12 @@ export default class SpecialResolutionSummary extends Mixins(DateMixin, FeeMixin
 
   /** The legal type before changes. */
   get originalLegalType (): string {
-    return this.getEntitySnapshot?.businessInfo?.legalType
+    return this.getOriginalLegalType
   }
 
   /** The association type before changes. */
   get originalAssociationType (): string {
-    return this.getEntitySnapshot?.businessInfo?.associationType
+    return this.getOriginalBusinessInfo?.associationType
   }
 
   /** Calculates the sum of special resolution fees. */
diff --git a/src/components/common/EntityInfo.vue b/src/components/common/EntityInfo.vue
index df51df1b..fe2b468d 100644
--- a/src/components/common/EntityInfo.vue
+++ b/src/components/common/EntityInfo.vue
@@ -49,25 +49,26 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import { Getter } from 'pinia-class'
 import { CommonMixin } from '@/mixins/'
-import { BusinessInformationIF, EntitySnapshotIF } from '@/interfaces/'
+import { BusinessInformationIF } from '@/interfaces/'
 import { ContactPointIF } from '@bcrs-shared-components/interfaces/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 
 import { useStore } from '@/store/store'
 
 @Component({})
 export default class EntityInfo extends Mixins(CommonMixin) {
   // Global getters
+  @Getter(useStore) getBusinessContact!: ContactPointIF
   @Getter(useStore) getBusinessId!: string
   @Getter(useStore) getBusinessInformation!: BusinessInformationIF
+  @Getter(useStore) getOriginalBusinessInfo!: BusinessInformationIF
   @Getter(useStore) getOriginalLegalName!: string
-  @Getter(useStore) getBusinessContact!: ContactPointIF
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
+  @Getter(useStore) getOriginalLegalType!: CorpTypeCd
 
   /** The original entity type. */
   get originalEntityType (): string {
-    if (this.getEntitySnapshot?.businessInfo) {
-      return GetCorpFullDescription(this.getEntitySnapshot.businessInfo.legalType)
+    if (this.getOriginalBusinessInfo) {
+      return GetCorpFullDescription(this.getOriginalLegalType)
     } else {
       return 'Unknown'
     }
diff --git a/src/components/common/PeopleAndRoles/PeopleAndRoles.vue b/src/components/common/PeopleAndRoles/PeopleAndRoles.vue
index 2fed287c..901b33a8 100644
--- a/src/components/common/PeopleAndRoles/PeopleAndRoles.vue
+++ b/src/components/common/PeopleAndRoles/PeopleAndRoles.vue
@@ -291,8 +291,8 @@ import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { cloneDeep, isEmpty } from 'lodash'
 import { IsSame } from '@/utils/'
-import { ActionKvIF, EmptyOrgPerson, EntitySnapshotIF, HelpSectionIF, OrgPersonIF, ResourceIF,
-  RoleIF } from '@/interfaces/'
+import { ActionKvIF, EmptyOrgPerson, HelpSectionIF, OrgPersonIF, ResourceIF, RoleIF }
+  from '@/interfaces/'
 import { ActionTypes, CompareModes, PartyTypes, RoleTypes } from '@/enums/'
 import { HelpSection } from '@/components/common/'
 import { ListPeopleAndRoles } from './'
@@ -312,8 +312,8 @@ export default class PeopleAndRoles extends Mixins(CommonMixin, DateMixin, OrgPe
 
   // Global getters
   @Getter(useStore) getCurrentJsDate!: Date
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
   @Getter(useStore) getOrgPeople!: OrgPersonIF[]
+  @Getter(useStore) getOriginalOrgPersons!: OrgPersonIF[]
   @Getter(useStore) getResource!: ResourceIF
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) isAlterationFiling!: boolean
@@ -347,7 +347,7 @@ export default class PeopleAndRoles extends Mixins(CommonMixin, DateMixin, OrgPe
 
   /** The list of original parties. */
   get originalParties (): OrgPersonIF[] {
-    return this.getEntitySnapshot?.orgPersons || []
+    return this.getOriginalOrgPersons || []
   }
 
   /** True when the required proprietor count is met. */
diff --git a/src/components/common/ShareStructure/ShareStructures.vue b/src/components/common/ShareStructure/ShareStructures.vue
index f42bb9eb..52fa1df7 100644
--- a/src/components/common/ShareStructure/ShareStructures.vue
+++ b/src/components/common/ShareStructure/ShareStructures.vue
@@ -9,7 +9,7 @@
     <ShareStructureShared
       :isEditMode="isEditMode"
       :shareClasses="getShareClasses"
-      :originalShareStructure="originalShareStructure"
+      :originalShareStructure="getOriginalShareStructure"
       :resolutionRequired="resolutionsRequired"
       :editLabel="getEditLabel"
       :editedLabel="getEditedLabel"
@@ -25,18 +25,12 @@
 </template>
 
 <script lang="ts">
-// Libraries
 import { Component, Mixins, Prop, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-
-// Components
 import { ShareStructure as ShareStructureShared } from '@bcrs-shared-components/share-structure/'
 import { ResolutionDateDialog } from '@/dialogs/'
 import { CommonMixin } from '@/mixins/'
-
-import { ActionKvIF, EntitySnapshotIF, ShareClassIF, ShareStructureIF, FlagsCompanyInfoIF }
-  from '@/interfaces/'
-
+import { ActionKvIF, ShareClassIF, ShareStructureIF, FlagsCompanyInfoIF } from '@/interfaces/'
 import { useStore } from '@/store/store'
 
 @Component({
@@ -53,10 +47,10 @@ export default class ShareStructures extends Mixins(CommonMixin) {
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) getEditLabel!: string
   @Getter(useStore) getEditedLabel!: string
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
   @Getter(useStore) getFlagsCompanyInfo!: FlagsCompanyInfoIF
   @Getter(useStore) getNewResolutionDates!: string[]
   @Getter(useStore) getHasRightsOrRestrictions!: boolean
+  @Getter(useStore) getOriginalShareStructure!: ShareStructureIF
   @Getter(useStore) getShareClasses!: ShareClassIF[]
   @Getter(useStore) hasMinimumShareClass!: boolean
   @Getter(useStore) isAlterationFiling!: boolean
@@ -69,18 +63,14 @@ export default class ShareStructures extends Mixins(CommonMixin) {
   @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // Local propertiues
-  protected isEditing = false
-  protected showResolutionDateDialog = false
+  isEditing = false
+  showResolutionDateDialog = false
 
   /** Whether share section is invalid, only when prompted by app. */
   get invalidShareSection (): boolean {
     return (this.getComponentValidate && !this.getFlagsCompanyInfo.isValidShareStructure)
   }
 
-  get originalShareStructure (): ShareStructureIF {
-    return this.getEntitySnapshot?.shareStructure
-  }
-
   /** True if changes to share structure rights will require a resolution date. */
   get resolutionsRequired (): boolean {
     return (this.getNewResolutionDates.length === 0) && this.isAlterationFiling
diff --git a/src/components/common/YourCompany/AssociationType.vue b/src/components/common/YourCompany/AssociationType.vue
index 3dc76d34..efcc492d 100644
--- a/src/components/common/YourCompany/AssociationType.vue
+++ b/src/components/common/YourCompany/AssociationType.vue
@@ -167,7 +167,7 @@ import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { CoopTypes } from '@/enums'
 import { CommonMixin } from '@/mixins'
-import { ActionKvIF, BusinessInformationIF, EntitySnapshotIF } from '@/interfaces'
+import { ActionKvIF, BusinessInformationIF } from '@/interfaces'
 import { VuetifyRuleFunction } from '@/types'
 import { CoopTypeToDescription } from '@/utils'
 import { useStore } from '@/store/store'
@@ -180,7 +180,7 @@ export default class AssociationType extends Mixins(CommonMixin) {
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) getEditLabel!: string
   @Getter(useStore) getEditedLabel!: string
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
+  @Getter(useStore) getOriginalBusinessInfo!: BusinessInformationIF
   @Getter(useStore) hasAssociationTypeChanged!: boolean
 
   /** Global actions */
@@ -235,7 +235,7 @@ export default class AssociationType extends Mixins(CommonMixin) {
 
   /** Reset association type value to original */
   resetAssociationType () {
-    this.setBusinessInformation(this.getEntitySnapshot.businessInfo)
+    this.setBusinessInformation(this.getOriginalBusinessInfo)
     this.isEditingAssociationType = false
   }
 
diff --git a/src/components/common/YourCompany/BusinessContactInfo.vue b/src/components/common/YourCompany/BusinessContactInfo.vue
index d4b35cba..dbf4db46 100644
--- a/src/components/common/YourCompany/BusinessContactInfo.vue
+++ b/src/components/common/YourCompany/BusinessContactInfo.vue
@@ -26,7 +26,7 @@ import { Action, Getter } from 'pinia-class'
 import { ContactInfo as ContactInfoShared } from '@bcrs-shared-components/contact-info/'
 import { AuthServices } from '@/services/'
 import { CommonMixin } from '@/mixins/'
-import { ActionKvIF, ResourceIF, EntitySnapshotIF, FlagsCompanyInfoIF } from '@/interfaces/'
+import { ActionKvIF, AuthInformationIF, ResourceIF, FlagsCompanyInfoIF } from '@/interfaces/'
 import { ContactPointIF } from '@bcrs-shared-components/interfaces/'
 import { isEqual } from 'lodash'
 import { useStore } from '@/store/store'
@@ -43,7 +43,7 @@ export default class BusinessContactInfo extends Mixins(CommonMixin) {
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) getEditLabel!: string
   @Getter(useStore) getEditSavedLabel!: string
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
+  @Getter(useStore) getOriginalAuthInfo!: AuthInformationIF
   @Getter(useStore) getFlagsCompanyInfo!: FlagsCompanyInfoIF
   @Getter(useStore) getResource!: ResourceIF
   @Getter(useStore) isAlterationFiling!: boolean
@@ -54,7 +54,7 @@ export default class BusinessContactInfo extends Mixins(CommonMixin) {
   @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // Local variable
-  protected isEditingContact = false
+  isEditingContact = false
 
   /** The section validity state (when prompted by app). */
   get invalidSection (): boolean {
@@ -66,7 +66,7 @@ export default class BusinessContactInfo extends Mixins(CommonMixin) {
 
   /** The original Contact data. */
   get originalContact (): ContactPointIF {
-    return this.getEntitySnapshot?.authInfo?.contact
+    return this.getOriginalAuthInfo?.contact || null
   }
 
   /** True if there are changes between current Contact and original Contact Info. */
@@ -77,7 +77,7 @@ export default class BusinessContactInfo extends Mixins(CommonMixin) {
   }
 
   /** On Contact Info Change event, updates auth db and store. */
-  protected async onContactInfoChange (contactInfo: ContactPointIF): Promise<void> {
+  async onContactInfoChange (contactInfo: ContactPointIF): Promise<void> {
     // do nothing if contact info was not changed
     if (isEqual(contactInfo, this.getBusinessContact)) return
 
@@ -90,7 +90,7 @@ export default class BusinessContactInfo extends Mixins(CommonMixin) {
       // reset business contact to previous value
       const prev = this.getBusinessContact
       // toggle for reactivity
-      this.setBusinessContact({})
+      this.setBusinessContact({} as ContactPointIF)
       this.$nextTick(() => this.setBusinessContact(prev))
     }
   }
diff --git a/src/components/common/YourCompany/ChangeBusinessType.vue b/src/components/common/YourCompany/ChangeBusinessType.vue
index 1f4353de..5b52c1eb 100644
--- a/src/components/common/YourCompany/ChangeBusinessType.vue
+++ b/src/components/common/YourCompany/ChangeBusinessType.vue
@@ -284,7 +284,7 @@ import BcRegEntityDetails from '@/components/Alteration/BcRegEntityDetails.vue'
 import { BcRegContacts } from '@/components/common/'
 import { CommonMixin } from '@/mixins/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
-import { EntitySnapshotIF, EntityTypeOption, NameRequestIF, ResourceIF } from '@/interfaces/'
+import { EntityTypeOption, NameRequestIF, ResourceIF } from '@/interfaces/'
 import { GetFeatureFlag, ResourceUtilities } from '@/utils'
 import { useStore } from '@/store/store'
 
@@ -301,18 +301,20 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
   @Prop({ default: false }) readonly invalidSection!: boolean
 
   // Global getters
-  @Getter(useStore) getNameRequestLegalName!: string
   @Getter(useStore) getEditLabel!: string
   @Getter(useStore) getEditedLabel!: string
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
   @Getter(useStore) getEntityType!: CorpTypeCd
+  @Getter(useStore) getNameRequestLegalName!: string
   @Getter(useStore) getNumberOfDirectors!: number
+  @Getter(useStore) getOriginalLegalName!: string
+  @Getter(useStore) getOriginalLegalType!: CorpTypeCd
+  @Getter(useStore) getOriginalNrNumber!: string
   @Getter(useStore) getResource!: ResourceIF
   @Getter(useStore) hasBusinessNameChanged!: boolean
   @Getter(useStore) hasBusinessTypeChanged!: boolean
   @Getter(useStore) isBcCompany!: boolean
-  @Getter(useStore) isBenefitCompany!: boolean
   @Getter(useStore) isBcUlcCompany!: boolean
+  @Getter(useStore) isBenefitCompany!: boolean
   @Getter(useStore) isConflictingLegalType!: boolean
   @Getter(useStore) isEntityTypeChangedByName!: boolean
   @Getter(useStore) isNameChangedByType!: boolean
@@ -355,7 +357,7 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
   /** Verify New Business name. */
   get isNewName (): boolean {
     return this.getNameRequestLegalName &&
-      (this.getNameRequestLegalName !== this.getEntitySnapshot?.businessInfo?.legalName)
+      (this.getNameRequestLegalName !== this.getOriginalLegalName)
   }
 
   /** Type change helper information */
@@ -373,10 +375,10 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
 
   get enableEditButton (): boolean {
     // Exclude CCC - Originally: isBcCompany || isBcUlcCompany || isBenefitCompany
-    if (this.getEntitySnapshot?.businessInfo?.legalType === CorpTypeCd.BC_CCC) {
+    if (this.getOriginalLegalType === CorpTypeCd.BC_CCC) {
       return false
     }
-    return this.supportedEntityTypes?.includes(this.getEntitySnapshot?.businessInfo?.legalType)
+    return this.supportedEntityTypes?.includes(this.getOriginalLegalType)
   }
 
   get nameRequestRequiredError (): boolean {
@@ -388,7 +390,7 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
       return true
     }
     // Named ULC to BC Limited require a name request.
-    if (this.getEntitySnapshot?.businessInfo?.legalType === CorpTypeCd.BC_ULC_COMPANY && this.isBcLimited) {
+    if (this.getOriginalLegalType === CorpTypeCd.BC_ULC_COMPANY && this.isBcLimited) {
       return true
     }
     return false
@@ -400,12 +402,12 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
 
   /** Reset company type values to original. */
   resetType () {
-    this.setEntityType(this.getEntitySnapshot?.businessInfo?.legalType)
+    this.setEntityType(this.getOriginalLegalType)
     // reset name request
     this.setNameRequest({
-      legalType: this.getEntitySnapshot?.businessInfo?.legalType,
-      legalName: this.getEntitySnapshot?.businessInfo?.legalName,
-      nrNumber: this.getEntitySnapshot?.businessInfo?.nrNumber
+      legalType: this.getOriginalLegalType,
+      legalName: this.getOriginalLegalName,
+      nrNumber: this.getOriginalNrNumber
     })
     this.setNameChangedByType(false)
     this.isEditingType = false
@@ -418,14 +420,14 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
     this.isEditingType = false
 
     if (this.shouldUpdateName()) {
-      const originalName = this.getEntitySnapshot?.businessInfo.legalName
+      const originalName = this.getOriginalLegalName
       const updatedName = this.getUpdatedName(originalName)
 
       if (originalName !== updatedName) {
         const nameRequest = {
           legalType: this.selectedEntityType,
           legalName: updatedName,
-          nrNumber: this.getEntitySnapshot?.businessInfo?.nrNumber
+          nrNumber: this.getOriginalNrNumber
         }
 
         this.setNameRequest(nameRequest)
diff --git a/src/components/common/YourCompany/CorrectName/CorrectCompanyName.vue b/src/components/common/YourCompany/CorrectName/CorrectCompanyName.vue
index 903335f0..f99e4ed8 100644
--- a/src/components/common/YourCompany/CorrectName/CorrectCompanyName.vue
+++ b/src/components/common/YourCompany/CorrectName/CorrectCompanyName.vue
@@ -38,8 +38,8 @@ export default class CorrectCompanyName extends Mixins(CommonMixin) {
   @Getter(useStore) getNameRequest!: NameRequestIF
 
   // Local properties
-  protected valid = false
-  protected companyName = ''
+  valid = false
+  companyName = ''
 
   // Form Ref
   $refs: { correctNameForm: HTMLFormElement }
diff --git a/src/components/common/YourCompany/CorrectName/CorrectNameRequest.vue b/src/components/common/YourCompany/CorrectName/CorrectNameRequest.vue
index c56fc591..4f0d76bd 100644
--- a/src/components/common/YourCompany/CorrectName/CorrectNameRequest.vue
+++ b/src/components/common/YourCompany/CorrectName/CorrectNameRequest.vue
@@ -279,7 +279,10 @@ export default class CorrectNameRequest extends Mixins(CommonMixin, NameRequestM
     }
 
     // set the new correction NR data
-    this.setNameRequest({ ...this.getNameRequest, ...nrCorrection })
+    this.setNameRequest({
+      ...this.getNameRequest,
+      ...nrCorrection
+    })
   }
 
   /** Inform parent the process is complete. */
diff --git a/src/components/common/YourCompany/CorrectName/CorrectNameToNumber.vue b/src/components/common/YourCompany/CorrectName/CorrectNameToNumber.vue
index 91fffd2a..aa0b493c 100644
--- a/src/components/common/YourCompany/CorrectName/CorrectNameToNumber.vue
+++ b/src/components/common/YourCompany/CorrectName/CorrectNameToNumber.vue
@@ -38,7 +38,7 @@ export default class CorrectNameToNumber extends Vue {
   @Getter(useStore) getBusinessId!: string
 
   // Local properties
-  protected correctToNumbered = false
+  correctToNumbered = false
 
   get businessId (): string {
     return this.getBusinessId && this.getBusinessId.substring(2)
diff --git a/src/components/common/YourCompany/EntityName.vue b/src/components/common/YourCompany/EntityName.vue
index 6f8c870f..64a727c3 100644
--- a/src/components/common/YourCompany/EntityName.vue
+++ b/src/components/common/YourCompany/EntityName.vue
@@ -251,7 +251,7 @@
 import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { CoopTypes, CorrectNameOptions } from '@/enums/'
-import { ActionKvIF, BusinessInformationIF, EntitySnapshotIF, NameRequestApplicantIF, NameRequestIF }
+import { ActionKvIF, BusinessInformationIF, NameRequestApplicantIF, NameRequestIF }
   from '@/interfaces/'
 import CorrectName from '@/components/common/YourCompany/CorrectName/CorrectName.vue'
 import { NameRequestMixin } from '@/mixins'
@@ -275,11 +275,14 @@ export default class EntityName extends Mixins(NameRequestMixin) {
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) getEditLabel!: string
   @Getter(useStore) getEditedLabel!: string
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
   @Getter(useStore) getEntityType!: CorpTypeCd
   @Getter(useStore) getNameRequest!: NameRequestIF
   @Getter(useStore) getNameRequestLegalName!: string
   @Getter(useStore) getNameRequestNumber!: string
+  @Getter(useStore) getOriginalBusinessInfo!: BusinessInformationIF
+  @Getter(useStore) getOriginalLegalName!: string
+  @Getter(useStore) getOriginalLegalType!: CorpTypeCd
+  @Getter(useStore) getOriginalNrNumber!: string
   @Getter(useStore) hasBusinessNameChanged!: boolean
   @Getter(useStore) isAlterationFiling!: boolean
   @Getter(useStore) isConflictingLegalType!: boolean
@@ -343,7 +346,7 @@ export default class EntityName extends Mixins(NameRequestMixin) {
   /** Whether a new business legal name was entered.. */
   get isNewName () {
     const originalName = this.getNameRequestLegalName
-    const currentName = this.getEntitySnapshot?.businessInfo.legalName
+    const currentName = this.getOriginalLegalName
     return (originalName !== currentName)
   }
 
@@ -400,18 +403,18 @@ export default class EntityName extends Mixins(NameRequestMixin) {
   /** Reset company name values to original. */
   resetName () {
     // reset business information, except for association type.
-    const businessInfo = { ...this.getEntitySnapshot.businessInfo, associationType: this.getAssociationType }
+    const businessInfo = { ...this.getOriginalBusinessInfo, associationType: this.getAssociationType }
     this.setBusinessInformation(businessInfo)
 
     // reset name request
     this.setNameRequest({
-      legalType: this.getEntitySnapshot.businessInfo.legalType,
-      legalName: this.getEntitySnapshot.businessInfo.legalName,
-      nrNumber: this.getEntitySnapshot.businessInfo.nrNumber
+      legalType: this.getOriginalLegalType,
+      legalName: this.getOriginalLegalName,
+      nrNumber: this.getOriginalNrNumber
     })
 
     if (this.isEntityTypeChangedByName) {
-      this.setEntityType(this.getEntitySnapshot.businessInfo.legalType)
+      this.setEntityType(this.getOriginalLegalType)
       this.setEntityTypeChangedByName(false)
     }
 
diff --git a/src/components/common/YourCompany/FolioInformation.vue b/src/components/common/YourCompany/FolioInformation.vue
index 21adf39b..a4966202 100644
--- a/src/components/common/YourCompany/FolioInformation.vue
+++ b/src/components/common/YourCompany/FolioInformation.vue
@@ -21,7 +21,7 @@
 <script lang="ts">
 import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { ActionKvIF, EntitySnapshotIF, FlagsCompanyInfoIF } from '@/interfaces/'
+import { ActionKvIF, AuthInformationIF, FlagsCompanyInfoIF } from '@/interfaces/'
 import { AuthServices } from '@/services/'
 import { CommonMixin } from '@/mixins/'
 import { FolioNumber as FolioNumberShared } from '@bcrs-shared-components/folio-number/'
@@ -39,9 +39,9 @@ export default class FolioInformation extends Mixins(CommonMixin) {
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) getEditLabel!: string
   @Getter(useStore) getEditedLabel!: string
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
   @Getter(useStore) getFlagsCompanyInfo!: FlagsCompanyInfoIF
   @Getter(useStore) getFolioNumber!: string
+  @Getter(useStore) getOriginalAuthInfo!: AuthInformationIF
   @Getter(useStore) isAlterationFiling!: boolean
   @Getter(useStore) isCorrectionFiling!: boolean
   @Getter(useStore) isPremiumAccount!: boolean
@@ -54,7 +54,7 @@ export default class FolioInformation extends Mixins(CommonMixin) {
   @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // local properties
-  protected isEditingFolioNumber = false
+  isEditingFolioNumber = false
 
   /** The section validity state (when prompted by app). */
   get invalidSection (): boolean {
@@ -63,7 +63,7 @@ export default class FolioInformation extends Mixins(CommonMixin) {
 
   /** The original Folio Number. */
   get originalFolioNumber (): string {
-    return this.getEntitySnapshot?.authInfo?.folioNumber
+    return this.getOriginalAuthInfo?.folioNumber
   }
 
   /** Whether to hide the component's actions. */
@@ -84,7 +84,7 @@ export default class FolioInformation extends Mixins(CommonMixin) {
   }
 
   /** On New Folio Number event, updates auth db and store. */
-  protected async onNewFolioNumber (folioNumber: string): Promise<void> {
+  async onNewFolioNumber (folioNumber: string): Promise<void> {
     // do nothing if folio number was not changed
     if (folioNumber === this.getFolioNumber) return
 
diff --git a/src/interfaces/correction-interfaces/correct-name-interface.ts b/src/interfaces/correction-interfaces/correct-name-interface.ts
index fb4247bb..3c472e0e 100644
--- a/src/interfaces/correction-interfaces/correct-name-interface.ts
+++ b/src/interfaces/correction-interfaces/correct-name-interface.ts
@@ -11,13 +11,13 @@ export interface CorrectNameOptionIF {
 }
 
 export interface NrCorrectionIF {
+  applicant: NameRequestApplicantIF
+  expiry: string,
+  legalName: string,
   legalType: CorpTypeCd,
   nrNumber: string,
-  legalName: string,
-  expiry: string,
-  requestType: string,
+  requestType: NrRequestActionCodes,
   status: NameRequestStates,
-  applicant: NameRequestApplicantIF
 }
 
 export interface NrActionIF {
diff --git a/src/mixins/filing-template-mixin.ts b/src/mixins/filing-template-mixin.ts
index c74f9df5..13abfb83 100644
--- a/src/mixins/filing-template-mixin.ts
+++ b/src/mixins/filing-template-mixin.ts
@@ -2,14 +2,49 @@ import { Component } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { cloneDeep } from 'lodash'
 import { DateMixin } from '@/mixins/'
-import { AddressesIF, AlterationFilingIF, BusinessInformationIF, CertifyIF, CoopAlterationIF, CorrectionInformationIF,
-  CorrectionFilingIF, CourtOrderIF, EffectiveDateTimeIF, EntitySnapshotIF, ChgRegistrationFilingIF, ConversionFilingIF,
-  NameRequestIF, NameTranslationIF, OrgPersonIF, RestorationFilingIF, RestorationStateIF,
-  SpecialResolutionFilingIF, StateFilingRestorationIF, RulesMemorandumIF } from '@/interfaces/'
-import { CompletingPartyIF, ContactPointIF, NaicsIF, ShareClassIF, SpecialResolutionIF,
-  StaffPaymentIF } from '@bcrs-shared-components/interfaces/'
-import { ActionTypes, ApprovalTypes, CoopTypes, CorrectionErrorTypes, EffectOfOrders, FilingTypes, PartyTypes,
-  RelationshipTypes, RestorationTypes, RoleTypes } from '@/enums/'
+import {
+  AddressesIF,
+  AlterationFilingIF,
+  AuthInformationIF,
+  BusinessInformationIF,
+  CertifyIF,
+  ChgRegistrationFilingIF,
+  ConversionFilingIF,
+  CoopAlterationIF,
+  CorrectionFilingIF,
+  CorrectionInformationIF,
+  CourtOrderIF,
+  EffectiveDateTimeIF,
+  EntitySnapshotIF,
+  NameRequestIF,
+  NameTranslationIF,
+  OrgPersonIF,
+  RestorationFilingIF,
+  RestorationStateIF,
+  RulesMemorandumIF,
+  SpecialResolutionFilingIF,
+  StateFilingRestorationIF
+} from '@/interfaces/'
+import {
+  CompletingPartyIF,
+  ContactPointIF,
+  NaicsIF,
+  ShareClassIF,
+  SpecialResolutionIF,
+  StaffPaymentIF
+} from '@bcrs-shared-components/interfaces/'
+import {
+  ActionTypes,
+  ApprovalTypes,
+  CoopTypes,
+  CorrectionErrorTypes,
+  EffectOfOrders,
+  FilingTypes,
+  PartyTypes,
+  RelationshipTypes,
+  RestorationTypes,
+  RoleTypes
+} from '@/enums/'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { StaffPaymentOptions } from '@bcrs-shared-components/enums/'
 import { FilingTypeToName } from '@/utils'
@@ -24,94 +59,103 @@ export default class FilingTemplateMixin extends DateMixin {
   // Ref: https://pinia.vuejs.org/cookbook/options-api.html#giving-access-to-the-whole-store
 
   // Global getters
-  @Getter(useStore) getEntityType!: CorpTypeCd
-  @Getter(useStore) getNameRequestNumber!: string
-  @Getter(useStore) getNameRequestLegalName!: string
+  @Getter(useStore) areProvisionsRemoved!: boolean
+  @Getter(useStore) getAssociationType!: CoopTypes
+  @Getter(useStore) getBusinessContact!: ContactPointIF
   @Getter(useStore) getBusinessId!: string
+  @Getter(useStore) getCertifyState!: CertifyIF
+  @Getter(useStore) getCompletingParty!: CompletingPartyIF
   @Getter(useStore) getCurrentDate!: string
+  @Getter(useStore) getCurrentNaics!: NaicsIF
   @Getter(useStore) getCorrectedFilingDate!: string
   @Getter(useStore) getCorrectedFilingId!: number
   @Getter(useStore) getCorrectedFilingType!: FilingTypes
   @Getter(useStore) getCorrectionErrorType!: CorrectionErrorTypes
   @Getter(useStore) getCorrectionStartDate!: string
-  @Getter(useStore) getEffectiveDateTime!: EffectiveDateTimeIF
-  @Getter(useStore) getDocumentOptionalEmail: string
-  @Getter(useStore) hasBusinessNameChanged!: boolean
-  @Getter(useStore) hasBusinessTypeChanged!: boolean
-  @Getter(useStore) hasNaicsChanged!: boolean
-  @Getter(useStore) haveNameTranslationsChanged!: boolean
-  @Getter(useStore) hasShareStructureChanged!: boolean
-  @Getter(useStore) getOrgPeople!: OrgPersonIF[]
-  @Getter(useStore) getShareClasses!: ShareClassIF[]
-  @Getter(useStore) getFolioNumber!: string
-  @Getter(useStore) getTransactionalFolioNumber!: string
-  @Getter(useStore) getStaffPayment!: StaffPaymentIF
   @Getter(useStore) getDetailComment!: string
-  @Getter(useStore) getCurrentNaics!: NaicsIF
-  @Getter(useStore) getNameTranslations!: NameTranslationIF[]
-  @Getter(useStore) getNameRequest!: NameRequestIF
-  @Getter(useStore) getCertifyState!: CertifyIF
-  @Getter(useStore) getOfficeAddresses!: AddressesIF
-  @Getter(useStore) getBusinessContact!: ContactPointIF
+  @Getter(useStore) getDocumentOptionalEmail: string
+  @Getter(useStore) getEffectiveDateTime!: EffectiveDateTimeIF
   @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
-  @Getter(useStore) getNewResolutionDates!: string[]
-  @Getter(useStore) areProvisionsRemoved!: boolean
+  @Getter(useStore) getEntityType!: CorpTypeCd
   @Getter(useStore) getFileNumber!: string
+  @Getter(useStore) getFolioNumber!: string
   @Getter(useStore) getHasPlanOfArrangement!: boolean
-  @Getter(useStore) haveOfficeAddressesChanged!: boolean
-  @Getter(useStore) getCompletingParty!: CompletingPartyIF
-  @Getter(useStore) isBenBcCccUlcCorrectionFiling!: boolean
-  @Getter(useStore) isFirmCorrectionFiling!: boolean
-  @Getter(useStore) isClientErrorCorrection!: boolean
-  @Getter(useStore) getAssociationType!: CoopTypes
-  @Getter(useStore) hasAssociationTypeChanged!: boolean
-  @Getter(useStore) getSpecialResolution!: SpecialResolutionIF
-  @Getter(useStore) hasBusinessStartDateChanged!: boolean
+  @Getter(useStore) getLatestResolutionForBusiness!: SpecialResolutionIF
+  @Getter(useStore) getNameRequest!: NameRequestIF
+  @Getter(useStore) getNameRequestLegalName!: string
+  @Getter(useStore) getNameRequestNumber!: string
+  @Getter(useStore) getNameTranslations!: NameTranslationIF[]
+  @Getter(useStore) getNewResolutionDates!: string[]
+  @Getter(useStore) getOfficeAddresses!: AddressesIF
+  @Getter(useStore) getOrgPeople!: OrgPersonIF[]
+  @Getter(useStore) getOriginalAuthInfo!: AuthInformationIF
+  @Getter(useStore) getOriginalBusinessInfo!: BusinessInformationIF
+  @Getter(useStore) getOriginalLegalName!: string
+  @Getter(useStore) getOriginalLegalType!: CorpTypeCd
+  @Getter(useStore) getOriginalNameTranslations!: NameTranslationIF
+  @Getter(useStore) getOriginalNrNumber!: string
+  @Getter(useStore) getOriginalOfficeAddresses!: AddressesIF
+  @Getter(useStore) getOriginalOrgPersons!: OrgPersonIF[]
   @Getter(useStore) getRestoration!: RestorationStateIF
+  @Getter(useStore) getShareClasses!: ShareClassIF[]
+  @Getter(useStore) getSnapshotNaics!: NaicsIF
+  @Getter(useStore) getSpecialResolution!: SpecialResolutionIF
+  @Getter(useStore) getSpecialResolutionMemorandum!: RulesMemorandumIF
+  @Getter(useStore) getSpecialResolutionRules!: RulesMemorandumIF
+  @Getter(useStore) getStaffPayment!: StaffPaymentIF
   @Getter(useStore) getStateFilingRestoration!: StateFilingRestorationIF
-  @Getter(useStore) isLimitedRestorationToFull!: boolean
-  @Getter(useStore) isEntityTypeFirm!: boolean
+  @Getter(useStore) getTransactionalFolioNumber!: string
+  @Getter(useStore) hasAssociationTypeChanged!: boolean
+  @Getter(useStore) hasBusinessNameChanged!: boolean
+  @Getter(useStore) hasBusinessStartDateChanged!: boolean
+  @Getter(useStore) hasBusinessTypeChanged!: boolean
+  @Getter(useStore) hasNaicsChanged!: boolean
+  @Getter(useStore) hasShareStructureChanged!: boolean
   @Getter(useStore) hasSpecialResolutionMemorandumChanged!: boolean
+  @Getter(useStore) hasSpecialResolutionResolutionChanged!: boolean
   @Getter(useStore) hasSpecialResolutionRulesChanged!: boolean
-  @Getter(useStore) getSpecialResolutionMemorandum!: RulesMemorandumIF
-  @Getter(useStore) getSpecialResolutionRules!: RulesMemorandumIF
+  @Getter(useStore) haveNameTranslationsChanged!: boolean
+  @Getter(useStore) haveOfficeAddressesChanged!: boolean
+  @Getter(useStore) isBenBcCccUlcCorrectionFiling!: boolean
+  @Getter(useStore) isClientErrorCorrection!: boolean
   @Getter(useStore) isCoopCorrectionFiling!: boolean
-  @Getter(useStore) getLatestResolutionForBusiness!: SpecialResolutionIF
-  @Getter(useStore) hasSpecialResolutionResolutionChanged!: boolean
+  @Getter(useStore) isEntityTypeFirm!: boolean
+  @Getter(useStore) isFirmCorrectionFiling!: boolean
+  @Getter(useStore) isLimitedRestorationToFull!: boolean
 
   // Global actions
   @Action(useStore) setBusinessContact!: (x: ContactPointIF) => void
   @Action(useStore) setBusinessInformation!: (x: BusinessInformationIF) => void
   @Action(useStore) setCertifyState!: (x: CertifyIF) => void
   @Action(useStore) setCorrectionInformation!: (x: CorrectionInformationIF) => void
-  @Action(useStore) setEntityType!: (x: CorpTypeCd) => void
-  @Action(useStore) setOfficeAddresses!: (x: AddressesIF) => void
-  @Action(useStore) setNaics!: (x: NaicsIF) => void
-  @Action(useStore) setNameTranslations!: (x: NameTranslationIF[]) => void
-  @Action(useStore) setNameRequest!: (x: NameRequestIF) => void
-  @Action(useStore) setPeopleAndRoles!: (x: OrgPersonIF[]) => void
-  @Action(useStore) setShareClasses!: (x: ShareClassIF[]) => void
+  @Action(useStore) setCorrectionStartDate!: (x: string) => void
+  @Action(useStore) setDocumentOptionalEmail!: (x: string) => void
   @Action(useStore) setEffectiveDateTimeString!: (x: string) => void
-  @Action(useStore) setIsFutureEffective!: (x: boolean) => void
-  @Action(useStore) setFolioNumber!: (x: string) => void
-  @Action(useStore) setTransactionalFolioNumber!: (x: string) => void
-  @Action(useStore) setStaffPayment!: (x: StaffPaymentIF) => void
   @Action(useStore) setDetailComment!: (x: string) => void
   @Action(useStore) setEntitySnapshot!: (x: EntitySnapshotIF) => void
-  @Action(useStore) setDocumentOptionalEmail!: (x: string) => void
-  @Action(useStore) setProvisionsRemoved!: (x: boolean) => void
-  @Action(useStore) setNewResolutionDates!: (x: string[]) => void
+  @Action(useStore) setEntityType!: (x: CorpTypeCd) => void
   @Action(useStore) setFileNumber!: (x: string) => void
+  @Action(useStore) setFolioNumber!: (x: string) => void
   @Action(useStore) setHasPlanOfArrangement!: (x: boolean) => void
-  @Action(useStore) setSpecialResolution!: (x: SpecialResolutionIF) => void
-  @Action(useStore) setCorrectionStartDate!: (x: string) => void
+  @Action(useStore) setIsFutureEffective!: (x: boolean) => void
+  @Action(useStore) setNaics!: (x: NaicsIF) => void
+  @Action(useStore) setNameRequest!: (x: NameRequestIF) => void
+  @Action(useStore) setNameTranslations!: (x: NameTranslationIF[]) => void
+  @Action(useStore) setNewResolutionDates!: (x: string[]) => void
+  @Action(useStore) setOfficeAddresses!: (x: AddressesIF) => void
+  @Action(useStore) setPeopleAndRoles!: (x: OrgPersonIF[]) => void
+  @Action(useStore) setProvisionsRemoved!: (x: boolean) => void
   @Action(useStore) setRestorationApprovalType!: (x: ApprovalTypes) => void
   @Action(useStore) setRestorationCourtOrder!: (x: CourtOrderIF) => void
   @Action(useStore) setRestorationExpiryDate!: (x: string) => void
-  @Action(useStore) setRestorationType!: (x: RestorationTypes) => void
   @Action(useStore) setRestorationRelationships!: (x: RelationshipTypes[]) => void
+  @Action(useStore) setRestorationType!: (x: RestorationTypes) => void
+  @Action(useStore) setShareClasses!: (x: ShareClassIF[]) => void
+  @Action(useStore) setSpecialResolution!: (x: SpecialResolutionIF) => void
   @Action(useStore) setSpecialResolutionMemorandum!: (x: RulesMemorandumIF) => void
   @Action(useStore) setSpecialResolutionRules!: (x: RulesMemorandumIF) => void
+  @Action(useStore) setStaffPayment!: (x: StaffPaymentIF) => void
+  @Action(useStore) setTransactionalFolioNumber!: (x: string) => void
 
   /** The default (hard-coded first line) correction detail comment. */
   public get defaultCorrectionDetailComment (): string {
@@ -138,10 +182,10 @@ export default class FilingTemplateMixin extends DateMixin {
         folioNumber: this.getFolioNumber // folio number, unless overridden below
       },
       business: {
-        foundingDate: this.getEntitySnapshot.businessInfo.foundingDate,
-        identifier: this.getEntitySnapshot.businessInfo.identifier,
-        legalName: this.getEntitySnapshot.businessInfo.legalName,
-        legalType: this.getEntitySnapshot.businessInfo.legalType
+        foundingDate: this.getOriginalBusinessInfo?.foundingDate,
+        identifier: this.getOriginalBusinessInfo?.identifier,
+        legalName: this.getOriginalLegalName,
+        legalType: this.getOriginalLegalType
       },
       correction: {
         legalType: this.getEntityType,
@@ -277,10 +321,10 @@ export default class FilingTemplateMixin extends DateMixin {
         folioNumber: this.getFolioNumber // business folio number, unless overridden below
       },
       business: {
-        foundingDate: this.getEntitySnapshot.businessInfo.foundingDate,
-        identifier: this.getEntitySnapshot.businessInfo.identifier,
-        legalName: this.getEntitySnapshot.businessInfo.legalName,
-        legalType: this.getEntitySnapshot.businessInfo.legalType
+        foundingDate: this.getOriginalBusinessInfo?.foundingDate,
+        identifier: this.getOriginalBusinessInfo?.identifier,
+        legalName: this.getOriginalLegalName,
+        legalType: this.getOriginalLegalType
       },
       alteration: {
         business: {
@@ -363,10 +407,10 @@ export default class FilingTemplateMixin extends DateMixin {
         folioNumber: this.getFolioNumber // business folio number, unless overridden below
       },
       business: {
-        foundingDate: this.getEntitySnapshot.businessInfo.foundingDate,
-        identifier: this.getEntitySnapshot.businessInfo.identifier,
-        legalName: this.getEntitySnapshot.businessInfo.legalName,
-        legalType: this.getEntitySnapshot.businessInfo.legalType
+        foundingDate: this.getOriginalBusinessInfo?.foundingDate,
+        identifier: this.getOriginalBusinessInfo?.identifier,
+        legalName: this.getOriginalLegalName,
+        legalType: this.getOriginalLegalType
       },
       restoration: {
         approvalType: this.getRestoration.approvalType,
@@ -399,8 +443,8 @@ export default class FilingTemplateMixin extends DateMixin {
       } else {
         // Otherwise save default data
         filing.restoration.nameRequest = {
-          legalName: this.getEntitySnapshot.businessInfo.legalName,
-          legalType: this.getEntitySnapshot.businessInfo.legalType
+          legalName: this.getOriginalLegalName,
+          legalType: this.getOriginalLegalType
         }
       }
     }
@@ -453,11 +497,11 @@ export default class FilingTemplateMixin extends DateMixin {
         folioNumber: this.getFolioNumber // business folio number, unless overridden below
       },
       business: {
-        foundingDate: this.getEntitySnapshot.businessInfo.foundingDate,
-        identifier: this.getEntitySnapshot.businessInfo.identifier,
-        legalName: this.getEntitySnapshot.businessInfo.legalName,
-        legalType: this.getEntitySnapshot.businessInfo.legalType,
-        nrNumber: this.getEntitySnapshot.businessInfo.nrNumber
+        foundingDate: this.getOriginalBusinessInfo?.foundingDate,
+        identifier: this.getOriginalBusinessInfo?.identifier,
+        legalName: this.getOriginalLegalName,
+        legalType: this.getOriginalLegalType,
+        nrNumber: this.getOriginalBusinessInfo?.nrNumber
       },
       specialResolution: {
         ...this.getSpecialResolution
@@ -545,10 +589,10 @@ export default class FilingTemplateMixin extends DateMixin {
         folioNumber: this.getFolioNumber // business folio number, unless overridden below
       },
       business: {
-        foundingDate: this.getEntitySnapshot.businessInfo.foundingDate,
-        identifier: this.getEntitySnapshot.businessInfo.identifier,
-        legalName: this.getEntitySnapshot.businessInfo.legalName,
-        legalType: this.getEntitySnapshot.businessInfo.legalType
+        foundingDate: this.getOriginalBusinessInfo?.foundingDate,
+        identifier: this.getOriginalBusinessInfo?.identifier,
+        legalName: this.getOriginalLegalName,
+        legalType: this.getOriginalLegalType
       },
       changeOfRegistration: {
         business: {
@@ -644,10 +688,10 @@ export default class FilingTemplateMixin extends DateMixin {
         folioNumber: '' // not applicable to SP/GP
       },
       business: {
-        foundingDate: this.getEntitySnapshot.businessInfo.foundingDate,
-        identifier: this.getEntitySnapshot.businessInfo.identifier,
-        legalName: this.getEntitySnapshot.businessInfo.legalName,
-        legalType: this.getEntitySnapshot.businessInfo.legalType
+        foundingDate: this.getOriginalBusinessInfo?.foundingDate,
+        identifier: this.getOriginalBusinessInfo?.identifier,
+        legalName: this.getOriginalLegalName,
+        legalType: this.getOriginalLegalType
       },
       conversion: {
         business: {
@@ -733,7 +777,7 @@ export default class FilingTemplateMixin extends DateMixin {
     // store Business Information for BEN/BC/CCC/ULC corrections
     if (this.isBenBcCccUlcCorrectionFiling) {
       this.setBusinessInformation({
-        ...entitySnapshot.businessInfo,
+        ...this.getOriginalBusinessInfo,
         ...filing.business,
         ...filing.correction.business
       })
@@ -741,17 +785,17 @@ export default class FilingTemplateMixin extends DateMixin {
 
     if (this.isCoopCorrectionFiling) {
       this.setBusinessInformation({
-        ...entitySnapshot.businessInfo,
+        ...this.getOriginalBusinessInfo,
         ...filing.business,
         ...filing.correction.business,
-        associationType: filing.correction.cooperativeAssociationType || entitySnapshot.businessInfo.associationType
+        associationType: filing.correction.cooperativeAssociationType || this.getOriginalBusinessInfo?.associationType
       })
     }
 
     // store Business Information for firm corrections
     if (this.isFirmCorrectionFiling) {
       this.setBusinessInformation({
-        ...entitySnapshot.businessInfo,
+        ...this.getOriginalBusinessInfo,
         ...filing.business,
         ...filing.correction.business
       })
@@ -763,10 +807,7 @@ export default class FilingTemplateMixin extends DateMixin {
       if (filing.correction.business?.naics) {
         this.setNaics({ ...filing.correction.business.naics })
       } else {
-        this.setNaics({
-          naicsCode: entitySnapshot.businessInfo.naicsCode,
-          naicsDescription: entitySnapshot.businessInfo.naicsDescription
-        })
+        this.setNaics(this.getSnapshotNaics)
       }
     }
 
@@ -774,9 +815,9 @@ export default class FilingTemplateMixin extends DateMixin {
     this.setNameRequest(cloneDeep(
       filing.correction.nameRequest ||
       {
-        legalType: entitySnapshot.businessInfo.legalType,
-        legalName: entitySnapshot.businessInfo.legalName,
-        nrNumber: entitySnapshot.businessInfo.nrNumber
+        legalType: this.getOriginalLegalType,
+        legalName: this.getOriginalLegalName,
+        nrNumber: this.getOriginalNrNumber
       }
     ))
 
@@ -808,7 +849,7 @@ export default class FilingTemplateMixin extends DateMixin {
     // store Office Addresses
     this.setOfficeAddresses(cloneDeep(
       filing.correction.offices ||
-      entitySnapshot.addresses
+      this.getOriginalOfficeAddresses
     ))
 
     // store current Business Contact
@@ -873,11 +914,11 @@ export default class FilingTemplateMixin extends DateMixin {
     this.setEntitySnapshot(entitySnapshot)
 
     // store Entity Type
-    this.setEntityType(filing.alteration.business?.legalType || entitySnapshot.businessInfo.legalType)
+    this.setEntityType(filing.alteration.business?.legalType || this.getOriginalLegalType)
 
     // store Business Information
     this.setBusinessInformation({
-      ...entitySnapshot.businessInfo,
+      ...this.getOriginalBusinessInfo,
       ...filing.business,
       ...filing.alteration.business
     })
@@ -886,9 +927,9 @@ export default class FilingTemplateMixin extends DateMixin {
     this.setNameRequest(cloneDeep(
       filing.alteration.nameRequest ||
       {
-        legalType: entitySnapshot.businessInfo.legalType,
-        legalName: entitySnapshot.businessInfo.legalName,
-        nrNumber: entitySnapshot.businessInfo.nrNumber
+        legalType: this.getOriginalLegalType,
+        legalName: this.getOriginalLegalName,
+        nrNumber: this.getOriginalNrNumber
       }
     ))
 
@@ -903,7 +944,7 @@ export default class FilingTemplateMixin extends DateMixin {
     if (filing.alteration.provisionsRemoved) this.setProvisionsRemoved(true)
 
     // store Office Addresses **from snapshot** (because we don't change office addresses in an alteration)
-    this.setOfficeAddresses(cloneDeep(entitySnapshot.addresses))
+    this.setOfficeAddresses(cloneDeep(this.getOriginalOfficeAddresses))
 
     // store People And Roles **from snapshot** (because we don't change people and roles in an alteration)
     this.setPeopleAndRoles(cloneDeep(entitySnapshot.orgPersons))
@@ -956,15 +997,12 @@ export default class FilingTemplateMixin extends DateMixin {
    * @param filing the restoration filing
    */
   parseRestorationFiling (filing: RestorationFilingIF): void {
-    // Get the Entity Snapshot from store
-    const entitySnapshot = this.getEntitySnapshot
-
     // store Entity Type
-    this.setEntityType(filing.restoration.business?.legalType || entitySnapshot.businessInfo.legalType)
+    this.setEntityType(filing.restoration.business?.legalType || this.getOriginalLegalType)
 
     // store Business Information
     this.setBusinessInformation({
-      ...entitySnapshot.businessInfo,
+      ...this.getOriginalBusinessInfo,
       ...filing.business,
       ...filing.restoration.business
     })
@@ -991,9 +1029,9 @@ export default class FilingTemplateMixin extends DateMixin {
     this.setNameRequest(cloneDeep(
       filing.restoration.nameRequest ||
       {
-        legalType: entitySnapshot.businessInfo.legalType,
-        legalName: entitySnapshot.businessInfo.legalName,
-        nrNumber: entitySnapshot.businessInfo.nrNumber
+        legalType: this.getOriginalLegalType,
+        legalName: this.getOriginalLegalName,
+        nrNumber: this.getOriginalNrNumber
       }
     ))
 
@@ -1005,24 +1043,26 @@ export default class FilingTemplateMixin extends DateMixin {
     // store Name Translations
     this.setNameTranslations(cloneDeep(
       this.mapNameTranslations(filing.restoration.nameTranslations) ||
-      this.mapNameTranslations(entitySnapshot.nameTranslations) ||
+      this.mapNameTranslations(this.getOriginalNameTranslations) ||
       []
     ))
 
     // store Office Addresses
     this.setOfficeAddresses(cloneDeep(
       filing.restoration.offices ||
-      entitySnapshot.addresses
+      this.getOriginalOfficeAddresses ||
+      null
     ))
 
     // store People And Roles
     this.setPeopleAndRoles(cloneDeep(
       filing.restoration.parties ||
-      entitySnapshot.orgPersons
+      this.getOriginalOrgPersons ||
+      []
     ))
 
     // store current Business Contact
-    this.setBusinessContact({ ...entitySnapshot.authInfo.contact })
+    this.setBusinessContact({ ...this.getOriginalAuthInfo?.contact })
 
     // store Certify State
     this.setCertifyState({
@@ -1032,7 +1072,7 @@ export default class FilingTemplateMixin extends DateMixin {
 
     // store Folio Number
     // FUTURE: should we store correction.folioNumber instead?
-    this.setFolioNumber(entitySnapshot.authInfo.folioNumber || '')
+    this.setFolioNumber(this.getOriginalAuthInfo?.folioNumber || '')
 
     // if Transactional Folio Number was saved then store it
     if (filing.header.isTransactionalFolioNumber) {
@@ -1062,23 +1102,23 @@ export default class FilingTemplateMixin extends DateMixin {
     // NB: filing.alteration object may not be present
 
     // store Entity Type
-    this.setEntityType(filing.alteration?.business?.legalType || entitySnapshot.businessInfo.legalType)
+    this.setEntityType(filing.alteration?.business?.legalType || this.getOriginalLegalType)
 
     // store Business Information
     this.setBusinessInformation({
-      ...entitySnapshot.businessInfo,
+      ...this.getOriginalBusinessInfo,
       ...filing.business,
       ...filing.alteration?.business,
-      associationType: filing.alteration?.cooperativeAssociationType || entitySnapshot.businessInfo.associationType
+      associationType: filing.alteration?.cooperativeAssociationType || this.getOriginalBusinessInfo?.associationType
     })
 
     // store Name Request data
     this.setNameRequest(cloneDeep(
       filing.changeOfName?.nameRequest ||
       {
-        legalType: entitySnapshot.businessInfo.legalType,
-        legalName: entitySnapshot.businessInfo.legalName,
-        nrNumber: entitySnapshot.businessInfo.nrNumber
+        legalType: this.getOriginalLegalType,
+        legalName: this.getOriginalLegalName,
+        nrNumber: this.getOriginalNrNumber
       }
     ))
 
@@ -1087,7 +1127,7 @@ export default class FilingTemplateMixin extends DateMixin {
     this.setSpecialResolution(cloneDeep(filing.specialResolution))
 
     // store Office Addresses **from snapshot** (because we don't change office addresses in an special resolution)
-    this.setOfficeAddresses(cloneDeep(entitySnapshot.addresses))
+    this.setOfficeAddresses(cloneDeep(this.getOriginalOfficeAddresses))
 
     // store People And Roles **from snapshot** (because we don't change people and roles in an special resolution)
     this.setPeopleAndRoles(cloneDeep(entitySnapshot.orgPersons))
@@ -1127,11 +1167,11 @@ export default class FilingTemplateMixin extends DateMixin {
     this.setEntitySnapshot(entitySnapshot)
 
     // store Entity Type
-    this.setEntityType(filing.business?.legalType || entitySnapshot.businessInfo.legalType)
+    this.setEntityType(filing.business?.legalType || this.getOriginalLegalType)
 
     // store Business Information
     this.setBusinessInformation({
-      ...entitySnapshot.businessInfo,
+      ...this.getOriginalBusinessInfo,
       ...filing.business
     })
 
@@ -1145,9 +1185,9 @@ export default class FilingTemplateMixin extends DateMixin {
     this.setNameRequest(cloneDeep(
       filing.changeOfRegistration.nameRequest ||
       {
-        legalType: entitySnapshot.businessInfo.legalType,
-        legalName: entitySnapshot.businessInfo.legalName,
-        nrNumber: entitySnapshot.businessInfo.nrNumber
+        legalType: this.getOriginalLegalType,
+        legalName: this.getOriginalLegalName,
+        nrNumber: this.getOriginalNrNumber
       }
     ))
 
@@ -1158,7 +1198,7 @@ export default class FilingTemplateMixin extends DateMixin {
     }
     this.setOfficeAddresses(cloneDeep(
       addresses ||
-      entitySnapshot.addresses
+      this.getOriginalOfficeAddresses
     ))
 
     // store People And Roles
@@ -1211,11 +1251,11 @@ export default class FilingTemplateMixin extends DateMixin {
     this.setEntitySnapshot(entitySnapshot)
 
     // store Entity Type
-    this.setEntityType(filing.business?.legalType || entitySnapshot.businessInfo.legalType)
+    this.setEntityType(filing.business?.legalType || this.getOriginalLegalType)
 
     // store Business Information
     this.setBusinessInformation({
-      ...entitySnapshot.businessInfo,
+      ...this.getOriginalBusinessInfo,
       ...filing.business
     })
 
@@ -1229,9 +1269,9 @@ export default class FilingTemplateMixin extends DateMixin {
     this.setNameRequest(cloneDeep(
       filing.conversion.nameRequest ||
       {
-        legalType: entitySnapshot.businessInfo.legalType,
-        legalName: entitySnapshot.businessInfo.legalName,
-        nrNumber: entitySnapshot.businessInfo.nrNumber
+        legalType: this.getOriginalLegalType,
+        legalName: this.getOriginalLegalName,
+        nrNumber: this.getOriginalNrNumber
       }
     ))
 
@@ -1242,7 +1282,7 @@ export default class FilingTemplateMixin extends DateMixin {
     }
     this.setOfficeAddresses(cloneDeep(
       addresses ||
-      entitySnapshot.addresses
+      this.getOriginalOfficeAddresses
     ))
 
     // store People And Roles
@@ -1277,16 +1317,16 @@ export default class FilingTemplateMixin extends DateMixin {
     this.setFolioNumber(entitySnapshot.authInfo.folioNumber || '')
 
     // store Entity Type
-    this.setEntityType(entitySnapshot.businessInfo.legalType)
+    this.setEntityType(this.getOriginalLegalType)
 
     // store Business Information
-    this.setBusinessInformation({ ...entitySnapshot.businessInfo })
+    this.setBusinessInformation({ ...this.getOriginalBusinessInfo })
 
     // store Name Request data
     this.setNameRequest({
-      legalType: entitySnapshot.businessInfo.legalType,
-      legalName: entitySnapshot.businessInfo.legalName,
-      nrNumber: entitySnapshot.businessInfo.nrNumber
+      legalType: this.getOriginalLegalType,
+      legalName: this.getOriginalLegalName,
+      nrNumber: this.getOriginalNrNumber
     })
 
     // store People and Roles
@@ -1296,10 +1336,10 @@ export default class FilingTemplateMixin extends DateMixin {
     this.setBusinessContact({ ...entitySnapshot.authInfo.contact })
 
     // store Office Addresses
-    this.setOfficeAddresses(cloneDeep(entitySnapshot.addresses))
+    this.setOfficeAddresses(cloneDeep(this.getOriginalOfficeAddresses))
 
     // handle entity-specific values
-    switch (entitySnapshot.businessInfo.legalType) {
+    switch (this.getOriginalLegalType) {
       case CorpTypeCd.BENEFIT_COMPANY:
       case CorpTypeCd.BC_COMPANY:
       case CorpTypeCd.BC_CCC:
diff --git a/src/store/store.ts b/src/store/store.ts
index 116363ea..02bdfe19 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -36,7 +36,12 @@ import {
   ShareClassIF,
   StateIF,
   StateFilingRestorationIF,
-  ValidationFlagsIF } from '@/interfaces/'
+  TombStoneIF,
+  ValidationFlagsIF,
+  ShareStructureIF,
+  AuthInformationIF,
+  BusinessDocumentsIF
+} from '@/interfaces/'
 import {
   CompletingPartyIF,
   ContactPointIF,
@@ -60,9 +65,14 @@ export const useStore = defineStore('store', {
   // convert to a function
   state: (): StateIF => ({ resourceModel, stateModel }),
   getters: {
+    /** The tombstone data. */
+    getTombstone (): TombStoneIF {
+      return this.stateModel.tombstone
+    },
+
     /** Whether the user has "staff" Keycloak role. */
     isRoleStaff (): boolean {
-      return this.stateModel.tombstone.keycloakRoles.includes('staff')
+      return this.getTombstone.keycloakRoles.includes('staff')
     },
 
     /** Whether the current account is SBC Staff. */
@@ -72,32 +82,32 @@ export const useStore = defineStore('store', {
 
     /** Whether the current filing is a Correction. */
     isCorrectionFiling (): boolean {
-      return (this.stateModel.tombstone.filingType === FilingTypes.CORRECTION)
+      return (this.getTombstone.filingType === FilingTypes.CORRECTION)
     },
 
     /** Whether the current filing is an Alteration. */
     isAlterationFiling (): boolean {
-      return (this.stateModel.tombstone.filingType === FilingTypes.ALTERATION)
+      return (this.getTombstone.filingType === FilingTypes.ALTERATION)
     },
 
     /** Whether the current filing is a Special Resolution. */
     isSpecialResolutionFiling (): boolean {
-      return (this.stateModel.tombstone.filingType === FilingTypes.SPECIAL_RESOLUTION)
+      return (this.getTombstone.filingType === FilingTypes.SPECIAL_RESOLUTION)
     },
 
     /** Whether the current filing is a Change of Registration. */
     isChangeRegFiling (): boolean {
-      return (this.stateModel.tombstone.filingType === FilingTypes.CHANGE_OF_REGISTRATION)
+      return (this.getTombstone.filingType === FilingTypes.CHANGE_OF_REGISTRATION)
     },
 
     /** Whether the current filing is a Conversion. */
     isConversionFiling (): boolean {
-      return (this.stateModel.tombstone.filingType === FilingTypes.CONVERSION)
+      return (this.getTombstone.filingType === FilingTypes.CONVERSION)
     },
 
     /** Whether the current filing is a Restoration. */
     isRestorationFiling (): boolean {
-      return (this.stateModel.tombstone.filingType === FilingTypes.RESTORATION)
+      return (this.getTombstone.filingType === FilingTypes.RESTORATION)
     },
 
     /** Whether the current filing is a Limited Restoration Extension. */
@@ -150,31 +160,92 @@ export const useStore = defineStore('store', {
       return (this.getCorrectedFilingType === FilingTypes.CHANGE_OF_REGISTRATION)
     },
 
-    /** The original entity type, this is for entity type alteration */
-    getOriginLegalType (): CorpTypeCd {
-      return this.getEntitySnapshot?.businessInfo?.legalType
+    /** The entity snapshot (ie, original data). NB: may be null. */
+    getEntitySnapshot (): EntitySnapshotIF {
+      return this.stateModel.entitySnapshot
+    },
+
+    /** The original auth info. */
+    getOriginalAuthInfo (): AuthInformationIF {
+      return this.getEntitySnapshot?.authInfo || null
+    },
+
+    /** The original business documents. */
+    getOriginalBusinessDocuments (): BusinessDocumentsIF {
+      return this.getEntitySnapshot?.businessDocuments || null
+    },
+
+    /** The original business info. */
+    getOriginalBusinessInfo (): BusinessInformationIF {
+      return this.getEntitySnapshot?.businessInfo || null
+    },
+
+    /** The original legal name (or operating name if this is a firm). */
+    getOriginalLegalName (): string {
+      if (this.isFirm) {
+        // return the operating name, if it exists
+        const businessInfo = this.getOriginalBusinessInfo
+        const alternateName = businessInfo?.alternateNames?.find(x => x.identifier === businessInfo.identifier)
+        return alternateName?.operatingName || 'Unknown'
+      }
+      return this.getOriginalBusinessInfo?.legalName || 'Unknown'
+    },
+
+    /** The original entity type. */
+    getOriginalLegalType (): CorpTypeCd {
+      return this.getOriginalBusinessInfo?.legalType || null
+    },
+
+    /** The original name translations. */
+    getOriginalNameTranslations (): NameTranslationIF[] {
+      return this.getEntitySnapshot?.nameTranslations || null
+    },
+
+    /** The original NR number. */
+    getOriginalNrNumber (): string {
+      return this.getOriginalBusinessInfo?.nrNumber || null
+    },
+
+    /** The office addresses from the original filing. NB: may be {}. */
+    getOriginalOfficeAddresses (): AddressesIF {
+      return this.getEntitySnapshot?.addresses || null
+    },
+
+    /** The original org-person (aka org-people aka parties) list. */
+    getOriginalOrgPersons (): OrgPersonIF[] {
+      return this.getEntitySnapshot?.orgPersons || null
+    },
+
+    /** The original resolution dates. */
+    getOriginalResolutions (): ResolutionsIF[] {
+      return this.getEntitySnapshot?.resolutions || null
+    },
+
+    /** The original share structures. */
+    getOriginalShareStructure (): ShareStructureIF {
+      return this.getEntitySnapshot?.shareStructure || null
     },
 
     // Original entity type getters
     isOriginBcCompany (): boolean {
-      return (this.getOriginLegalType === CorpTypeCd.BC_COMPANY)
+      return (this.getOriginalLegalType === CorpTypeCd.BC_COMPANY)
     },
 
     isOriginBenefitCompany (): boolean {
-      return (this.getOriginLegalType === CorpTypeCd.BENEFIT_COMPANY)
+      return (this.getOriginalLegalType === CorpTypeCd.BENEFIT_COMPANY)
     },
 
     isOriginBcUlcCompany (): boolean {
-      return (this.getOriginLegalType === CorpTypeCd.BC_ULC_COMPANY)
+      return (this.getOriginalLegalType === CorpTypeCd.BC_ULC_COMPANY)
     },
 
     isOriginBcCcc (): boolean {
-      return (this.getOriginLegalType === CorpTypeCd.BC_CCC)
+      return (this.getOriginalLegalType === CorpTypeCd.BC_CCC)
     },
 
     /** The entity type. */
     getEntityType (): CorpTypeCd {
-      return this.stateModel.tombstone.entityType
+      return this.getTombstone.entityType
     },
 
     /** Whether the entity is a Benefit Company. */
@@ -259,7 +330,7 @@ export const useStore = defineStore('store', {
 
     /** The current date in format (YYYY-MM-DD), which is refreshed every time the app inits. */
     getCurrentDate (): string {
-      return this.stateModel.tombstone.currentDate
+      return this.getTombstone.currentDate
     },
 
     /** The current JS Date object, which is refreshed every minute. */
@@ -269,7 +340,7 @@ export const useStore = defineStore('store', {
 
     /** The filing id. */
     getFilingId (): number {
-      return this.stateModel.tombstone.filingId
+      return this.getTombstone.filingId
     },
 
     /** The corrected filing's date (API format). */
@@ -304,18 +375,7 @@ export const useStore = defineStore('store', {
 
     /** The business identifier (aka incorporation number). */
     getBusinessId (): string {
-      return this.stateModel.tombstone.businessId
-    },
-
-    /** The original legal name (or operating name if this is a firm). */
-    getOriginalLegalName (): string {
-      if (this.isFirm) {
-        // return the operating name, if it exists
-        const businessInfo = this.getEntitySnapshot?.businessInfo
-        const alternateName = businessInfo?.alternateNames?.find(x => x.identifier === businessInfo.identifier)
-        return alternateName?.operatingName || 'Unknown'
-      }
-      return this.getEntitySnapshot?.businessInfo?.legalName
+      return this.getTombstone.businessId
     },
 
     /** The appropriate edit label for corrections, alterations, change or conversion filings. */
@@ -368,11 +428,6 @@ export const useStore = defineStore('store', {
       return 'Edits Saved' // should never happen
     },
 
-    /** The original entity snapshot. */
-    getEntitySnapshot (): EntitySnapshotIF {
-      return this.stateModel.entitySnapshot
-    },
-
     /** The original entity snapshot state filing's URL. */
     getStateFilingUrl (): string {
       return this.stateModel.entitySnapshot?.businessInfo?.stateFiling
@@ -381,22 +436,22 @@ export const useStore = defineStore('store', {
     /** The business number. */
     getBusinessNumber (): string {
       // remove first 2 chars from Business ID
-      return this.stateModel.tombstone.businessId?.substring(2)
+      return this.getTombstone.businessId?.substring(2)
     },
 
     /** The current user's info. (May be null.) */
     getUserInfo (): any {
-      return this.stateModel.tombstone.userInfo
+      return this.getTombstone.userInfo
     },
 
     /** The current user's keycloak roles. */
     getKeycloakRoles (): Array<string> {
-      return this.stateModel.tombstone.keycloakRoles
+      return this.getTombstone.keycloakRoles
     },
 
     /** The org info. (May be null.) */
     getOrgInfo (): any {
-      return this.stateModel.tombstone.orgInfo
+      return this.getTombstone.orgInfo
     },
 
     /** The current user's email. (May be undefined.) */
@@ -430,12 +485,12 @@ export const useStore = defineStore('store', {
 
     /** The business folio number. */
     getFolioNumber (): string {
-      return this.stateModel.tombstone.folioNumber
+      return this.getTombstone.folioNumber
     },
 
     /** The transactional folio number. */
     getTransactionalFolioNumber (): string {
-      return this.stateModel.tombstone.transactionalFolioNumber
+      return this.getTombstone.transactionalFolioNumber
     },
 
     /** The current NAICS object. */
@@ -449,8 +504,8 @@ export const useStore = defineStore('store', {
     /** The snapshot NAICS object. */
     getSnapshotNaics (): NaicsIF {
       return {
-        naicsCode: this.getEntitySnapshot?.businessInfo?.naicsCode,
-        naicsDescription: this.getEntitySnapshot?.businessInfo?.naicsDescription
+        naicsCode: this.getOriginalBusinessInfo?.naicsCode,
+        naicsDescription: this.getOriginalBusinessInfo?.naicsDescription
       }
     },
 
@@ -489,7 +544,7 @@ export const useStore = defineStore('store', {
       return this.stateModel.officeAddresses
     },
 
-    /** The org-people list. */
+    /** The org-people (aka parties) list. */
     getOrgPeople (): Array<OrgPersonIF> {
       return this.stateModel.peopleAndRoles.orgPeople
     },
@@ -506,12 +561,12 @@ export const useStore = defineStore('store', {
 
     /** Whether we are ignoring data changes. */
     ignoreChanges (): boolean {
-      return this.stateModel.tombstone.ignoreChanges
+      return this.getTombstone.ignoreChanges
     },
 
     /** Whether there are unsaved data changes. */
     haveUnsavedChanges (): boolean {
-      return this.stateModel.tombstone.haveUnsavedChanges
+      return this.getTombstone.haveUnsavedChanges
     },
 
     /** The staff payment. */
@@ -531,17 +586,17 @@ export const useStore = defineStore('store', {
 
     /** Whether app is busy saving. */
     isSaving (): boolean {
-      return this.stateModel.tombstone.isSaving
+      return this.getTombstone.isSaving
     },
 
     /** Whether app is busy saving and resuming. */
     isSavingResuming (): boolean {
-      return this.stateModel.tombstone.isSavingResuming
+      return this.getTombstone.isSavingResuming
     },
 
     /** Whether app is busy filing and paying. */
     isFilingPaying (): boolean {
-      return this.stateModel.tombstone.isFilingPaying
+      return this.getTombstone.isFilingPaying
     },
 
     /**
@@ -855,18 +910,18 @@ export const useStore = defineStore('store', {
 
     /** Whether business name has changed by type change. */
     isNameChangedByType (): boolean {
-      return this.stateModel.tombstone.nameChangedByType
+      return this.getTombstone.nameChangedByType
     },
 
     /** Whether business type has changed by name change. */
     isEntityTypeChangedByName (): boolean {
-      return this.stateModel.tombstone.entityTypeChangedByName
+      return this.getTombstone.entityTypeChangedByName
     },
 
     /** Whether business type has changed. */
     hasBusinessTypeChanged (): boolean {
       const currentEntityType = this.getEntityType
-      const originalLegalType = this.getEntitySnapshot?.businessInfo?.legalType
+      const originalLegalType = this.getOriginalBusinessInfo?.legalType
 
       return (currentEntityType !== originalLegalType)
     },
@@ -879,7 +934,7 @@ export const useStore = defineStore('store', {
     /** Whether association type has changed. */
     hasAssociationTypeChanged (): boolean {
       const currentAssociationType = this.getAssociationType
-      const originalAssociationType = this.getEntitySnapshot?.businessInfo?.associationType
+      const originalAssociationType = this.getOriginalBusinessInfo?.associationType
 
       return (currentAssociationType !== originalAssociationType)
     },
@@ -887,7 +942,7 @@ export const useStore = defineStore('store', {
     /** Whether contact info data has changed. */
     hasContactInfoChanged (): boolean {
       const businessContact = this.getBusinessContact
-      const snapshotContact = this.getEntitySnapshot?.authInfo?.contact
+      const snapshotContact = this.getOriginalAuthInfo?.contact
 
       return (
         (businessContact?.email !== snapshotContact?.email) ||
@@ -917,11 +972,6 @@ export const useStore = defineStore('store', {
       return false
     },
 
-    /** The office addresses from the original filing. NB: may be {} */
-    getOriginalOfficeAddresses (): AddressesIF {
-      return this.getEntitySnapshot?.addresses
-    },
-
     /** True if (registered) mailing address has changed. */
     hasMailingChanged (): boolean {
       if (
@@ -1029,7 +1079,7 @@ export const useStore = defineStore('store', {
       }
 
       const currentOrgPersons = this.getOrgPeople?.map(op => normalize(op))
-      const originalOrgPersons = this.getEntitySnapshot?.orgPersons?.map(op => normalize(op))
+      const originalOrgPersons = this.getOriginalOrgPersons?.map(op => normalize(op))
 
       return !IsSame(currentOrgPersons, originalOrgPersons, ['actions', 'confirmNameChange'])
     },
@@ -1037,7 +1087,7 @@ export const useStore = defineStore('store', {
     /** Whether share structure data has changed. */
     hasShareStructureChanged (): boolean {
       let currentShareClasses = this.getShareClasses
-      let originalShareClasses = this.getEntitySnapshot?.shareStructure?.shareClasses
+      let originalShareClasses = this.getOriginalShareStructure?.shareClasses
 
       // Null action properties can be assigned to the ShareClasses when cancelling edits
       // This is fail safe to ensure null actions are not included in the comparison
@@ -1059,7 +1109,7 @@ export const useStore = defineStore('store', {
     /** Whether NAICS data has changed. */
     hasNaicsChanged (): boolean {
       const currentNaicsCode = this.getBusinessInformation.naicsCode
-      const originalNaicsCode = this.getEntitySnapshot?.businessInfo?.naicsCode
+      const originalNaicsCode = this.getOriginalBusinessInfo?.naicsCode
 
       // first try to compare codes
       if (currentNaicsCode || originalNaicsCode) {
@@ -1067,7 +1117,7 @@ export const useStore = defineStore('store', {
       }
 
       const currentNaicsDescription = this.getBusinessInformation.naicsDescription
-      const originalNaicsDescription = this.getEntitySnapshot?.businessInfo?.naicsDescription
+      const originalNaicsDescription = this.getOriginalBusinessInfo?.naicsDescription
 
       // then try to compare descriptions
       if (currentNaicsDescription || originalNaicsDescription) {
@@ -1082,11 +1132,6 @@ export const useStore = defineStore('store', {
       return (this.stateModel.newAlteration.provisionsRemoved === true)
     },
 
-    /** The original resolution dates. */
-    getOriginalResolutions (): ResolutionsIF[] {
-      return this.getEntitySnapshot?.resolutions
-    },
-
     /** The new resolution dates. */
     getNewResolutionDates (): string[] {
       return this.stateModel.shareStructureStep.resolutionDates
@@ -1112,7 +1157,7 @@ export const useStore = defineStore('store', {
     },
 
     /** True if the share structure contains any special rights of restrictions. */
-    getHasRightsOrRestrictions (): any {
+    getHasRightsOrRestrictions (): boolean {
       const shareClasses = this.stateModel.shareStructureStep.shareClasses
 
       // Search and return on the first match
@@ -1121,12 +1166,12 @@ export const useStore = defineStore('store', {
     },
 
     /** True if the share structure contains any special rights of restrictions. */
-    getHasOriginalRightsOrRestrictions (): any {
-      const shareClasses = this.getEntitySnapshot?.shareStructure?.shareClasses
+    getHasOriginalRightsOrRestrictions (): boolean {
+      const shareClasses = this.getOriginalShareStructure?.shareClasses
 
       // Search and return on the first match
       // Don't need to search Series, as they can't exist on a parent without rights or restrictions
-      return shareClasses?.some(shareClass => shareClass.hasRightsOrRestrictions)
+      return shareClasses?.some(shareClass => shareClass.hasRightsOrRestrictions) || false
     },
 
     /** True if resolution dates are valid. */
@@ -1299,15 +1344,17 @@ export const useStore = defineStore('store', {
     },
 
     hasSpecialResolutionRulesChanged (): boolean {
-      return this.getSpecialResolutionRules?.includedInResolution ||
-        this.getSpecialResolutionRules?.key !==
-        this.getEntitySnapshot?.businessDocuments?.documentsInfo?.certifiedRules?.key
+      return (
+        this.getSpecialResolutionRules?.includedInResolution ||
+          (this.getSpecialResolutionRules?.key !==
+          this.getOriginalBusinessDocuments?.documentsInfo?.certifiedRules?.key)
+      )
     },
 
     // Grab the latest resolution from the entity snapshot.
     getLatestResolutionForBusiness (): SpecialResolutionIF {
       // Obtain latest resolution ID. Assumes that the latest resolution is the one to be corrected.
-      const latestResolution = this.getEntitySnapshot.resolutions
+      const latestResolution = this.getOriginalResolutions
         .reduce((prev, current) => (prev.id > current.id) ? prev : current)
       return {
         ...latestResolution,
@@ -1343,45 +1390,45 @@ export const useStore = defineStore('store', {
   },
   actions: {
     setEntityType (entityType: CorpTypeCd) {
-      this.stateModel.tombstone.entityType = entityType
+      this.getTombstone.entityType = entityType
     },
     setEntityTypeChangedByName (entityTypeChangedByName: boolean) {
-      this.stateModel.tombstone.entityTypeChangedByName = entityTypeChangedByName
+      this.getTombstone.entityTypeChangedByName = entityTypeChangedByName
     },
     setBusinessId (businessId: string) {
-      this.stateModel.tombstone.businessId = businessId
+      this.getTombstone.businessId = businessId
     },
     setIsSaving (isSaving: boolean) {
-      this.stateModel.tombstone.isSaving = isSaving
+      this.getTombstone.isSaving = isSaving
     },
     setIsSavingResuming (isSavingResuming: boolean) {
-      this.stateModel.tombstone.isSavingResuming = isSavingResuming
+      this.getTombstone.isSavingResuming = isSavingResuming
     },
     setIsFilingPaying (isFilingPaying: boolean) {
-      this.stateModel.tombstone.isFilingPaying = isFilingPaying
+      this.getTombstone.isFilingPaying = isFilingPaying
     },
     setKeycloakRoles (keycloakRoles: string[]) {
-      this.stateModel.tombstone.keycloakRoles = keycloakRoles
+      this.getTombstone.keycloakRoles = keycloakRoles
     },
     setUserInfo (userInfo: any) {
-      this.stateModel.tombstone.userInfo = userInfo
+      this.getTombstone.userInfo = userInfo
     },
     setOrgInfo (orgInfo: any) {
-      this.stateModel.tombstone.orgInfo = orgInfo
+      this.getTombstone.orgInfo = orgInfo
     },
     setCurrentDate (dateString: string) {
-      this.stateModel.tombstone.currentDate = dateString
+      this.getTombstone.currentDate = dateString
     },
     setCurrentJsDate (date: Date) {
       this.stateModel.currentJsDate = date
     },
     setIsFutureEffective (isFutureEffective: boolean) {
       this.stateModel.effectiveDateTime.isFutureEffective = isFutureEffective
-      if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
+      if (!this.getTombstone.ignoreChanges) this.getTombstone.haveUnsavedChanges = true
     },
     setEffectiveDateTimeString (dateTime: string) {
       this.stateModel.effectiveDateTime.dateTimeString = dateTime
-      if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
+      if (!this.getTombstone.ignoreChanges) this.getTombstone.haveUnsavedChanges = true
     },
     setEffectiveDateValid (valid: boolean) {
       this.stateModel.validationFlags.flagsReviewCertify.isValidEffectiveDate = valid
@@ -1391,28 +1438,28 @@ export const useStore = defineStore('store', {
     },
     setCertifyState (certifyState: CertifyIF) {
       this.stateModel.certifyState = certifyState
-      if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
+      if (!this.getTombstone.ignoreChanges) this.getTombstone.haveUnsavedChanges = true
     },
     setCertifyStateValidity (validity: boolean) {
       this.stateModel.validationFlags.flagsReviewCertify.isValidCertify = validity
     },
     setDocumentOptionalEmail (documentOptionalEmail: string) {
       this.stateModel.documentDelivery.documentOptionalEmail = documentOptionalEmail
-      if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
+      if (!this.getTombstone.ignoreChanges) this.getTombstone.haveUnsavedChanges = true
     },
     setDocumentOptionalEmailValidity (validity: boolean) {
       this.stateModel.validationFlags.flagsReviewCertify.isValidDocumentOptionalEmail = validity
     },
     setCompletingParty (cp: CompletingPartyIF) {
       this.stateModel.completingParty = cp
-      if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
+      if (!this.getTombstone.ignoreChanges) this.getTombstone.haveUnsavedChanges = true
     },
     setCompletingPartyValidity (validity: boolean) {
       this.stateModel.validationFlags.flagsReviewCertify.isValidCompletingParty = validity
     },
     setTransactionalFolioNumber (folioNumber: string) {
-      this.stateModel.tombstone.transactionalFolioNumber = folioNumber
-      if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
+      this.getTombstone.transactionalFolioNumber = folioNumber
+      if (!this.getTombstone.ignoreChanges) this.getTombstone.haveUnsavedChanges = true
     },
     setTransactionalFolioNumberValidity (validity: boolean) {
       this.stateModel.validationFlags.flagsReviewCertify.isValidTransactionalFolioNumber = validity
@@ -1423,10 +1470,10 @@ export const useStore = defineStore('store', {
     },
     setOfficeAddresses (addresses: AddressesIF) {
       this.stateModel.officeAddresses = addresses
-      if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
+      if (!this.getTombstone.ignoreChanges) this.getTombstone.haveUnsavedChanges = true
     },
     setFolioNumber (folioNumber: string) {
-      this.stateModel.tombstone.folioNumber = folioNumber
+      this.getTombstone.folioNumber = folioNumber
       // NB: folio number was changed immediately in auth db - do not set unsaved Changes flag
     },
     setAccountInformation (accountInformation: AccountInformationIF) {
@@ -1443,21 +1490,21 @@ export const useStore = defineStore('store', {
     },
     setNameRequest (nameRequest: NameRequestIF) {
       this.stateModel.nameRequest = nameRequest
-      if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
+      if (!this.getTombstone.ignoreChanges) this.getTombstone.haveUnsavedChanges = true
     },
     setNameChangedByType (changedByType: boolean) {
-      this.stateModel.tombstone.nameChangedByType = changedByType
+      this.getTombstone.nameChangedByType = changedByType
     },
     setNameTranslations (nameTranslations: NameTranslationIF[]) {
       this.stateModel.nameTranslations = nameTranslations
-      if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
+      if (!this.getTombstone.ignoreChanges) this.getTombstone.haveUnsavedChanges = true
     },
     setFilingId (filingId: number) {
-      this.stateModel.tombstone.filingId = filingId
+      this.getTombstone.filingId = filingId
     },
     setPeopleAndRoles (orgPeople: OrgPersonIF[]) {
       this.stateModel.peopleAndRoles.orgPeople = orgPeople
-      if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
+      if (!this.getTombstone.ignoreChanges) this.getTombstone.haveUnsavedChanges = true
     },
     setPeopleAndRolesChanged (changed: boolean) {
       this.stateModel.peopleAndRoles.changed = changed
@@ -1467,7 +1514,7 @@ export const useStore = defineStore('store', {
     },
     setShareClasses (shareClasses: ShareClassIF[]) {
       this.stateModel.shareStructureStep.shareClasses = shareClasses
-      if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
+      if (!this.getTombstone.ignoreChanges) this.getTombstone.haveUnsavedChanges = true
     },
     setShareStructureChanged (changed: boolean) {
       this.stateModel.shareStructureStep.changed = changed
@@ -1476,17 +1523,17 @@ export const useStore = defineStore('store', {
       this.stateModel.validationFlags.flagsCompanyInfo.isValidShareStructure = validity
     },
     setIgnoreChanges (ignoreChanges: boolean) {
-      this.stateModel.tombstone.ignoreChanges = ignoreChanges
+      this.getTombstone.ignoreChanges = ignoreChanges
     },
     setHaveUnsavedChanges (haveUnsavedChanges: boolean) {
-      this.stateModel.tombstone.haveUnsavedChanges = haveUnsavedChanges
+      this.getTombstone.haveUnsavedChanges = haveUnsavedChanges
     },
     setEntitySnapshot (entitySnapshot: EntitySnapshotIF) {
       this.stateModel.entitySnapshot = entitySnapshot
     },
     setStaffPayment (staffPayment: StaffPaymentIF) {
       this.stateModel.staffPayment = staffPayment
-      if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
+      if (!this.getTombstone.ignoreChanges) this.getTombstone.haveUnsavedChanges = true
     },
     setStaffPaymentValidity (validity: boolean) {
       this.stateModel.validationFlags.flagsReviewCertify.isValidStaffPayment = validity
@@ -1531,14 +1578,14 @@ export const useStore = defineStore('store', {
       this.stateModel.summaryMode = summaryMode
     },
     setFilingType (filingType: FilingTypes) {
-      this.stateModel.tombstone.filingType = filingType
+      this.getTombstone.filingType = filingType
     },
     setProvisionsRemoved (provisionsRemoved: boolean) {
       this.stateModel.newAlteration.provisionsRemoved = provisionsRemoved
     },
     setNewResolutionDates (resolutionDates: string[]) {
       this.stateModel.shareStructureStep.resolutionDates = resolutionDates
-      if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
+      if (!this.getTombstone.ignoreChanges) this.getTombstone.haveUnsavedChanges = true
     },
     setFileNumber (fileNumber: string) {
       this.stateModel.newAlteration.courtOrder.fileNumber = fileNumber
@@ -1567,7 +1614,7 @@ export const useStore = defineStore('store', {
     setNaics (naics: NaicsIF) {
       this.stateModel.businessInformation.naicsCode = naics.naicsCode
       this.stateModel.businessInformation.naicsDescription = naics.naicsDescription
-      if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
+      if (!this.getTombstone.ignoreChanges) this.getTombstone.haveUnsavedChanges = true
     },
     setSpecialResolution (specialResolution: SpecialResolutionIF) {
       this.stateModel.specialResolution = specialResolution
diff --git a/src/views/Alteration.vue b/src/views/Alteration.vue
index a1fb6d88..b07d33c0 100644
--- a/src/views/Alteration.vue
+++ b/src/views/Alteration.vue
@@ -135,7 +135,8 @@ import { BusinessContactInfo, BusinessType, CertifySection, CourtOrderPoa, Curre
 import { NameTranslation } from '@/components/common/YourCompany/NameTranslations/'
 import { AuthServices, LegalServices } from '@/services/'
 import { CommonMixin, FeeMixin, FilingTemplateMixin } from '@/mixins/'
-import { EntitySnapshotIF, FilingDataIF, ResourceIF } from '@/interfaces/'
+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 }
@@ -219,19 +220,19 @@ export default class Alteration extends Mixins(CommonMixin, FeeMixin, FilingTemp
   onBusinessTypeChanged () {
     const filingData = this.getFilingData
     // When we are converting from BC to ULC, it's $1000 not $100.
-    if (this.getEntitySnapshot?.businessInfo?.legalType === CorpTypeCd.BC_COMPANY &&
+    if (this.getOriginalLegalType === CorpTypeCd.BC_COMPANY &&
         this.getEntityType === CorpTypeCd.BC_ULC_COMPANY) {
       this.setFilingData([{
         filingTypeCode: BcAlterationResource.additionalFilingData.filingTypeCode,
-        entityType: BcAlterationResource.additionalFilingData.entityType,
+        entityType: BcAlterationResource.additionalFilingData.entityType as any,
         priority: filingData[0].priority,
         futureEffective: filingData[0].futureEffective
       }])
     } else {
-      const resourceFilingData = this.alterationResource.filingData as FilingDataIF
+      const resourceFilingData = this.alterationResource.filingData as unknown as FilingDataIF
       this.setFilingData([{
         filingTypeCode: resourceFilingData.filingTypeCode,
-        entityType: resourceFilingData.entityType,
+        entityType: resourceFilingData.entityType as any,
         priority: filingData[0].priority,
         futureEffective: filingData[0].futureEffective
       }])
@@ -302,7 +303,7 @@ export default class Alteration extends Mixins(CommonMixin, FeeMixin, FilingTemp
       this.setResource(this.alterationResource)
 
       // initialize Fee Summary data
-      const filingData = [this.alterationResource.filingData]
+      const filingData = [this.alterationResource.filingData as unknown as FilingDataIF]
       filingData.forEach(fd => {
         (fd as FilingDataIF).futureEffective = this.getEffectiveDateTime.isFutureEffective
       })