From de154651f82daf74d25f3258e0dbaa794034de9c Mon Sep 17 00:00:00 2001
From: Severin Beauvais <severin.beauvais@gmail.com>
Date: Tue, 12 Sep 2023 09:20:51 -0700
Subject: [PATCH] - app version = 5.0.43 - misc cleanup - renamed EntityType ->
 EntityTypes - renamed CompanyType -> CompanyTypes - cleaned up
 PickEntityOrConversion.vue - added category table for xpro (amalgamation
 only) - moved many NrApprovedGrayBox props into component - renamed
 isSupportedEntity -> isSupportedIncorporationRegistration - changed
 isXProCompany -> isXproEntityType - added Alter Now button to
 NrApprovedGrayBox - added template blocks for amalgamation to Search -
 renamed companyRadioBtnApplicable -> showCompanyTypeRadioButtons - added
 amalgamation form URL to Search - added AML blurbs to Entity Types Data -
 added "Extraprovincial" to all xpro business labels - added XCR and XCP to
 AML xpro mapping - renamed isSupportedEntity -> isSupportedEntityType - added
 isSupportedAmalgamation() - added some store getters - deleted debugging
 strings - removed debugging code

---
 package-lock.json                             |   4 +-
 package.json                                  |   2 +-
 src/App.vue                                   |   2 +-
 src/components/common/app-title-cols.vue      |  20 +-
 src/components/common/names-capture.vue       |  22 +-
 .../dialogs/pick-entity-or-conversion.vue     | 126 ++++++----
 .../check-status-gray-box.vue                 |   5 +-
 .../existing-request-display.vue              |  70 +-----
 .../existing-request/name-request-details.vue |   4 +-
 .../existing-request/nr-approved-gray-box.vue | 128 ++++++++--
 .../new-request/business-lookup.vue           |   4 +-
 src/components/new-request/grey-box.vue       |  14 +-
 .../new-request/name-check/name-check.vue     |  30 +--
 src/components/new-request/name-input.vue     |   2 +
 src/components/new-request/search.vue         | 138 ++++++-----
 .../entity-cannot-be-auto-analyzed.vue        |   6 +-
 .../{company-type.ts => company-types.ts}     |   2 +-
 src/enums/{entity-type.ts => entity-types.ts} |   2 +-
 src/enums/index.ts                            |   4 +-
 src/interfaces/business.ts                    |   4 +-
 src/interfaces/mapping.ts                     |   6 +-
 src/interfaces/models.ts                      |  10 +-
 src/interfaces/new-request-interface.ts       |   8 +-
 src/list-data/conversion-types.ts             |  26 +-
 src/list-data/entity-type-data.ts             |  97 ++++----
 src/list-data/request-action-mapping.ts       | 141 +++++------
 src/list-data/request-actions.ts              |   2 +-
 src/mixins/common-mixin.ts                    | 123 +++++-----
 src/mixins/nr-affiliation-mixin.ts            |   2 +-
 src/plugins/index.ts                          |   3 +-
 src/store/actions.ts                          |  14 +-
 src/store/getters.ts                          | 229 +++++++++---------
 src/store/mutations.ts                        |   6 +-
 src/store/state.ts                            |  16 +-
 src/views/landing.vue                         |  12 -
 35 files changed, 671 insertions(+), 613 deletions(-)
 rename src/enums/{company-type.ts => company-types.ts} (73%)
 rename src/enums/{entity-type.ts => entity-types.ts} (97%)

diff --git a/package-lock.json b/package-lock.json
index c734378e3..89ee06803 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "name-request",
-  "version": "5.0.42",
+  "version": "5.0.43",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "name-request",
-      "version": "5.0.42",
+      "version": "5.0.43",
       "dependencies": {
         "@babel/compat-data": "^7.12.13",
         "@bcrs-shared-components/breadcrumb": "2.1.24",
diff --git a/package.json b/package.json
index d32de288a..af63a7ea0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-request",
-  "version": "5.0.42",
+  "version": "5.0.43",
   "private": true,
   "appName": "Name Request UI",
   "sbcName": "SBC Common Components",
diff --git a/src/App.vue b/src/App.vue
index 31cd6114a..50311b7be 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -253,7 +253,7 @@ export default class App extends Mixins(
       sessionStorage.removeItem('NR_DATA')
     }
 
-    // if there is stored legal type for an IA then incorporate it now
+    // if there is stored legal type for an IA then incorporate/register it now
     const legaltype = sessionStorage.getItem('LEGAL_TYPE')
     if (legaltype) {
       try {
diff --git a/src/components/common/app-title-cols.vue b/src/components/common/app-title-cols.vue
index 20be0b9e3..b91fd63dd 100644
--- a/src/components/common/app-title-cols.vue
+++ b/src/components/common/app-title-cols.vue
@@ -1,15 +1,13 @@
 <template>
-  <div>
-    <v-row no-gutters>
-      <v-col cols="12" md="6" lg="6" class="mt-4" :class="{'pt-10': !isMobile}">
-        <span class="h2 colour-white" id="app-title">Name Request
-        </span>
-      </v-col>
-      <v-col cols="12" md="6" lg="6">
-        <Stats />
-      </v-col>
-    </v-row>
-  </div>
+  <v-row no-gutters>
+    <v-col cols="12" md="6" lg="6" class="mt-4" :class="{'pt-10': !isMobile}">
+      <span class="h2 colour-white" id="app-title">Name Request
+      </span>
+    </v-col>
+    <v-col cols="12" md="6" lg="6">
+      <Stats />
+    </v-col>
+  </v-row>
 </template>
 
 <script lang="ts">
diff --git a/src/components/common/names-capture.vue b/src/components/common/names-capture.vue
index a50eae2f8..490b5fc94 100644
--- a/src/components/common/names-capture.vue
+++ b/src/components/common/names-capture.vue
@@ -255,13 +255,13 @@ import NameRequestDetails from '@/components/existing-request/name-request-detai
 import { NameChoicesIF, NameRequestI } from '@/interfaces'
 import { sanitizeName } from '@/plugins'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import { EntityType, Location } from '@/enums'
+import { EntityTypes, Location } from '@/enums'
 import { CommonMixin } from '@/mixins'
 import { Designations } from '@/list-data'
 
 /**
  * This is the component that displays the name choices.
- * It also shows the menu here when editing a NR.
+ * It also shows the name request details here when editing a NR.
  */
 @Component({
   components: {
@@ -277,7 +277,7 @@ export default class NamesCapture extends Mixins(CommonMixin) {
   @Getter getDisplayedComponent!: string
   @Getter getDesignation!: string
   @Getter getEditMode!: boolean
-  @Getter getEntityTypeCd!: EntityType
+  @Getter getEntityTypeCd!: EntityTypes
   @Getter getLocation!: Location
   @Getter getName!: string
   @Getter getNameChoices!: NameChoicesIF
@@ -358,10 +358,10 @@ export default class NamesCapture extends Mixins(CommonMixin) {
 
   get showSecondAndThirdNameChoices () {
     if (this.getLocation !== Location.BC) {
-      if (this.getEntityTypeCd === EntityType.XLP ||
-        this.getEntityTypeCd === EntityType.XLL ||
-        this.getEntityTypeCd === EntityType.XCP ||
-        this.getEntityTypeCd === EntityType.XSO) {
+      if (this.getEntityTypeCd === EntityTypes.XLP ||
+        this.getEntityTypeCd === EntityTypes.XLL ||
+        this.getEntityTypeCd === EntityTypes.XCP ||
+        this.getEntityTypeCd === EntityTypes.XSO) {
         return false
       }
     }
@@ -490,9 +490,9 @@ export default class NamesCapture extends Mixins(CommonMixin) {
   // define the text for the name designation error message for the entity types that require it
   get entityTypeText (): string {
     switch (this.getEntityTypeCd) {
-      case EntityType.SO: return 'Society'
-      case EntityType.CC: return 'Community Contribution Company'
-      case EntityType.CP: return 'Cooperative'
+      case EntityTypes.SO: return 'Society'
+      case EntityTypes.CC: return 'Community Contribution Company'
+      case EntityTypes.CP: return 'Cooperative'
 
       // for other no name designation required entity types, return an empty string
       default: return ''
@@ -646,7 +646,7 @@ export default class NamesCapture extends Mixins(CommonMixin) {
 
   get items (): string[] {
     let output: string[] = Designations[this.getEntityTypeCd].words
-    if (this.getEntityTypeCd === EntityType.CC) {
+    if (this.getEntityTypeCd === EntityTypes.CC) {
       output = Designations['CR'].words
     }
     return output
diff --git a/src/components/dialogs/pick-entity-or-conversion.vue b/src/components/dialogs/pick-entity-or-conversion.vue
index d8d69cc33..574600f65 100644
--- a/src/components/dialogs/pick-entity-or-conversion.vue
+++ b/src/components/dialogs/pick-entity-or-conversion.vue
@@ -1,9 +1,9 @@
 <template>
-  <v-dialog :value="getPickEntityModalVisible" :max-width="width" persistent>
+  <v-dialog :value="getPickEntityModalVisible" :max-width="maxWidth" persistent>
     <v-card class="no-border pick-entity-card">
       <v-row>
         <v-col cols="10">
-          <span class="ml-1 copy-small">{{ locationText }}:</span>
+          <span class="copy-small" v-if="!showSocietiesInfo">{{ getLocationText }}</span>
         </v-col>
         <v-col cols="2">
           <v-icon class="float-right" md color="primary" @click="closeIconClicked()">mdi-close</v-icon>
@@ -16,16 +16,17 @@
             <v-row class="category-bg">
               <v-col cols="12" class="font-weight-bold">Alterations</v-col>
             </v-row>
-            <v-row v-for="(conversion, i) in ConversionTypes" :key="'conv-' + i">
+            <v-row v-for="(conversion, i) in ConversionTypes" :key="`conv-${i}`">
               <v-col cols="12" class="clickable-cell"
                      :id="conversion.value"
-                     @click="chooseConversion(conversion)">
+                     @click="chooseConversion(conversion)"
+              >
                 <v-tooltip bottom content-class="bottom-tooltip" transition="fade-transition" :disabled="isMobile">
                   <template v-slot:activator="scope">
                     <button v-on="scope.on" class="link-sm-sans-ul entity-link">{{ conversion.desc }}</button>
                   </template>
-                  <div v-for="(text, i) in entityBlurbs(conversion.value)" :key="'blurb-' + i">
-                    <span>{{ text }}</span>
+                  <div v-for="(blurb, i) in entityBlurbs(conversion.value)" :key="`blurb-${i}`">
+                    <span>{{ blurb }}</span>
                   </div>
                 </v-tooltip>
               </v-col>
@@ -34,29 +35,41 @@
         </v-card-text>
       </template>
 
-      <!--  List Tables -->
-      <template v-else-if="!showSocietiesInfo">
-        <v-card-text class="">
+      <!-- Special case for societies -->
+      <template v-if="showSocietiesInfo">
+        <v-card-text class="mt-n12">
+          <v-container fluid>
+            <v-row no-gutters class="text-center">
+              <v-col cols="12">To request a name for a Society</v-col>
+              <v-col cols="12">please use the Societies Online website</v-col>
+              <v-col cols="12">
+                <a href="https://www.bcregistry.ca/societies/">https://www.bcregistry.ca/societies/</a>
+              </v-col>
+            </v-row>
+          </v-container>
+        </v-card-text>
+      </template>
+
+      <!-- Category tables -->
+      <template v-else>
+        <v-card-text class="pt-4">
           <v-row no-gutters>
-            <v-col v-for="(category, i) in tableData" :key="'cat' + i">
+            <v-col v-for="(category, i) in tableData" :key="`cat-${i}`">
               <v-simple-table>
                 <tr class="category-bg cell">
                   <th>
                     <span class="font-weight-bold">{{ category.text }}</span>
                   </th>
                 </tr>
-                <tr v-for="(entity, n) in category.entities" :key="'ent' + n">
+                <tr v-for="(entity, n) in category.entities" :key="`ent-${n}`">
                   <td class="clickable-cell" :id="entity.value" @click="chooseType(entity)">
                     <v-tooltip bottom content-class="bottom-tooltip" transition="fade-transition" :disabled="isMobile">
                       <template v-slot:activator="scope">
                         <button v-on="scope.on" class="link-sm-sans-ul entity-link">{{ entity.text }}</button>
                       </template>
                       <template>
-                        <div v-for="(item, index) in entityBlurbs(entity.value)"
-                             :key="`Blurb-${index}`">
-                      <span :class="{ 'tooltip-bullet': index !== 0}">
-                        {{ item }}
-                      </span>
+                        <div v-for="(blurb, index) in entityBlurbs(entity.value)" :key="`blurb-${index}`">
+                          <span :class="{ 'tooltip-bullet': index !== 0}">{{ blurb }}</span>
                         </div>
                       </template>
                     </v-tooltip>
@@ -68,17 +81,40 @@
         </v-card-text>
       </template>
 
-      <template v-else>
-        <v-card-text>
-          <v-container fluid>
-            <v-row no-gutters class="text-center">
-              <v-col cols="12">To request a name for a Society</v-col>
-              <v-col cols="12">please use the Societies Online website</v-col>
-              <v-col cols="12">
-                <a href="https://www.bcregistry.ca/societies/">https://www.bcregistry.ca/societies/</a>
-              </v-col>
-            </v-row>
-          </v-container>
+      <!-- Category tables - xpro (amalgamation only) -->
+      <template v-if="isAmalgamation">
+        <v-row class="pt-4">
+          <v-col cols="12">
+            <span class="copy-small">Extraprovincial:</span>
+          </v-col>
+        </v-row>
+
+        <v-card-text class="pt-4">
+          <v-row no-gutters>
+            <v-col v-for="(category, i) in tableDataXPRO" :key="`cat-xpro-${i}`">
+              <v-simple-table>
+                <tr class="category-bg cell">
+                  <th>
+                    <span class="font-weight-bold">{{ category.text }}</span>
+                  </th>
+                </tr>
+                <tr v-for="(entity, n) in category.entities" :key="`ent-xpro-${n}`">
+                  <td class="clickable-cell" :id="entity.value" @click="chooseType(entity)">
+                    <v-tooltip bottom content-class="bottom-tooltip" transition="fade-transition" :disabled="isMobile">
+                      <template v-slot:activator="scope">
+                        <button v-on="scope.on" class="link-sm-sans-ul entity-link">{{ entity.text }}</button>
+                      </template>
+                      <template>
+                        <div v-for="(blurb, index) in entityBlurbs(entity.value)" :key="`blurb-xpro-${index}`">
+                          <span :class="{ 'tooltip-bullet': index !== 0}">{{ blurb }}</span>
+                        </div>
+                      </template>
+                    </v-tooltip>
+                  </td>
+                </tr>
+              </v-simple-table>
+            </v-col>
+          </v-row>
         </v-card-text>
       </template>
     </v-card>
@@ -90,7 +126,7 @@ import { Component, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'vuex-class'
 import { ConversionTypesI, EntityI, SelectOptionsI } from '@/interfaces'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import { EntityType, Location } from '@/enums'
+import { EntityTypes, Location } from '@/enums'
 import { ConversionTypes } from '@/list-data'
 import { CommonMixin } from '@/mixins'
 
@@ -101,14 +137,15 @@ export default class PickEntityOrConversionDialog extends CommonMixin {
 
   // Global getters
   @Getter getConversionTypeOptions!: ConversionTypesI[]
-  @Getter getEntityBlurbs!: Array<EntityI>
-  @Getter getEntityTypeCd!: EntityType
+  @Getter getEntityBlurbs!: Array<EntityI | ConversionTypesI>
+  @Getter getEntityTypeCd!: EntityTypes
   @Getter getEntityTypeOptions!: Array<EntityI>
   @Getter getEntityTypesBC!: Array<EntityI>
   @Getter getEntityTypesXPRO!: Array<EntityI>
   @Getter getLocation!: Location
   @Getter getLocationText!: string
   @Getter getPickEntityModalVisible!: boolean
+  @Getter isAmalgamation!: boolean
   @Getter isConversion!: boolean
   @Getter isMobile!: boolean
 
@@ -123,7 +160,7 @@ export default class PickEntityOrConversionDialog extends CommonMixin {
 
   closeIconClicked () {
     this.setPickEntityModalVisible(false)
-    // clear "View all business types" selection
+    // clear empty string selection
     this.setEntityTypeCd(null)
   }
 
@@ -134,18 +171,14 @@ export default class PickEntityOrConversionDialog extends CommonMixin {
     }
   }
 
-  get entity_type_cd (): EntityType {
+  get entity_type_cd (): EntityTypes {
     return this.getEntityTypeCd
   }
 
-  set entity_type_cd (value: EntityType) {
+  set entity_type_cd (value: EntityTypes) {
     this.setEntityTypeCd(value)
   }
 
-  get locationText (): string {
-    return (this.getLocationText === 'BC') ? 'British Columbia' : this.getLocationText
-  }
-
   get tableData (): any[] {
     if (this.getLocation === Location.BC) {
       return this.tableDataBC
@@ -194,24 +227,25 @@ export default class PickEntityOrConversionDialog extends CommonMixin {
     return output
   }
 
-  get width (): string {
-    if (this.showSocietiesInfo || this.isConversion) {
+  get maxWidth (): string {
+    if (this.showSocietiesInfo || this.isConversion || this.isAmalgamation) {
       return '550px'
     }
-    let cols = this.tableData.length
-    const maxThreshold = this.$vuetify.breakpoint.thresholds.sm
 
-    // 210 per column with a max threshold of 960px
-    return `${210 * cols > maxThreshold ? maxThreshold : 210 * cols}px`
+    // 210 per column with a max threshold of 960px (sm)
+    const cols = this.tableData.length
+    const maxThreshold = this.$vuetify.breakpoint.thresholds.sm
+    const val = (210 * cols > maxThreshold) ? maxThreshold : (210 * cols)
+    return `${val}px`
   }
 
   // FUTURE: clean up return type
   entityBlurbs (entity_type_cd: string): string[][] | string[] | string {
-    return this.getEntityBlurbs?.find(type => type.value === entity_type_cd)?.blurbs || []
+    return this.getEntityBlurbs.find(type => type.value === entity_type_cd)?.blurbs || []
   }
 
   clearEntitySelection (): void {
-    this.entity_type_cd = EntityType.INFO
+    this.entity_type_cd = EntityTypes.INFO
   }
 
   chooseConversion (conversion) {
@@ -229,7 +263,7 @@ export default class PickEntityOrConversionDialog extends CommonMixin {
 
   chooseType (entity: SelectOptionsI) {
     // show an URL of creating society NR if Societies NR needs to be released AFTER the way of navigating changes
-    if (!this.isSocietyEnabled() && (entity.value === EntityType.SO || entity.value === EntityType.XSO)) {
+    if (!this.isSocietyEnabled() && (entity.value === EntityTypes.SO || entity.value === EntityTypes.XSO)) {
       this.showSocietiesInfo = true
       this.clearEntitySelection()
       return
diff --git a/src/components/existing-request/check-status-gray-box.vue b/src/components/existing-request/check-status-gray-box.vue
index 01483aee9..1cac4f1e5 100644
--- a/src/components/existing-request/check-status-gray-box.vue
+++ b/src/components/existing-request/check-status-gray-box.vue
@@ -2,8 +2,9 @@
   <v-row no-gutters class="bg-light-gray">
     <v-col class="text-body-4 px-5 py-4">
       <p>
-        To check on the status of this Name Request in the future, enter the request number <strong>{{nrNum}}</strong>
-        plus the Applicant Phone Number or Email Address using the "Manage My Name Request tab" on the site.
+        To check on the status of this Name Request in the future, enter the request number
+        <strong>{{nrNum}}</strong> plus the Applicant Phone Number or Email Address using the "Manage My Name
+        Request tab" on the site.
       </p>
       <v-row no-gutters>
         <v-col cols="auto" class="pt-1 mr-2">
diff --git a/src/components/existing-request/existing-request-display.vue b/src/components/existing-request/existing-request-display.vue
index 09c98c5ac..01fe83fdb 100644
--- a/src/components/existing-request/existing-request-display.vue
+++ b/src/components/existing-request/existing-request-display.vue
@@ -194,16 +194,10 @@
             :nrNum="nr && nr.nrNum"
             :approvedName="approvedName && approvedName.name"
             :emailAddress="nr && nr.applicants && nr.applicants.emailAddress"
-            :showIncorporateNowButton="showIncorporateNowButton"
-            :showRegisterButton="showRegisterButton"
-            :showAlterNowButton="showAlterNowButton"
-            :isAllowAlterOnline="isAlterOnline(nr.requestTypeCd)"
-            :showOpenExternalIcon="showOpenExternalIcon"
-            :showGoToSocietiesButton="showGoToSocietiesButton"
             :disabled="disableUnfurnished"
             @incorporateRegisterYourBusiness="incorporateRegisterYourBusiness()"
-            @goToSocietiesOnline="goToSocietiesOnline"
-            @goToCorpOnline="goToCorpOnline"
+            @goToSocietiesOnline="goToSocietiesOnline()"
+            @goToCorpOnline="goToCorpOnline()"
             @goToEntityDashboard="goToEntityDashboard(nr.corpNum)"
           />
 
@@ -227,8 +221,8 @@ import NamesGrayBox from './names-gray-box.vue'
 import CheckStatusGrayBox from './check-status-gray-box.vue'
 import NrApprovedGrayBox from './nr-approved-gray-box.vue'
 import NrNotApprovedGrayBox from './nr-not-approved-gray-box.vue'
-import { NameState, NrAction, NrState, PaymentStatus, SbcPaymentStatus, PaymentAction, Furnished,
-  NrRequestActionCodes, NrRequestTypeCodes, EntityType } from '@/enums'
+import { NameState, NrAction, NrState, PaymentStatus, SbcPaymentStatus, PaymentAction, Furnished }
+  from '@/enums'
 import { Sleep, GetFeatureFlag, Navigate } from '@/plugins'
 import NamexServices from '@/services/namex-services'
 import ContactInfo from '@/components/common/contact-info.vue'
@@ -412,60 +406,6 @@ export default class ExistingRequestDisplay extends Mixins(
     return this.getNr
   }
 
-  /**
-   * True if the Incorporate Now button should be shown.
-   * (It is shown as a distinct button instead of an action.)
-   */
-  get showIncorporateNowButton (): boolean {
-    return (
-      !this.isFirm(this.nr) &&
-      this.isSupportedEntity(this.nr) &&
-      this.nr.request_action_cd === NrRequestActionCodes.NEW_BUSINESS &&
-      (NrState.APPROVED === this.nr.state || this.isConsentUnRequired)
-    )
-  }
-
-  /** True if the Register button should be shown. */
-  get showRegisterButton (): boolean {
-    return (
-      this.isFirm(this.nr) &&
-      this.isSupportedEntity(this.nr) &&
-      this.nr.request_action_cd === NrRequestActionCodes.NEW_BUSINESS &&
-      (NrState.APPROVED === this.nr.state || this.isConsentUnRequired)
-    )
-  }
-
-  /** True if the Alter Now button should be shown. */
-  get showAlterNowButton (): boolean {
-    return (
-      this.nr.request_action_cd === NrRequestActionCodes.CONVERSION &&
-      (NrState.APPROVED === this.nr.state || this.isConsentUnRequired)
-    )
-  }
-
-  get showOpenExternalIcon (): boolean {
-    if (this.showAlterNowButton) {
-      return !this.isSupportedAlteration(this.nr.requestTypeCd)
-    }
-    return false
-  }
-
-  /** True if the Go To Societies Online button should be shown. */
-  get showGoToSocietiesButton (): boolean {
-    return (
-      this.nr?.entity_type_cd === EntityType.SO &&
-      this.nr.request_action_cd === NrRequestActionCodes.NEW_BUSINESS &&
-      (NrState.APPROVED === this.nr.state || this.isConsentUnRequired)
-    )
-  }
-
-  get isConsentUnRequired (): boolean {
-    return NrState.CONDITIONAL === this.nr.state &&
-            (this.nr.consentFlag === null ||
-              this.nr.consentFlag === 'R' ||
-              this.nr.consentFlag === 'N')
-  }
-
   /** True if the Check Status gray box should be shown. */
   get showCheckStatusGrayBox (): boolean {
     return [NrState.DRAFT, NrState.INPROGRESS, NrState.HOLD].includes(this.nr.state)
@@ -479,7 +419,7 @@ export default class ExistingRequestDisplay extends Mixins(
   /** True if the NR Not Approved gray box should be shown. */
   get showNrNotApprovedGrayBox (): boolean {
     return (
-      this.isXProCompany(this.nr) &&
+      this.isXproEntityType(this.nr.entity_type_cd) &&
       (this.nr.state === NrState.REJECTED)
     )
   }
diff --git a/src/components/existing-request/name-request-details.vue b/src/components/existing-request/name-request-details.vue
index 8a6054dbe..549e2cfc5 100644
--- a/src/components/existing-request/name-request-details.vue
+++ b/src/components/existing-request/name-request-details.vue
@@ -82,9 +82,9 @@ export default class NameRequestDetails extends Mixins(CommonMixin) {
     return xproJurisdiction || 'Unknown'
   }
 
-  /** Whether the entity type code denotes a XPRO business. */
+  /** Whether this is an XPRO business. */
   get isXpro (): boolean {
-    return this.isXProCompany(this.getNr)
+    return this.isXproEntityType(this.getNr.entity_type_cd)
   }
 
   /** The legal type of the new business. */
diff --git a/src/components/existing-request/nr-approved-gray-box.vue b/src/components/existing-request/nr-approved-gray-box.vue
index 27a2cdb22..cefada5c4 100644
--- a/src/components/existing-request/nr-approved-gray-box.vue
+++ b/src/components/existing-request/nr-approved-gray-box.vue
@@ -12,7 +12,7 @@
         </v-btn>
       </div>
 
-      <div v-else-if="showIncorporateNowButton" class="d-flex justify-center my-1">
+      <div v-else-if="showIncorporateButton" class="d-flex justify-center my-1">
         <v-btn
           class="incorporate-now-btn mt-30"
           min-width="20rem"
@@ -36,6 +36,29 @@
         </v-btn>
       </div>
 
+      <div v-else-if="showAmalgamateNowButton" class="d-flex justify-center my-1">
+        <v-btn
+          class="alter-now-external-btn mt-30"
+          v-if="showOpenExternalIcon"
+          min-width="20rem"
+          :disabled="disabled"
+          @click="$emit('goToCorpOnline')"
+        >
+          <strong>Alter Now</strong>
+          &nbsp;
+          <v-icon small>mdi-open-in-new</v-icon>
+        </v-btn>
+        <v-btn
+          v-else
+          class="alter-now-btn mt-30"
+          min-width="20rem"
+          :disabled="disabled"
+          @click="$emit('goToEntityDashboard')"
+        >
+          <strong>Amalgamate Now</strong>
+        </v-btn>
+      </div>
+
       <div v-else-if="showAlterNowButton" class="my-1">
         <div v-if="isAllowAlterOnline" class="d-flex justify-center">
           <v-btn
@@ -97,39 +120,98 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue } from 'vue-property-decorator'
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import { Getter } from 'vuex-class'
+import { CommonMixin } from '@/mixins'
+import { NameRequestI } from '@/interfaces'
+import { EntityTypes, NrRequestActionCodes, NrState } from '@/enums'
 
 @Component({})
-export default class NrApprovedGrayBox extends Vue {
-  @Prop({ default: 'TBD' })
-  readonly nrNum: string
+export default class NrApprovedGrayBox extends Mixins(CommonMixin) {
+  @Prop({ default: 'TBD' }) readonly nrNum!: string
+  @Prop({ default: 'TBD' }) readonly approvedName!: string
+  @Prop({ default: 'TBD' }) readonly emailAddress!: string
+  @Prop({ default: false }) readonly disabled!: boolean
+
+  @Getter getNr!: Partial<NameRequestI>
 
-  @Prop({ default: 'TBD' })
-  readonly approvedName: string
+  get isConversion (): boolean {
+    return (this.getNr.request_action_cd === NrRequestActionCodes.CONVERSION)
+  }
 
-  @Prop({ default: 'TBD' })
-  readonly emailAddress: string
+  get isNewBusiness (): boolean {
+    return (this.getNr.request_action_cd === NrRequestActionCodes.NEW_BUSINESS)
+  }
 
-  @Prop({ default: false })
-  readonly isAllowAlterOnline: boolean
+  get isAmalgamate (): boolean {
+    return (this.getNr.request_action_cd === NrRequestActionCodes.AMALGAMATE)
+  }
 
-  @Prop({ default: true })
-  readonly showAlterNowButton: boolean
+  get isApprovedOrConsentUnRequired (): boolean {
+    return (NrState.APPROVED === this.getNr.state || this.isConsentUnRequired)
+  }
 
-  @Prop({ default: false })
-  readonly showOpenExternalIcon: boolean
+  get isConsentUnRequired (): boolean {
+    return (
+      (NrState.CONDITIONAL === this.getNr.state) &&
+      (this.getNr.consentFlag === null || this.getNr.consentFlag === 'R' || this.getNr.consentFlag === 'N')
+    )
+  }
 
-  @Prop({ default: false })
-  readonly showRegisterButton: boolean
+  /** True if the Alter Now button should be shown. */
+  get showAlterNowButton (): boolean {
+    return (this.isConversion && this.isApprovedOrConsentUnRequired)
+  }
 
-  @Prop({ default: false })
-  readonly showIncorporateNowButton: boolean
+  get isAllowAlterOnline (): boolean {
+    return this.isAlterOnline(this.getNr.requestTypeCd)
+  }
 
-  @Prop({ default: false })
-  readonly showGoToSocietiesButton: boolean
+  get showOpenExternalIcon (): boolean {
+    return (
+      this.showAlterNowButton &&
+      !this.isSupportedAlteration(this.getNr.requestTypeCd)
+    )
+  }
 
-  @Prop({ default: false })
-  readonly disabled: boolean
+  /** True if the Go To Societies Online button should be shown. */
+  get showGoToSocietiesButton (): boolean {
+    return (
+      this.getNr.entity_type_cd === EntityTypes.SO &&
+      this.getNr.request_action_cd === NrRequestActionCodes.NEW_BUSINESS &&
+      (NrState.APPROVED === this.getNr.state || this.isConsentUnRequired)
+    )
+  }
+
+  /** True if the Incorporate button should be shown. */
+  get showIncorporateButton (): boolean {
+    return (
+      !this.isFirm(this.getNr) &&
+      this.isNewBusiness &&
+      this.isSupportedIncorporationRegistration(this.getNr.entity_type_cd) &&
+      this.isApprovedOrConsentUnRequired
+    )
+  }
+
+  /** True if the Register button should be shown. */
+  get showRegisterButton (): boolean {
+    return (
+      this.isFirm(this.getNr) &&
+      this.isNewBusiness &&
+      this.isSupportedIncorporationRegistration(this.getNr.entity_type_cd) &&
+      this.isApprovedOrConsentUnRequired
+    )
+  }
+
+  /** True if the Amalgamate Now button should be shown. */
+  // *** TODO: verify this logic and when we show this button vs external link
+  get showAmalgamateNowButton (): boolean {
+    return (
+      this.isAmalgamate &&
+      this.isSupportedAmalgamation(this.getNr.entity_type_cd) &&
+      this.isApprovedOrConsentUnRequired
+    )
+  }
 }
 </script>
 
diff --git a/src/components/new-request/business-lookup.vue b/src/components/new-request/business-lookup.vue
index 4496fddde..7084253d0 100644
--- a/src/components/new-request/business-lookup.vue
+++ b/src/components/new-request/business-lookup.vue
@@ -50,7 +50,7 @@ import { Component, Emit, Prop, Watch } from 'vue-property-decorator'
 import { debounce } from 'lodash'
 import { BusinessLookupResultIF, BusinessSearchIF } from '@/interfaces'
 import BusinessLookupServices from '@/services/business-lookup-services'
-import { EntityStates, EntityType } from '@/enums'
+import { EntityStates, EntityTypes } from '@/enums'
 
 enum States {
   INITIAL = 'initial',
@@ -131,7 +131,7 @@ export default class BusinessLookup extends Vue {
     return {
       identifier: input.identifier,
       legalName: input.name,
-      legalType: (input.legalType as unknown as EntityType),
+      legalType: (input.legalType as unknown as EntityTypes),
       state: input.status
     }
   }
diff --git a/src/components/new-request/grey-box.vue b/src/components/new-request/grey-box.vue
index 007c2ef88..962c524e7 100644
--- a/src/components/new-request/grey-box.vue
+++ b/src/components/new-request/grey-box.vue
@@ -142,7 +142,7 @@ import ReserveSubmit from '@/components/new-request/submit-request/reserve-submi
 import { AnalysisJSONI, OptionI } from '@/interfaces'
 import { replaceWord } from '@/plugins'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import { EntityType } from '@/enums'
+import { EntityTypes } from '@/enums'
 import { AllDesignationsList, Designations } from '@/list-data'
 
 @Component({
@@ -173,7 +173,7 @@ export default class GreyBox extends Vue {
   // Global getters
   @Getter getAnalysisJSON!: AnalysisJSONI
   @Getter getDesignationIssueTypes!: string[]
-  @Getter getEntityTypeCd!: EntityType
+  @Getter getEntityTypeCd!: EntityTypes
   @Getter getName!: string
   @Getter getRequestExaminationOrProvideConsent!: boolean
 
@@ -219,8 +219,12 @@ export default class GreyBox extends Vue {
   }
 
   get isAssumedNameEntityType () {
-    return this.entity_type_cd !== EntityType.XLP && this.entity_type_cd !== EntityType.XLL &&
-    this.entity_type_cd !== EntityType.XCP && this.entity_type_cd !== EntityType.XSO
+    return (
+      this.entity_type_cd !== EntityTypes.XLP &&
+      this.entity_type_cd !== EntityTypes.XLL &&
+      this.entity_type_cd !== EntityTypes.XCP &&
+      this.entity_type_cd !== EntityTypes.XSO
+    )
   }
 
   get allDesignationsStripped () {
@@ -274,7 +278,7 @@ export default class GreyBox extends Vue {
     return null
   }
 
-  get entity_type_cd (): EntityType {
+  get entity_type_cd (): EntityTypes {
     return this.getEntityTypeCd
   }
 
diff --git a/src/components/new-request/name-check/name-check.vue b/src/components/new-request/name-check/name-check.vue
index af63861f2..e9ad2ac3a 100644
--- a/src/components/new-request/name-check/name-check.vue
+++ b/src/components/new-request/name-check/name-check.vue
@@ -203,7 +203,7 @@ import NameCheckConflicts from '@/components/new-request/name-check/name-check-c
 import NameCheckTabContent from '@/components/new-request/name-check/name-check-tab-content.vue'
 import NameInput from '@/components/new-request/name-input.vue'
 import QuickSearchNames from '@/components/new-request/name-check/quick-search-names.vue'
-import { EntityType, NameCheckErrorType } from '@/enums'
+import { EntityTypes, NameCheckErrorType } from '@/enums'
 import { ConditionalInstructionI, DialogOptionsI, NameCheckErrorI, NameCheckItemIF } from '@/interfaces'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
 import { baseItemsConflicts, baseItemsStructure } from './resources'
@@ -230,7 +230,7 @@ export default class NameCheck extends Vue {
   @Getter getDesignationsMismatched!: Array<string>
   @Getter getDesignationsMisplaced!: Array<string>
   @Getter getEntityTextFromValue!: string
-  @Getter getEntityTypeCd!: EntityType
+  @Getter getEntityTypeCd!: EntityTypes
   @Getter getErrors!: string[]
   @Getter getFullName!: string
   @Getter getLocationText!: string
@@ -351,8 +351,8 @@ export default class NameCheck extends Vue {
   }
   get designationOptions (): Array<string> {
     let output: string[] = Designations[this.getEntityTypeCd]?.words
-    if (this.getEntityTypeCd === EntityType.CC) {
-      output = Designations[EntityType.CR].words
+    if (this.getEntityTypeCd === EntityTypes.CC) {
+      output = Designations[EntityTypes.CR].words
     }
     return output
   }
@@ -537,19 +537,19 @@ export default class NameCheck extends Vue {
     if (this.hasDesignationsCheckUse) {
       let newItem = baseItemsStructure.designationsCheckUse
       const propEntities = [
-        EntityType.FR,
-        EntityType.DBA,
-        EntityType.GP,
-        EntityType.LP,
-        EntityType.LL,
-        EntityType.XLP,
-        EntityType.XLL
+        EntityTypes.DBA,
+        EntityTypes.FR,
+        EntityTypes.GP,
+        EntityTypes.LL,
+        EntityTypes.LP,
+        EntityTypes.XLL,
+        EntityTypes.XLP
       ]
       if (propEntities.includes(this.getEntityTypeCd)) {
         newItem = baseItemsStructure.designationsCheckUseProp
-      } else if ([EntityType.CP, EntityType.XCP].includes(this.getEntityTypeCd)) {
+      } else if ([EntityTypes.CP, EntityTypes.XCP].includes(this.getEntityTypeCd)) {
         newItem = baseItemsStructure.designationsCheckUseCP
-      } else if (this.getEntityTypeCd === EntityType.CC) {
+      } else if (this.getEntityTypeCd === EntityTypes.CC) {
         newItem = baseItemsStructure.designationsCheckUseCCC
       }
       newItem.words = this.designationsCheckUse
@@ -572,9 +572,9 @@ export default class NameCheck extends Vue {
     }
     if (this.isMissingDesignation) {
       let newItem = baseItemsStructure.designationsMissing
-      if ([EntityType.CP, EntityType.XCP].includes(this.getEntityTypeCd)) {
+      if ([EntityTypes.CP, EntityTypes.XCP].includes(this.getEntityTypeCd)) {
         newItem = baseItemsStructure.designationsMissingCP
-      } else if (this.getEntityTypeCd === EntityType.CC) {
+      } else if (this.getEntityTypeCd === EntityTypes.CC) {
         newItem = baseItemsStructure.designationsMissingCCC
       }
       items.push(newItem)
diff --git a/src/components/new-request/name-input.vue b/src/components/new-request/name-input.vue
index d818890b2..98176b538 100644
--- a/src/components/new-request/name-input.vue
+++ b/src/components/new-request/name-input.vue
@@ -31,8 +31,10 @@ import { MRAS_MAX_LENGTH } from '@/components/new-request/constants'
 export default class NameInput extends Vue {
   /** Whether to perform MRAS search. */
   @Prop({ default: false }) readonly isMrasSearch!: boolean
+
   /** Whether this component is read-only (eg, on name check page). */
   @Prop({ default: false }) readonly isReadOnly!: boolean
+
   /** Hint to show (eg, on name check page). */
   @Prop({ default: null }) readonly hint!: string
 
diff --git a/src/components/new-request/search.vue b/src/components/new-request/search.vue
index 711fc9155..976b91fae 100644
--- a/src/components/new-request/search.vue
+++ b/src/components/new-request/search.vue
@@ -133,10 +133,10 @@
         </v-tooltip>
       </v-col>
 
-      <!-- once an entity type is selected, is Federal, or is Restorable -->
+      <!-- once an entity type is selected, is Federal, or is Restorable, ... -->
       <template v-if="entity_type_cd || isFederal || isRestorable">
         <!-- Company Type -->
-        <v-col v-if="companyRadioBtnApplicable" cols="12">
+        <v-col v-if="showCompanyTypeRadioButtons" cols="12">
           <p class="font-weight-bold h6">Select a company type:</p>
           <v-radio-group
             v-model="selectedCompanyType"
@@ -149,23 +149,31 @@
             <v-radio
               id="named-company-radio"
               label="Named Company"
-              :value="CompanyType.NAMED_COMPANY"
+              :value="CompanyTypes.NAMED_COMPANY"
             />
             <v-radio
               id="numbered-company-radio"
               label="Numbered Company"
-              :value="CompanyType.NUMBERED_COMPANY"
+              :value="CompanyTypes.NUMBERED_COMPANY"
             />
           </v-radio-group>
         </v-col>
 
-        <!-- Named company bullets -->
-        <template v-if="selectedCompanyType === CompanyType.NAMED_COMPANY">
+        <!-- Numbered company (or amalgamation) -->
+        <template v-if="isNamedCompany || isAmalgamation">
           <!-- Xpro/Federal bullets -->
           <v-col v-if="isXproFlow && isFederal" cols="12" :md="isSelectedCompanyXPro ? 10 : 8">
             <ul class="bullet-points">
               <li>Federally incorporated businesses do not need a Name Request.</li>
-              <li v-if="isRestoration && isSelectedXproAndRestorable">
+
+              <li v-if="isAmalgamation">
+                To register your extraprovincial amalgamation, download and complete
+                <a :href="federalAmalgamationFormLink">
+                  this form <v-icon small class="ml-1" color="primary">mdi-open-in-new</v-icon>
+                </a>.
+              </li>
+
+              <li v-else-if="isRestoration && isSelectedXproAndRestorable">
                 To reinstate your business, complete
                 <a :href="fullReinstatementFormLink">
                   this form <v-icon small class="ml-1" color="primary">mdi-open-in-new</v-icon>
@@ -174,12 +182,13 @@
                   this form  <v-icon small class="ml-1" color="primary">mdi-open-in-new</v-icon>
                 </a> for a limited reinstatement.
               </li>
+
               <li v-else>
                 You may register your extraprovincial business immediately using its existing name
                 at Corporate Online.
               </li>
             </ul>
-        </v-col>
+          </v-col>
 
           <!-- XPRO/MRAS number/name search/input -->
           <v-col v-if="!isFederal" cols="12" :md="(isXproFlow || showDesignation) ? 8 : 12">
@@ -238,8 +247,8 @@
           </v-col>
         </template>
 
-        <!-- Numbered company bullets -->
-        <template v-if="selectedCompanyType === CompanyType.NUMBERED_COMPANY || isFederal" cols="12">
+        <!-- Numbered company (or Federal) -->
+        <template v-if="isNumberedCompany || isFederal" cols="12">
           <v-col v-if="isConversion && !isAlterOnline(getConversionType)">
             <div class="contact-registries">
               <p>To complete this alteration, please contact us at:</p>
@@ -332,7 +341,7 @@ import BusinessFetch from '@/components/new-request/business-fetch.vue'
 // Interfaces / Enums / List Data
 import { BusinessSearchIF, ConversionTypesI, EntityI, FormType, RequestActionsI } from '@/interfaces'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import { AccountType, CompanyType, CorpTypeCd, EntityStates, EntityType,
+import { AccountType, CompanyTypes, CorpTypeCd, EntityStates, EntityTypes,
   Location, NrRequestActionCodes, NrRequestTypeCodes } from '@/enums'
 import { CommonMixin, NrAffiliationMixin } from '@/mixins'
 import { BcMapping, CanJurisdictions, ConversionTypes, Designations,
@@ -354,7 +363,7 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {
   }
 
   // Enums for template
-  readonly CompanyType = CompanyType
+  readonly CompanyTypes = CompanyTypes
   readonly NrRequestActionCodes = NrRequestActionCodes
   readonly RequestActions = RequestActions
 
@@ -362,26 +371,23 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {
   @Getter getConversionType!: NrRequestTypeCodes
   @Getter getConversionTypeOptions!: ConversionTypesI[]
   @Getter getDesignation!: string
-  @Getter getEntityBlurbs!: Array<EntityI>
-  @Getter getEntityTypeCd!: EntityType
+  @Getter getEntityBlurbs!: Array<EntityI | ConversionTypesI>
+  @Getter getEntityTypeCd!: EntityTypes
   @Getter getEntityTypeOptions!: Array<EntityI>
   @Getter getEntityTextFromValue!: string
   @Getter getErrors!: string[]
   @Getter getHasNoCorpNum!: boolean
-  @Getter isAuthenticated!: boolean
-  @Getter getJurisdictionCd!: string
   @Getter getLocation!: Location
-  @Getter getLocationOptions!: any[]
-  @Getter getOriginEntityTypeCd!: EntityType
+  @Getter getOriginEntityTypeCd!: EntityTypes
   @Getter getRequestActionCd!: NrRequestActionCodes
   @Getter isAmalgamation!: boolean
   @Getter isAssumed!: boolean
+  @Getter isAuthenticated!: boolean
   @Getter isCanadian!: boolean
   @Getter isChangeName!: boolean
-  @Getter isConversion!: boolean
   @Getter isContinuationIn!: boolean
+  @Getter isConversion!: boolean
   @Getter isFederal!: boolean
-  @Getter isInternational!: boolean
   @Getter isMobile!: boolean
   @Getter isMrasJurisdiction!: boolean
   @Getter isNumberedEntityType!: boolean
@@ -406,23 +412,28 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {
   @Action setRequestAction!: ActionBindingIF
   @Action startAnalyzeName!: ActionBindingIF
 
+  // Constants
+  readonly colinLink = sessionStorage.getItem('CORPORATE_ONLINE_URL')
+  readonly corpOnlineLink = 'https://www.corporateonline.gov.bc.ca/'
+  readonly EntityTypes = EntityTypes
+  readonly federalAmalgamationFormLink = 'https://www2.gov.bc.ca/assets/gov/employment-business-and-economic-' +
+    'development/business-management/permits-licences-and-registration/registries-packages/' +
+    'pack_34_xco_-_amalgamation_application_and_business_number_request.pdf'
+  readonly fullReinstatementFormLink = 'https://www2.gov.bc.ca/assets/gov/employment-business-and-economic-' +
+    'development/business-management/permits-licences-and-registration/registries-forms/' +
+    'form_31_xco_-_full_reinstatement_application.pdf'
+  readonly limitedReinstatementFormLink = 'https://www2.gov.bc.ca/assets/gov/employment-business-and-economic-' +
+    'development/business-management/permits-licences-and-registration/registries-forms/' +
+    'form_29_xco_-_limited_reinstatement_application.pdf'
+
   // Local properties
   corpNumValid = true
   request = null as RequestActionsI
-  jurisdiction = null
-  selectedCompanyType = null as CompanyType
-  readonly colinLink = sessionStorage.getItem('CORPORATE_ONLINE_URL')
-  readonly corpOnlineLink = 'https://www.corporateonline.gov.bc.ca/'
-  readonly EntityType = EntityType
+  jurisdiction = null as any
+  selectedCompanyType = null as CompanyTypes
   activeActionGroup = NaN
   showRequestActionTooltip = false
   business = null as BusinessSearchIF
-  fullReinstatementFormLink = 'https://www2.gov.bc.ca/assets/gov/employment-business-and-economic-development/' +
-    'business-management/permits-licences-and-registration/registries-forms/' +
-    'form_31_xco_-_full_reinstatement_application.pdf'
-  limitedReinstatementFormLink = 'https://www2.gov.bc.ca/assets/gov/employment-business-and-economic-development/' +
-    'business-management/permits-licences-and-registration/registries-forms/' +
-    'form_29_xco_-_limited_reinstatement_application.pdf'
 
   private mounted () {
     this.$nextTick(() => {
@@ -501,7 +512,7 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {
   }
 
   get showJurisdiction (): boolean {
-    // if (this.isAmalgamation) return true // *** FUTURE
+    if (this.isAmalgamation && this.isXproEntityType(this.getEntityTypeCd)) return true
     if (this.isNewXproBusiness) return true
     if (this.isSelectedXproAndRestorable) return true
     if (this.isChangeNameXpro) return true
@@ -534,22 +545,22 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {
   }
 
   get designationOptions (): Array<string> {
-    let output: string[] = Designations[this.getEntityTypeCd]?.words
-    if (this.getEntityTypeCd === EntityType.CC) {
-      output = Designations[EntityType.CR].words
+    let output = Designations[this.getEntityTypeCd]?.words as string[]
+    if (this.getEntityTypeCd === EntityTypes.CC) {
+      output = Designations[EntityTypes.CR].words
     }
     return output
   }
 
-  get companyRadioBtnApplicable (): boolean {
+  get showCompanyTypeRadioButtons (): boolean {
     if (!this.entity_type_cd && !this.getConversionType && !this.isFederal) return false
     if (this.isConversion) {
       return this.business !== null && this.getConversionType !== null
     }
-    const isSociety = (this.isSocietyEnabled() && this.getEntityTypeCd === EntityType.SO)
+    const isSociety = (this.isSocietyEnabled() && this.getEntityTypeCd === EntityTypes.SO)
     // check if numbered is not allowed or society NR name is required
     if (!this.isNumberedEntityType || isSociety) {
-      this.selectedCompanyType = CompanyType.NAMED_COMPANY
+      this.selectedCompanyType = CompanyTypes.NAMED_COMPANY
       return false
     }
     return true
@@ -561,25 +572,16 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {
 
   // FUTURE: clean up return type
   entityBlurbs (entity_type_cd: string): string | string[] | string[][] {
-    return this.getEntityBlurbs?.find(type => type.value === entity_type_cd)?.blurbs
+    return this.getEntityBlurbs.find(type => type.value === entity_type_cd)?.blurbs
   }
 
-  get entity_type_options_select_bind (): EntityType {
-    if (this.isConversion) return this.getOriginEntityTypeCd
-    return this.entity_type_cd
-  }
-
-  set entity_type_options_select_bind (type: EntityType) {
-    this.entity_type_cd = type
-  }
-
-  get entity_type_cd (): EntityType {
+  get entity_type_cd (): EntityTypes {
     return this.getEntityTypeCd
   }
 
-  set entity_type_cd (type: EntityType) {
+  set entity_type_cd (type: EntityTypes) {
     // special case for sub-menu
-    if (type === EntityType.INFO) {
+    if (type === EntityTypes.INFO) {
       // set empty value until user chooses a new one
       // (don't use null in case it's already null as we want reactivity)
       this.setEntityTypeCd('')
@@ -590,7 +592,7 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {
     // special case for conversion
     if (this.getEntityTypeCd && this.isConversion && type) {
       const value = type as unknown as NrRequestTypeCodes
-      let { entity_type_cd } = ConversionTypes.find(conv => conv.value === value) || { entity_type_cd: null }
+      const entity_type_cd = ConversionTypes.find(conv => conv.value === value)?.entity_type_cd || null
       this.setEntityTypeCd(entity_type_cd)
       this.setConversionType(type)
       this.setConversionType(type)
@@ -612,13 +614,18 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {
   }
 
   get entityConversionText () {
-    // convert NrRequestTypeCodes -> EntityType
+    // convert NrRequestTypeCodes -> EntityTypes
     return ConversionTypes.find(conversion => conversion.value === this.getConversionType)?.text
   }
 
   /** Whether selected radio button is Named Company. */
   get isNamedCompany (): boolean {
-    return (this.selectedCompanyType === CompanyType.NAMED_COMPANY)
+    return (this.selectedCompanyType === CompanyTypes.NAMED_COMPANY)
+  }
+
+  /** Whether selected radio button is Numbered Company. */
+  get isNumberedCompany (): boolean {
+    return (this.selectedCompanyType === CompanyTypes.NUMBERED_COMPANY)
   }
 
   get showActionButton (): boolean {
@@ -732,7 +739,7 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {
         // set conversionType & entity_type_cd because there's only one alteration type for it
         if (this.isBenBusiness) {
           this.setConversionType(NrRequestTypeCodes.CONVERT_CORP)
-          this.setEntityTypeCd(EntityType.BC)
+          this.setEntityTypeCd(EntityTypes.BC)
         }
       } else {
         // clear all related fields when clearing business search/fetch for alter
@@ -770,27 +777,29 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {
     }
   }
 
-  /** Returns whether the selected XPRO is restorable. */
+  /** Whether the selected XPRO is restorable. */
   get isSelectedXproAndRestorable (): boolean {
     return XproMapping.REH.includes(this.business?.legalType)
   }
 
-  /** Returns whether the selected business' legal type is BC and restorable. */
+  /** Whether the selected business' legal type is BC and restorable. */
   get isBcRestorable (): boolean {
     return BcMapping.REH.includes(this.corpTypeToEntityType(this.business?.legalType as unknown as CorpTypeCd))
   }
 
-  /** Returns whether company is restorable. */
+  /** Whether company is restorable. */
   get isRestorable (): boolean {
     return this.isSelectedXproAndRestorable || this.isBcRestorable
   }
 
   /** Map to correct Entity type if legal type is Ben Bc Ulc Ccc */
   isBenBcUlcCccCorpType (): boolean {
-    return this.business?.legalType === EntityType.BEN ||
-        this.business?.legalType === EntityType.BC ||
-        this.business?.legalType === EntityType.ULC ||
-        this.business?.legalType === EntityType.CC
+    return (
+      this.business?.legalType === EntityTypes.BC ||
+      this.business?.legalType === EntityTypes.BEN ||
+      this.business?.legalType === EntityTypes.CC ||
+      this.business?.legalType === EntityTypes.ULC
+    )
   }
 
   get isChangeNameXpro (): boolean {
@@ -848,7 +857,7 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {
   clearDesignation () {
     this.setDesignation('')
     // clear "Select a Business Type" field when "View all business types" or Society is selected
-    if (!this.entity_type_cd || this.entity_type_cd === EntityType.INFO) {
+    if (!this.entity_type_cd || this.entity_type_cd === EntityTypes.INFO) {
       this.$refs.selectBusinessTypeRef && this.$refs.selectBusinessTypeRef.reset()
     }
   }
@@ -888,6 +897,7 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {
 
     // set default location for requests where there is only one location option
     if (this.isNewBcBusiness || this.isContinuationIn || this.isConversion || this.isAmalgamation) {
+      // *** TODO: set location for amalgamation later (depending on entity type selected)
       this.setLocation(Location.BC)
     } else if (this.isAssumed && this.getLocation === Location.BC) {
       this.setLocation(Location.CA)
@@ -1020,7 +1030,7 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {
     color: $gray7 !important;
   }
 
-  // Override radio group background color.
+  // override radio group background color
   .v-input--radio-group .v-input__control .v-input__slot {
     background-color: white !important;
   }
diff --git a/src/components/new-request/submit-request/entity-cannot-be-auto-analyzed.vue b/src/components/new-request/submit-request/entity-cannot-be-auto-analyzed.vue
index 9d2e9d6e4..a86a88268 100644
--- a/src/components/new-request/submit-request/entity-cannot-be-auto-analyzed.vue
+++ b/src/components/new-request/submit-request/entity-cannot-be-auto-analyzed.vue
@@ -42,7 +42,7 @@ import { Action, Getter } from 'vuex-class'
 import { RequestActionsI } from '@/interfaces'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
 import NameInput from '@/components/new-request/name-input.vue'
-import { EntityType, NrRequestActionCodes } from '@/enums'
+import { EntityTypes, NrRequestActionCodes } from '@/enums'
 
 @Component({
   components: { NameInput }
@@ -52,9 +52,9 @@ export default class EntityCannotBeAutoAnalyzed extends Vue {
 
   // Global getters
   @Getter getNameAnalysisTimeout!: boolean
-  @Getter getDoNotAnalyzeEntities!: EntityType[]
+  @Getter getDoNotAnalyzeEntities!: EntityTypes[]
   @Getter getEntityTextFromValue!: string
-  @Getter getEntityTypeCd!: EntityType
+  @Getter getEntityTypeCd!: EntityTypes
   @Getter getIsPersonsName!: boolean
   @Getter getName!: string
   @Getter isNameEnglish!: boolean
diff --git a/src/enums/company-type.ts b/src/enums/company-types.ts
similarity index 73%
rename from src/enums/company-type.ts
rename to src/enums/company-types.ts
index 00c1a5080..14bc90e4b 100644
--- a/src/enums/company-type.ts
+++ b/src/enums/company-types.ts
@@ -1,4 +1,4 @@
-export enum CompanyType {
+export enum CompanyTypes {
   NAMED_COMPANY = 'namedCompany',
   NUMBERED_COMPANY = 'numberedCompany'
 }
diff --git a/src/enums/entity-type.ts b/src/enums/entity-types.ts
similarity index 97%
rename from src/enums/entity-type.ts
rename to src/enums/entity-types.ts
index a2fc8dffa..815676b0d 100644
--- a/src/enums/entity-type.ts
+++ b/src/enums/entity-types.ts
@@ -1,7 +1,7 @@
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
 /** Enum for Entity Type codes. */
-export enum EntityType {
+export enum EntityTypes {
   // BC Entity Types:
   BC = CorpTypeCd.BC_COMPANY,
   BEN = CorpTypeCd.BENEFIT_COMPANY,
diff --git a/src/enums/index.ts b/src/enums/index.ts
index af0849e45..3f856985e 100644
--- a/src/enums/index.ts
+++ b/src/enums/index.ts
@@ -1,7 +1,7 @@
 export * from './account-type'
 export * from './advanced-search-tabs'
-export * from './company-type'
-export * from './entity-type'
+export * from './company-types'
+export * from './entity-types'
 export * from './furnished'
 export * from './jurisdictions'
 export * from './location'
diff --git a/src/interfaces/business.ts b/src/interfaces/business.ts
index acbf4a1a9..9a29c0043 100644
--- a/src/interfaces/business.ts
+++ b/src/interfaces/business.ts
@@ -1,4 +1,4 @@
-import { EntityStates, EntityType } from '@/enums'
+import { EntityStates, EntityTypes } from '@/enums'
 
 export interface BusinessRequest {
   filing: {
@@ -37,6 +37,6 @@ export interface CreateNRAffiliationRequestBody {
 export interface BusinessSearchIF {
   identifier: string
   legalName: string
-  legalType: EntityType
+  legalType: EntityTypes
   state: EntityStates
 }
diff --git a/src/interfaces/mapping.ts b/src/interfaces/mapping.ts
index 61b5f92c0..1701bc238 100644
--- a/src/interfaces/mapping.ts
+++ b/src/interfaces/mapping.ts
@@ -1,6 +1,6 @@
-import { EntityType } from '@/enums'
+import { EntityTypes } from '@/enums'
 
 export interface MappingI {
-  ASSUMED: EntityType[]
-  [propName: string]: EntityType[] // misc properties that are arrays of entity types
+  ASSUMED: EntityTypes[]
+  [propName: string]: EntityTypes[] // misc properties that are arrays of entity types
 }
diff --git a/src/interfaces/models.ts b/src/interfaces/models.ts
index 4c48d5db1..bfd6783d3 100644
--- a/src/interfaces/models.ts
+++ b/src/interfaces/models.ts
@@ -1,5 +1,5 @@
 import {
-  EntityType,
+  EntityTypes,
   Location,
   NameCheckAnalysisJurisdiction,
   NameCheckAnalysisType,
@@ -81,8 +81,8 @@ export interface ConsentConflictI {
 export interface ConversionTypesI {
   blurbs?: string[]
   desc?: string
-  entity_type_cd?: EntityType
-  origin_entity_type_cd?: EntityType
+  entity_type_cd?: EntityTypes
+  origin_entity_type_cd?: EntityTypes
   rank?: number
   short?: string
   shortlist?: boolean
@@ -124,7 +124,7 @@ export interface EntityI {
   rank?: number
   shortlist?: boolean
   text: string
-  value: EntityType
+  value: EntityTypes
 }
 
 export interface ExistingRequestSearchI {
@@ -200,7 +200,7 @@ export interface QuillOpsI {
 }
 
 export interface RequestActionMappingI {
-  [propName: string]: EntityType[] // misc properties that are arrays of entity types
+  [propName: string]: EntityTypes[] // misc properties that are arrays of entity types
 }
 
 export interface RequestActionsI {
diff --git a/src/interfaces/new-request-interface.ts b/src/interfaces/new-request-interface.ts
index 8e8682b14..9ca63be77 100644
--- a/src/interfaces/new-request-interface.ts
+++ b/src/interfaces/new-request-interface.ts
@@ -3,7 +3,7 @@ import {
   RequestNameI, SelectOptionsI, StatsI, SubmissionTypeT, WaitingAddressSearchI
 } from '@/interfaces/models'
 import { NameChoicesIF, NrDataIF, RequestOrConsentIF } from '@/interfaces'
-import { EntityType, Location, NrAffiliationErrors, NrRequestActionCodes, NrRequestTypeCodes } from '@/enums'
+import { EntityTypes, Location, NrAffiliationErrors, NrRequestActionCodes, NrRequestTypeCodes } from '@/enums'
 
 interface RequestNameMapI extends RequestNameI {}
 
@@ -23,9 +23,9 @@ export interface NewRequestIF {
   corpSearch: string
   designationIssueTypes: string[]
   displayedComponent: string
-  doNotAnalyzeEntities: EntityType[]
+  doNotAnalyzeEntities: EntityTypes[]
   editMode: boolean
-  entity_type_cd: EntityType
+  entity_type_cd: EntityTypes
   entityTypeAddToSelect: SelectOptionsI
   errors: string[]
   exitIncompletePaymentVisible: boolean
@@ -54,7 +54,7 @@ export interface NewRequestIF {
   nrOriginal: Partial<NameRequestI>
   nrRequestNameMap: RequestNameMapI[]
   nrRequiredModalVisible: boolean
-  origin_entity_type_cd: EntityType
+  origin_entity_type_cd: EntityTypes
   pickEntityModalVisible: boolean
   priorityRequest: boolean
   quickSearchNames: any[]
diff --git a/src/list-data/conversion-types.ts b/src/list-data/conversion-types.ts
index d16d06824..129109fab 100644
--- a/src/list-data/conversion-types.ts
+++ b/src/list-data/conversion-types.ts
@@ -1,12 +1,12 @@
-import { EntityType, NrRequestTypeCodes } from '@/enums'
+import { EntityTypes, NrRequestTypeCodes } from '@/enums'
 import { ConversionTypesI } from '@/interfaces/models'
 
 export const ConversionTypes: ConversionTypesI[] = [
   {
     desc: 'Limited Company to an Unlimited Liability Company',
     text: 'Limited Company to an Unlimited Liability Company',
-    entity_type_cd: EntityType.UL,
-    origin_entity_type_cd: EntityType.BC,
+    entity_type_cd: EntityTypes.UL,
+    origin_entity_type_cd: EntityTypes.BC,
     blurbs: [
       'Alter business type from a limited company to an unlimited liability company.'
     ],
@@ -17,8 +17,8 @@ export const ConversionTypes: ConversionTypesI[] = [
   {
     desc: 'Limited Company to a Community Contribution Company',
     text: 'Limited Company to a Community Contribution Company',
-    entity_type_cd: EntityType.CC,
-    origin_entity_type_cd: EntityType.BC,
+    entity_type_cd: EntityTypes.CC,
+    origin_entity_type_cd: EntityTypes.BC,
     blurbs: [
       'Alter business type from a limited company to a community contribution company.'
     ],
@@ -29,8 +29,8 @@ export const ConversionTypes: ConversionTypesI[] = [
   {
     desc: 'Limited Company to a Benefit Company',
     text: 'Limited Company to a Benefit Company',
-    entity_type_cd: EntityType.BC,
-    origin_entity_type_cd: EntityType.BC,
+    entity_type_cd: EntityTypes.BC,
+    origin_entity_type_cd: EntityTypes.BC,
     blurbs: [
       'Alter business type from a limited company to a benefit company.'
     ],
@@ -40,8 +40,8 @@ export const ConversionTypes: ConversionTypesI[] = [
   {
     desc: 'Benefit Company to a Limited Company',
     text: 'Benefit Company to a Limited Company',
-    entity_type_cd: EntityType.CR,
-    origin_entity_type_cd: EntityType.BEN,
+    entity_type_cd: EntityTypes.CR,
+    origin_entity_type_cd: EntityTypes.BEN,
     blurbs: [
       'Alter business type from a benefit company to a limited company.'
     ],
@@ -51,8 +51,8 @@ export const ConversionTypes: ConversionTypesI[] = [
   {
     desc: 'Unlimited Liability Company to a Limited Company',
     text: 'Unlimited Liability Company to a Limited Company',
-    entity_type_cd: EntityType.CR,
-    origin_entity_type_cd: EntityType.ULC,
+    entity_type_cd: EntityTypes.CR,
+    origin_entity_type_cd: EntityTypes.ULC,
     blurbs: [
       'Alter business type from an unlimited liability company to a limited company.'
     ],
@@ -62,8 +62,8 @@ export const ConversionTypes: ConversionTypesI[] = [
   {
     desc: 'Unlimited Liability Company to a Benefit Company',
     text: 'Unlimited Liability Company to a Benefit Company',
-    entity_type_cd: EntityType.BC,
-    origin_entity_type_cd: EntityType.ULC,
+    entity_type_cd: EntityTypes.BC,
+    origin_entity_type_cd: EntityTypes.ULC,
     blurbs: [
       'Alter business type from an unlimited liability company to a benefit company.'
     ],
diff --git a/src/list-data/entity-type-data.ts b/src/list-data/entity-type-data.ts
index 3947f67cd..aeb97e295 100644
--- a/src/list-data/entity-type-data.ts
+++ b/src/list-data/entity-type-data.ts
@@ -1,10 +1,10 @@
-import { EntityType } from '@/enums'
+import { EntityTypes } from '@/enums'
 import { EntityI } from '@/interfaces/models'
 
 export const EntityTypesBcData: EntityI[] = [
   {
     text: 'Sole Proprietorship',
-    value: EntityType.FR,
+    value: EntityTypes.FR,
     cat: 'Proprietorships',
     blurbs: [
       'A company owned and operated by one person who is personally responsible for all debts and liabilities.',
@@ -18,7 +18,7 @@ export const EntityTypesBcData: EntityI[] = [
   },
   {
     text: '"Doing Business As" name (DBA)',
-    value: EntityType.DBA,
+    value: EntityTypes.DBA,
     cat: 'Proprietorships',
     blurbs: [
       `An existing legal BC entity that would like to be known as another name. Referred to as a "Doing Business As",
@@ -31,7 +31,7 @@ export const EntityTypesBcData: EntityI[] = [
   },
   {
     text: 'Limited Company',
-    value: EntityType.CR,
+    value: EntityTypes.CR,
     cat: 'Corporations',
     blurbs: [
       `A company that may have one or more people who own shares with some personal responsibility for debt and
@@ -61,7 +61,7 @@ export const EntityTypesBcData: EntityI[] = [
   },
   {
     text: 'Unlimited Liability Company',
-    value: EntityType.UL,
+    value: EntityTypes.UL,
     cat: 'Corporations',
     blurbs: [
       `A type of corporation that is often used by American corporations as a Canadian subsidiary or to hold Canadian
@@ -89,7 +89,7 @@ export const EntityTypesBcData: EntityI[] = [
   },
   {
     text: 'General Partnership',
-    value: EntityType.GP,
+    value: EntityTypes.GP,
     cat: 'Partnerships',
     blurbs: [
       `A business owned and operated by two or more people or BC entities who are personally responsible for all debt
@@ -105,7 +105,7 @@ export const EntityTypesBcData: EntityI[] = [
   },
   {
     text: 'Limited Partnership',
-    value: EntityType.LP,
+    value: EntityTypes.LP,
     cat: 'Partnerships',
     blurbs: [
       `Frequently used in real estate developments or film industry projects.  This type of partnership ends when
@@ -120,7 +120,7 @@ export const EntityTypesBcData: EntityI[] = [
   },
   {
     text: 'Limited Liability Partnership',
-    value: EntityType.LL,
+    value: EntityTypes.LL,
     cat: 'Partnerships',
     blurbs: [
       'Frequently used by professionals such as doctors or lawyers to form a practice.',
@@ -135,7 +135,7 @@ export const EntityTypesBcData: EntityI[] = [
   },
   {
     text: 'Cooperative Association',
-    value: EntityType.CP,
+    value: EntityTypes.CP,
     cat: 'Social Enterprises',
     blurbs: [
       'Membership-based organization, owned and operated by the people who use its services.',
@@ -164,7 +164,7 @@ export const EntityTypesBcData: EntityI[] = [
   },
   {
     text: 'Benefit Company',
-    value: EntityType.BC,
+    value: EntityTypes.BC,
     cat: 'Corporations',
     blurbs: [
       `A type of corporation with special commitments to conduct business in a responsible and sustainable way.`,
@@ -190,7 +190,7 @@ export const EntityTypesBcData: EntityI[] = [
   },
   {
     text: 'Community Contribution Company',
-    value: EntityType.CC,
+    value: EntityTypes.CC,
     cat: 'Social Enterprises',
     blurbs: [
       `A type of corporation that has a benefit to the community. It is intended to bridge the gap between
@@ -217,7 +217,7 @@ export const EntityTypesBcData: EntityI[] = [
   },
   {
     text: 'Society',
-    value: EntityType.SO,
+    value: EntityTypes.SO,
     cat: 'Social Enterprises',
     blurbs: [
       `A non-profit organization that is also known as a non-share corporation.`,
@@ -235,13 +235,16 @@ export const EntityTypesBcData: EntityI[] = [
       'Has name protection in BC',
       'Must use Societies Online to register a name and incorporate'
     ],
+    amlBlurbs: [
+      'Society amalgamation'
+    ],
     chgBlurbs: [
       'Societies must use Societies Online to get their name.'
     ]
   },
   {
     text: 'Private Act',
-    value: EntityType.PA,
+    value: EntityTypes.PA,
     cat: 'Other',
     blurbs: [
       `A special type of business structure that may often be established through legislation or by economic growth
@@ -252,7 +255,7 @@ export const EntityTypesBcData: EntityI[] = [
   },
   {
     text: 'Credit Union',
-    value: EntityType.FI,
+    value: EntityTypes.FI,
     cat: 'Other',
     blurbs: [
       'Credit union',
@@ -268,7 +271,7 @@ export const EntityTypesBcData: EntityI[] = [
   },
   {
     text: 'Parish',
-    value: EntityType.PAR,
+    value: EntityTypes.PAR,
     cat: 'Other',
     blurbs: [
       'Church Parish',
@@ -280,8 +283,8 @@ export const EntityTypesBcData: EntityI[] = [
 
 export const EntityTypesXproData: EntityI[] = [
   {
-    text: 'Limited Company',
-    value: EntityType.XCR,
+    text: 'Extraprovincial Limited Company',
+    value: EntityTypes.XCR,
     cat: 'Corporations',
     blurbs: [
       `Corporation established and operating in a Canadian province or territory that plans to operate in
@@ -296,14 +299,8 @@ export const EntityTypesXproData: EntityI[] = [
       'Reinstate an extraprovincially registered company that is no longer active with BC Registries.'
     ],
     amlBlurbs: [
-      [
-        `Register an amalgamation that occurred in another jurisdiction where at least one of the companies is
-           extraprovincially registered in BC.`
-      ],
-      [
-        `Register an amalgamation or merger that occurred in another jurisdiction where at least one of the companies
-          is extraprovincially registered in BC.`
-      ]
+      `Register an amalgamation or merger that occurred in another jurisdiction where at least one of the companies
+        is extraprovincially registered in BC.`
     ],
     chgBlurbs: [
       [
@@ -318,8 +315,8 @@ export const EntityTypesXproData: EntityI[] = [
     rank: 1
   },
   {
-    text: 'Unlimited Liability Company',
-    value: EntityType.XUL,
+    text: 'Extraprovincial Unlimited Liability Company',
+    value: EntityTypes.XUL,
     cat: 'Corporations',
     blurbs: [
       'ULC established and operating in Alberta or Nova Scotia and plans to operate in BC as well.',
@@ -334,9 +331,7 @@ export const EntityTypesXproData: EntityI[] = [
       'Unlimited liability company'
     ],
     amlBlurbs: [
-      [
-        'Unlimited liability company'
-      ]
+      'Unlimited liability company amalgamation'
     ],
     chgBlurbs: [
       [
@@ -345,8 +340,8 @@ export const EntityTypesXproData: EntityI[] = [
     ]
   },
   {
-    text: 'Limited Liability Company',
-    value: EntityType.RLC,
+    text: 'Extraprovincial Limited Liability Company',
+    value: EntityTypes.RLC,
     cat: 'Corporations',
     blurbs: [
       ''
@@ -364,9 +359,7 @@ export const EntityTypesXproData: EntityI[] = [
         active with BC Registries.`
     ],
     amlBlurbs: [
-      [
-        '*** REMOVE THIS OPTION FROM AML REQUESTS ***'
-      ]
+      'Limited liability company amalgamation'
     ],
     chgBlurbs: [
       [
@@ -379,8 +372,8 @@ export const EntityTypesXproData: EntityI[] = [
     ]
   },
   {
-    text: 'Limited Partnership',
-    value: EntityType.XLP,
+    text: 'Extraprovincial Limited Partnership',
+    value: EntityTypes.XLP,
     cat: 'Partnerships',
     blurbs: [
       `Limited partnership (LP) established and operating in a Canadian province or territory that plans
@@ -395,9 +388,7 @@ export const EntityTypesXproData: EntityI[] = [
       'Limited partnership'
     ],
     amlBlurbs: [
-      [
-        'Limited partnership'
-      ]
+      'Limited partnership amalgamation'
     ],
     chgBlurbs: [
       [
@@ -407,8 +398,8 @@ export const EntityTypesXproData: EntityI[] = [
     ]
   },
   {
-    text: 'Limited Liability Partnership',
-    value: EntityType.XLL,
+    text: 'Extraprovincial Limited Liability Partnership',
+    value: EntityTypes.XLL,
     cat: 'Partnerships',
     blurbs: [
       `Limited liability partnership (LLP) established and operating in a Canadian province or territory
@@ -424,9 +415,7 @@ export const EntityTypesXproData: EntityI[] = [
       'Limited liability partnership'
     ],
     amlBlurbs: [
-      [
-        'Limited liability partnership'
-      ]
+      'Limited liability partnership amalgamation'
     ],
     chgBlurbs: [
       [
@@ -436,8 +425,8 @@ export const EntityTypesXproData: EntityI[] = [
     ]
   },
   {
-    text: 'Cooperative Association',
-    value: EntityType.XCP,
+    text: 'Extraprovincial Cooperative Association',
+    value: EntityTypes.XCP,
     cat: 'Social Enterprises',
     blurbs: [
       `Cooperative association established and operating in a Canadian province or territory or in the federal
@@ -452,10 +441,8 @@ export const EntityTypesXproData: EntityI[] = [
       'Restore an extraprovincially registered cooperative association that is no longer active with BC Registries.'
     ],
     amlBlurbs: [
-      [
-        `Register an amalgamation that occurred in another jurisdiction where at least one of the cooperative
-          associations is extraprovincially registered in BC.`
-      ]
+      `Register an amalgamation that occurred in another jurisdiction where at least one of the cooperative
+        associations is extraprovincially registered in BC.`
     ],
     chgBlurbs: [
       [
@@ -465,8 +452,8 @@ export const EntityTypesXproData: EntityI[] = [
     ]
   },
   {
-    text: 'Society',
-    value: EntityType.XSO,
+    text: 'Extraprovincial Society',
+    value: EntityTypes.XSO,
     cat: 'Social Enterprises',
     blurbs: [
       'A non-profit organization that is also known as a non-share corporation.',
@@ -484,9 +471,7 @@ export const EntityTypesXproData: EntityI[] = [
       'Must use Societies Online to register a name and incorporate'
     ],
     amlBlurbs: [
-      [
-        'Society'
-      ]
+      'Society amalgamation'
     ],
     chgBlurbs: [
       [
diff --git a/src/list-data/request-action-mapping.ts b/src/list-data/request-action-mapping.ts
index 9451b8a55..53e8e7906 100644
--- a/src/list-data/request-action-mapping.ts
+++ b/src/list-data/request-action-mapping.ts
@@ -1,86 +1,91 @@
-import { EntityType, NrRequestActionCodes } from '@/enums'
+import { EntityTypes, NrRequestActionCodes } from '@/enums'
 import { RequestActionMappingI, MappingI } from '@/interfaces'
 
-const entityTypesBC = [
-  EntityType.FR,
-  EntityType.DBA,
-  EntityType.CR,
-  EntityType.UL,
-  EntityType.GP,
-  EntityType.LP,
-  EntityType.LL,
-  EntityType.CP,
-  EntityType.BC,
-  EntityType.CC,
-  EntityType.SO,
-  EntityType.PA,
-  EntityType.FI,
-  EntityType.PAR
+const EntityTypesBC = [
+  EntityTypes.FR,
+  EntityTypes.DBA,
+  EntityTypes.CR,
+  EntityTypes.UL,
+  EntityTypes.GP,
+  EntityTypes.LP,
+  EntityTypes.LL,
+  EntityTypes.CP,
+  EntityTypes.BC,
+  EntityTypes.CC,
+  EntityTypes.SO,
+  EntityTypes.PA,
+  EntityTypes.FI,
+  EntityTypes.PAR
 ]
 
 // maps request_action_cd (key) to array of allowable entities (value)
 // { [request_action_cd]: entity_type_cd[] }
 export const BcMapping: RequestActionMappingI = {
   AML: [
-    EntityType.CR,
-    EntityType.UL,
-    EntityType.CC,
-    EntityType.CP,
-    EntityType.BC,
-    EntityType.SO
+    EntityTypes.CR,
+    EntityTypes.UL,
+    EntityTypes.CC,
+    EntityTypes.CP,
+    EntityTypes.BC,
+    EntityTypes.SO
   ],
   REN: [
-    EntityType.CR,
-    EntityType.CP,
-    EntityType.CC,
-    EntityType.UL,
-    EntityType.FI,
-    EntityType.BC,
-    EntityType.SO
+    EntityTypes.CR,
+    EntityTypes.CP,
+    EntityTypes.CC,
+    EntityTypes.UL,
+    EntityTypes.FI,
+    EntityTypes.BC,
+    EntityTypes.SO
   ],
   REH: [
-    EntityType.CR,
-    EntityType.CP,
-    EntityType.CC,
-    EntityType.UL,
-    EntityType.FI,
-    EntityType.BC,
-    EntityType.SO
+    EntityTypes.CR,
+    EntityTypes.CP,
+    EntityTypes.CC,
+    EntityTypes.UL,
+    EntityTypes.FI,
+    EntityTypes.BC,
+    EntityTypes.SO
   ],
-  CHG: entityTypesBC.filter(ent => ent !== EntityType.PAR && ent !== EntityType.PA),
+  // every entity type except Parishes and Private Act
+  CHG: EntityTypesBC.filter(ent => ent !== EntityTypes.PAR && ent !== EntityTypes.PA),
   MVE: [
-    EntityType.CR,
-    EntityType.CC,
-    EntityType.CP,
-    EntityType.UL,
-    EntityType.SO,
-    EntityType.BC
+    EntityTypes.CR,
+    EntityTypes.CC,
+    EntityTypes.CP,
+    EntityTypes.UL,
+    EntityTypes.SO,
+    EntityTypes.BC
   ]
 }
 
 export const XproMapping: MappingI = {
+  AML: [
+    EntityTypes.XCR,
+    EntityTypes.XCP
+  ],
   ASSUMED: [
-    EntityType.XCR,
-    EntityType.RLC
+    EntityTypes.XCR,
+    EntityTypes.RLC
   ],
   REN: [
-    EntityType.XCR,
-    EntityType.XCP,
-    EntityType.RLC
+    EntityTypes.XCR,
+    EntityTypes.XCP,
+    EntityTypes.RLC
   ],
   REH: [
-    EntityType.A,
-    EntityType.LLC,
-    EntityType.XCP,
-    EntityType.XS
+    EntityTypes.A,
+    EntityTypes.LLC,
+    EntityTypes.XCP,
+    EntityTypes.XS
   ],
   CHG: [
-    EntityType.A,
-    EntityType.XP,
-    EntityType.XL,
-    EntityType.LLC,
-    EntityType.XCP,
-    EntityType.XS
+    EntityTypes.A,
+    EntityTypes.XP,
+    EntityTypes.XL,
+    EntityTypes.LLC,
+    EntityTypes.XCP,
+    EntityTypes.XS
   ]
 }
 
@@ -93,18 +98,18 @@ export const BusinessLookupRequestActions = [
 
 /** Entity types that require business lookup. */
 export const BusinessLookupEntityTypes = [
-  EntityType.BC,
-  EntityType.CC,
-  EntityType.CR,
-  EntityType.UL,
-  EntityType.XCR,
-  EntityType.XUL
+  EntityTypes.BC,
+  EntityTypes.CC,
+  EntityTypes.CR,
+  EntityTypes.UL,
+  EntityTypes.XCR,
+  EntityTypes.XUL
 ]
 
 /** Entity types that support the numbered company option. */
 export const NumberedEntityTypes = [
-  EntityType.BC,
-  EntityType.CC,
-  EntityType.CR,
-  EntityType.UL
+  EntityTypes.BC,
+  EntityTypes.CC,
+  EntityTypes.CR,
+  EntityTypes.UL
 ]
diff --git a/src/list-data/request-actions.ts b/src/list-data/request-actions.ts
index 531ba8cf1..fdf340333 100644
--- a/src/list-data/request-actions.ts
+++ b/src/list-data/request-actions.ts
@@ -51,7 +51,7 @@ export const RequestActions: RequestActionsI[] = [
   },
   {
     group: 2,
-    text: 'Combine two or more businesses in BC',
+    text: 'Combine two or more businesses in BC using a new name',
     subtext: 'Amalgamation',
     shortDesc: 'Amalgamation Request',
     value: NrRequestActionCodes.AMALGAMATE
diff --git a/src/mixins/common-mixin.ts b/src/mixins/common-mixin.ts
index 65963f4a6..4b488b712 100644
--- a/src/mixins/common-mixin.ts
+++ b/src/mixins/common-mixin.ts
@@ -1,5 +1,5 @@
 import { Component, Vue } from 'vue-property-decorator'
-import { EntityType, PriorityCode, NrRequestActionCodes, NrRequestTypeCodes } from '@/enums'
+import { EntityTypes, PriorityCode, NrRequestActionCodes, NrRequestTypeCodes } from '@/enums'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 import { GetFeatureFlag } from '@/plugins'
 
@@ -21,33 +21,33 @@ export class CommonMixin extends Vue {
 
   /** Returns entity type text for the the specified code. */
   // FUTURE: use GetCorpFullDescription() instead
-  entityTypeCdToText (cd: EntityType): string {
+  entityTypeCdToText (cd: EntityTypes): string {
     switch (cd) {
       // BC Entity Types:
-      case EntityType.BC: return 'BC Benefit Company'
-      case EntityType.CC: return 'BC Community Contribution Company'
-      case EntityType.CP: return 'BC Cooperative Association'
-      case EntityType.CR: return 'BC Limited Company'
-      case EntityType.DBA: return 'BC "Doing Business As" name (DBA)'
-      case EntityType.FI: return 'BC Credit Union'
-      case EntityType.FR: return 'BC Sole Proprietorship'
-      case EntityType.GP: return 'BC General Partnership'
-      case EntityType.LL: return 'BC Limited Liability Partnership'
-      case EntityType.LP: return 'BC Limited Partnership'
-      case EntityType.PA: return 'BC Private Act'
-      case EntityType.PAR: return 'BC Parish'
-      case EntityType.SO: return 'BC Social Enterprise'
-      case EntityType.SP: return 'BC Sole Proprietorship'
-      case EntityType.UL: return 'BC Unlimited Liability Company'
+      case EntityTypes.BC: return 'BC Benefit Company'
+      case EntityTypes.CC: return 'BC Community Contribution Company'
+      case EntityTypes.CP: return 'BC Cooperative Association'
+      case EntityTypes.CR: return 'BC Limited Company'
+      case EntityTypes.DBA: return 'BC "Doing Business As" name (DBA)'
+      case EntityTypes.FI: return 'BC Credit Union'
+      case EntityTypes.FR: return 'BC Sole Proprietorship'
+      case EntityTypes.GP: return 'BC General Partnership'
+      case EntityTypes.LL: return 'BC Limited Liability Partnership'
+      case EntityTypes.LP: return 'BC Limited Partnership'
+      case EntityTypes.PA: return 'BC Private Act'
+      case EntityTypes.PAR: return 'BC Parish'
+      case EntityTypes.SO: return 'BC Social Enterprise'
+      case EntityTypes.SP: return 'BC Sole Proprietorship'
+      case EntityTypes.UL: return 'BC Unlimited Liability Company'
 
       // XPRO Entity Types:
-      case EntityType.XCR: return 'Extraprovincial Limited Company'
-      case EntityType.XUL: return 'Extraprovincial Unlimited Liability Company'
-      case EntityType.RLC: return 'Extraprovincial Limited Liability Company'
-      case EntityType.XLP: return 'Extraprovincial Limited Partnership'
-      case EntityType.XLL: return 'Extraprovincial Limited Liability Partnership'
-      case EntityType.XCP: return 'Extraprovincial Cooperative Association'
-      case EntityType.XSO: return 'Extraprovincial Social Enterprise'
+      case EntityTypes.XCR: return 'Extraprovincial Limited Company'
+      case EntityTypes.XUL: return 'Extraprovincial Unlimited Liability Company'
+      case EntityTypes.RLC: return 'Extraprovincial Limited Liability Company'
+      case EntityTypes.XLP: return 'Extraprovincial Limited Partnership'
+      case EntityTypes.XLL: return 'Extraprovincial Limited Liability Partnership'
+      case EntityTypes.XCP: return 'Extraprovincial Cooperative Association'
+      case EntityTypes.XSO: return 'Extraprovincial Social Enterprise'
 
       default: return (cd as unknown as string)
     }
@@ -57,13 +57,13 @@ export class CommonMixin extends Vue {
    * The alternate codes for entity types.
    * Alternate codes are used in Entities UIs.
    */
-  entityTypeToCorpType (entityType: EntityType): CorpTypeCd {
+  entityTypeToCorpType (entityType: EntityTypes): CorpTypeCd {
     switch (entityType) {
-      case EntityType.BC: return CorpTypeCd.BENEFIT_COMPANY
-      case EntityType.CC: return CorpTypeCd.BC_CCC
-      case EntityType.CR: return CorpTypeCd.BC_COMPANY
-      case EntityType.UL: return CorpTypeCd.BC_ULC_COMPANY
-      case EntityType.CP: return CorpTypeCd.COOP
+      case EntityTypes.BC: return CorpTypeCd.BENEFIT_COMPANY
+      case EntityTypes.CC: return CorpTypeCd.BC_CCC
+      case EntityTypes.CR: return CorpTypeCd.BC_COMPANY
+      case EntityTypes.UL: return CorpTypeCd.BC_ULC_COMPANY
+      case EntityTypes.CP: return CorpTypeCd.COOP
       default: return null
     }
   }
@@ -72,13 +72,13 @@ export class CommonMixin extends Vue {
    * Entities UI codes to Name Request Code
    * @example ULC --> UL
    */
-  corpTypeToEntityType (entityType: CorpTypeCd): EntityType {
+  corpTypeToEntityType (entityType: CorpTypeCd): EntityTypes {
     switch (entityType) {
-      case CorpTypeCd.BENEFIT_COMPANY: return EntityType.BC
-      case CorpTypeCd.BC_CCC: return EntityType.CC
-      case CorpTypeCd.BC_COMPANY: return EntityType.CR
-      case CorpTypeCd.BC_ULC_COMPANY: return EntityType.UL
-      case CorpTypeCd.COOP: return EntityType.CP
+      case CorpTypeCd.BENEFIT_COMPANY: return EntityTypes.BC
+      case CorpTypeCd.BC_CCC: return EntityTypes.CC
+      case CorpTypeCd.BC_COMPANY: return EntityTypes.CR
+      case CorpTypeCd.BC_ULC_COMPANY: return EntityTypes.UL
+      case CorpTypeCd.COOP: return EntityTypes.CP
       default: return null
     }
   }
@@ -109,9 +109,11 @@ export class CommonMixin extends Vue {
 
   /** Returns true if the specified alteration NR is allowed to be done online. */
   isAlterOnline (type: NrRequestTypeCodes): boolean {
-    return !(type === NrRequestTypeCodes.CONVERT_BEN ||
+    return !(
+      type === NrRequestTypeCodes.CONVERT_BEN ||
       type === NrRequestTypeCodes.CONVERT_CORP ||
-      type === NrRequestTypeCodes.CONVERT_ULBE)
+      type === NrRequestTypeCodes.CONVERT_ULBE
+    )
   }
 
   /** Returns true if the specified NR is a priority request. */
@@ -119,13 +121,16 @@ export class CommonMixin extends Vue {
     return (nr?.priorityCd === PriorityCode.YES)
   }
 
-  /** Returns true if the specified NR is for a supported Incorporation Entity Type (FF). */
-  isSupportedEntity (nr: any): boolean {
+  /** Returns true if the specified entity type is allowed for Incorporation / Registration. */
+  isSupportedIncorporationRegistration (type: EntityTypes): boolean {
     const supportedEntites = GetFeatureFlag('supported-incorporation-registration-entities')
-    return supportedEntites.includes(nr?.entity_type_cd)
+    return supportedEntites.includes(type)
   }
 
-  /** in case Societies NR needs to be released AFTER the way of navigating changes (feature branch) */
+  /**
+   * Returns true if society NRs are enabled -- in case societies NRs need to be released
+   * separately from the Way of Navigating feature changes.
+   */
   isSocietyEnabled (): boolean {
     return GetFeatureFlag('enable-society')
   }
@@ -133,29 +138,35 @@ export class CommonMixin extends Vue {
   /** Returns true if the specified NR is for a firm (SP/GP). */
   isFirm (nr: any): boolean {
     return [
-      EntityType.SP,
-      EntityType.DBA,
-      EntityType.GP
+      EntityTypes.SP,
+      EntityTypes.DBA,
+      EntityTypes.GP
     ].includes(nr?.legalType)
   }
 
-  /** Returns true if the specified NR is for alteration (conversion). */
+  /** Returns true if the specified request type is allowed for alteration (conversion). */
   isSupportedAlteration (type: NrRequestTypeCodes): boolean {
     const supportedAlterationTypes = GetFeatureFlag('supported-alteration-types')
     return supportedAlterationTypes.includes(type)
   }
 
-  /** Returns true if the specified NR is for an Extraprovincial Company. */
-  isXProCompany (nr: any): boolean {
+  /** Returns true if the specified entity type is allowed for amalganation. */
+  isSupportedAmalgamation (type: EntityTypes): boolean {
+    const supportedAmalgamationEntities = GetFeatureFlag('supported-amalgamation-entities')
+    return supportedAmalgamationEntities.includes(type)
+  }
+
+  /** Returns true if the specified entity type is for an Extraprovincial Company. */
+  isXproEntityType (type: EntityTypes): boolean {
     return [
-      EntityType.XCR,
-      EntityType.XUL,
-      EntityType.RLC,
-      EntityType.XLP,
-      EntityType.XLL,
-      EntityType.XCP,
-      EntityType.XSO
-    ].includes(nr?.entity_type_cd)
+      EntityTypes.XCR,
+      EntityTypes.XUL,
+      EntityTypes.RLC,
+      EntityTypes.XLP,
+      EntityTypes.XLL,
+      EntityTypes.XCP,
+      EntityTypes.XSO
+    ].includes(type)
   }
 
   /** Scroll to given element Id */
diff --git a/src/mixins/nr-affiliation-mixin.ts b/src/mixins/nr-affiliation-mixin.ts
index 0e8838be9..c2224aded 100644
--- a/src/mixins/nr-affiliation-mixin.ts
+++ b/src/mixins/nr-affiliation-mixin.ts
@@ -136,7 +136,7 @@ export class NrAffiliationMixin extends Mixins(CommonMixin) {
   private getBusinessRequest (accountId: number, nr: NameRequestI): BusinessRequest {
     let name = 'registration'
     let legalType = nr.legalType
-    if (this.isSupportedEntity(nr)) {
+    if (this.isSupportedIncorporationRegistration(nr.entity_type_cd)) {
       name = 'incorporationApplication'
       legalType = this.entityTypeToCorpType(nr.entity_type_cd)
     }
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 99bc9b3bd..44cafc8f6 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -1,8 +1,7 @@
-export * from './interceptors'
+export * from './interceptors' // must be first
 export * from './authHelper'
 export * from './featureFlags'
 export * from './getConfig'
-export * from './interceptors'
 export * from './navigate'
 export * from './sleep'
 export * from './utilities'
diff --git a/src/store/actions.ts b/src/store/actions.ts
index 0bf114ef9..1e00fd673 100644
--- a/src/store/actions.ts
+++ b/src/store/actions.ts
@@ -2,7 +2,7 @@ import querystring from 'qs'
 import axios from 'axios'
 import {
   EntityStates,
-  EntityType,
+  EntityTypes,
   Location,
   NameCheckAnalysisJurisdiction,
   NameCheckAnalysisType,
@@ -320,7 +320,7 @@ export async function searchBusiness ({ getters }, corpNum: string): Promise<Bus
         return {
           identifier: corpNum, // data['incorp #'],
           legalName: 'Future Name From COLIN',
-          legalType: EntityType.BC,
+          legalType: EntityTypes.BC,
           state: EntityStates.ACTIVE
         }
       } catch (error) {
@@ -552,11 +552,11 @@ export const setCorpSearch = ({ commit }, corpSearch: string): void => {
   commit('mutateCorpSearch', corpSearch)
 }
 
-export const setEntityTypeCd = ({ commit }, entityTypeCd: EntityType): void => {
+export const setEntityTypeCd = ({ commit }, entityTypeCd: EntityTypes): void => {
   commit('mutateEntityType', entityTypeCd)
 }
 
-export const setOriginEntityTypeCd = ({ commit }, originEntityTypeCd: EntityType): void => {
+export const setOriginEntityTypeCd = ({ commit }, originEntityTypeCd: EntityTypes): void => {
   commit('mutateOriginEntityType', originEntityTypeCd)
 }
 
@@ -967,7 +967,7 @@ const parseRestrictedWords = ({ getters }, resp: RestrictedResponseIF): ParsedRe
 
     // rules for ignoring restricted/conditional phrases
     const entityCd = getters.getEntityTypeCd
-    if (entityCd === EntityType.CR && Designations[EntityType.CC].words.includes(phrase)) continue
+    if (entityCd === EntityTypes.CR && Designations[EntityTypes.CC].words.includes(phrase)) continue
     if (Designations[entityCd].words.includes(phrase)) continue
 
     // split into restricted vs conditional
@@ -1151,13 +1151,13 @@ export const startAnalyzeName = async ({ commit, getters }) => {
       else commit('mutateSpecialCharacters', [])
       // extra designation rules that aren't in the backend for coops/cccs
       const entity_type_cd = getters.getEntityTypeCd
-      if ([EntityType.CP, EntityType.XCP, EntityType.CC].includes(entity_type_cd)) {
+      if ([EntityTypes.CP, EntityTypes.XCP, EntityTypes.CC].includes(entity_type_cd)) {
         let entityPhraseChoices = []
         let basePhrases = Designations[entity_type_cd].words
         // these are the inner phrases for the CCC and CP types.  Filtering out CR designations from CPs has no effect
         // and CCC designations are a mix of CR-type ending designations and CCC specific inner phrases so filter out
         // the CR designations for the purposes of this getter
-        entityPhraseChoices = basePhrases.filter(phrase => !Designations[EntityType.CR].words.includes(phrase))
+        entityPhraseChoices = basePhrases.filter(phrase => !Designations[EntityTypes.CR].words.includes(phrase))
         if (entityPhraseChoices.some(phrase => name.startsWith(phrase))) {
           let phrase = name.split(' ')[0].replace('COMMUNITY', 'COMMUNITY CONTRIBUTION COMPANY')
           commit('mutateDesignationsCheckUse', [phrase])
diff --git a/src/store/getters.ts b/src/store/getters.ts
index ba6461a8b..80b5be7c0 100644
--- a/src/store/getters.ts
+++ b/src/store/getters.ts
@@ -27,7 +27,7 @@ import {
   SubmissionTypeT
 } from '@/interfaces'
 import {
-  EntityType,
+  EntityTypes,
   Location,
   NrAffiliationErrors,
   NrRequestActionCodes,
@@ -113,23 +113,17 @@ export const getLocation = (state: StateIF): Location => {
 
 /** True if current request location is Canadian. */
 export const isCanadian = (state: StateIF): boolean => {
-  return (
-    getLocation(state) === Location.CA &&
-    getJurisdictionCd(state) !== Location.FD
-  )
+  return (isLocationCA(state) && getJurisdictionCd(state) !== Location.FD)
 }
 
 /** True if current request location is Federal. */
 export const isFederal = (state: StateIF): boolean => {
-  return (
-    getLocation(state) === Location.CA &&
-    getJurisdictionCd(state) === Location.FD
-  )
+  return (isLocationCA(state) && getJurisdictionCd(state) === Location.FD)
 }
 
 /** True if current request location is International. */
 export const isInternational = (state: StateIF): boolean => {
-  return (getLocation(state) === Location.IN)
+  return (isLocationIN(state))
 }
 
 export const getLocationText = (state: StateIF): string => {
@@ -141,7 +135,7 @@ export const getJurisdictionCd = (state: StateIF): string => {
 }
 
 export const getJurisdictionText = (state: StateIF): string => {
-  return (getLocation(state) === Location.CA)
+  return (isLocationCA(state))
     ? CanJurisdictions.find(jur => jur.value === getJurisdictionCd(state))?.text
     : IntlJurisdictions.find(jur => jur.value === getJurisdictionCd(state))?.text
 }
@@ -150,11 +144,11 @@ export const getMrasSearchResultCode = (state: StateIF): number => {
   return state.stateModel.newRequestModel.mrasSearchResultCode
 }
 
-export const getEntityTypeCd = (state: StateIF): EntityType => {
+export const getEntityTypeCd = (state: StateIF): EntityTypes => {
   return state.stateModel.newRequestModel.entity_type_cd
 }
 
-export const getOriginEntityTypeCd = (state: StateIF): EntityType => {
+export const getOriginEntityTypeCd = (state: StateIF): EntityTypes => {
   return state.stateModel.newRequestModel.origin_entity_type_cd
 }
 
@@ -210,7 +204,7 @@ export const isRestoration = (state: StateIF): boolean => {
 }
 
 /**
- * True if current flow is XPRO (includes AMALGAMATION, NEW_BUSINESS, RESTORATION and CHANGE_NAME).
+ * True if current flow supports XPRO (includes AMALGAMATION, NEW_BUSINESS, RESTORATION and CHANGE_NAME).
  * FUTURE: Might need to add others.
  */
 export const isXproFlow = (state: StateIF): boolean => {
@@ -291,7 +285,7 @@ export const getIsPersonsName = (state: StateIF): boolean => {
   return state.stateModel.newRequestModel.isPersonsName
 }
 
-export const getDoNotAnalyzeEntities = (state: StateIF): EntityType[] => {
+export const getDoNotAnalyzeEntities = (state: StateIF): EntityTypes[] => {
   return state.stateModel.newRequestModel.doNotAnalyzeEntities
 }
 
@@ -419,69 +413,76 @@ export const getConversionTypeOptions = (state: StateIF): ConversionTypesI[] =>
   })
 }
 
+/** True if location is British Columbia. */
+export const isLocationBC = (state: StateIF): boolean => {
+  return (getLocation(state) === Location.BC)
+}
+
+/** True if location is Canada. */
+export const isLocationCA = (state: StateIF): boolean => {
+  return (getLocation(state) === Location.CA)
+}
+
+/** True if location is International. */
+export const isLocationIN = (state: StateIF): boolean => {
+  return (getLocation(state) === Location.IN)
+}
+
 /** Map the appropriate Blurb based on the request action and location */
 export const getEntityBlurbs = (state: StateIF): Array<EntityI | ConversionTypesI> => {
-  switch (getRequestActionCd(state)) {
-    case NrRequestActionCodes.NEW_BUSINESS:
-      if (getLocation(state) === Location.BC) {
-        return EntityTypesBcData
-      }
-      if (getLocation(state) === Location.CA) {
-        return EntityTypesXproData
-      }
-      if (getLocation(state) === Location.IN) {
-        return EntityTypesXproData.map(x => ({ ...x, blurbs: x.intBlurbs }))
-      }
-      break
+  if (isNewBusiness(state)) {
+    if (isLocationBC(state)) {
+      return EntityTypesBcData
+    }
+    if (isLocationCA(state)) {
+      return EntityTypesXproData
+    }
+    if (isLocationIN(state)) {
+      return EntityTypesXproData.map(x => ({ ...x, blurbs: x.intBlurbs }))
+    }
+  }
 
-    case NrRequestActionCodes.MOVE:
-      if (getLocation(state) === Location.BC) {
-        return EntityTypesBcData.map(x => ({ ...x, blurbs: x.mveBlurbs }))
-      }
-      break
+  if (isContinuationIn(state)) {
+    if (isLocationBC(state)) {
+      return EntityTypesBcData.map(x => ({ ...x, blurbs: x.mveBlurbs }))
+    }
+  }
 
-    case NrRequestActionCodes.RESTORE:
-      if (getLocation(state) === Location.BC) {
-        return EntityTypesBcData.map(x => ({ ...x, blurbs: x.rehBlurbs }))
-      }
-      if ([Location.CA, Location.IN].includes(getLocation(state))) {
-        return EntityTypesXproData.map(x => ({ ...x, blurbs: x.rehBlurbs }))
-      }
-      break
+  if (isRestoration(state)) {
+    if (isLocationBC(state)) {
+      return EntityTypesBcData.map(x => ({ ...x, blurbs: x.rehBlurbs }))
+    }
+    if ([Location.CA, Location.IN].includes(getLocation(state))) {
+      return EntityTypesXproData.map(x => ({ ...x, blurbs: x.rehBlurbs }))
+    }
+  }
 
-    case NrRequestActionCodes.AMALGAMATE:
-      if (getLocation(state) === Location.BC) {
-        return EntityTypesBcData.map(x => ({ ...x, blurbs: x.amlBlurbs }))
-      }
-      if (getLocation(state) === Location.CA) {
-        return EntityTypesXproData.map(x => ({ ...x, blurbs: x.amlBlurbs[0] }))
-      }
-      if (getLocation(state) === Location.IN) {
-        // If international blurb is the same as national, map that blurb
-        return EntityTypesXproData.map(x => ({ ...x, blurbs: x.amlBlurbs[1] || x.amlBlurbs[0] }))
-      }
-      break
+  if (isAmalgamation(state)) {
+    const bc = EntityTypesBcData.map(x => ({ ...x, blurbs: x.amlBlurbs }))
+    const xpro = EntityTypesXproData.map(x => ({ ...x, blurbs: x.amlBlurbs }))
+    return bc.concat(xpro)
+  }
 
-    case NrRequestActionCodes.CHANGE_NAME:
-      if (getLocation(state) === Location.BC) {
-        return EntityTypesBcData.map(x => ({ ...x, blurbs: x.chgBlurbs }))
-      }
-      if (getLocation(state) === Location.CA) {
-        return EntityTypesXproData.map(x => ({ ...x, blurbs: x.chgBlurbs[0] }))
-      }
-      if (getLocation(state) === Location.IN) {
-        // If international blurb is the same as national, map that blurb
-        return EntityTypesXproData.map(x => ({ ...x, blurbs: x.chgBlurbs[1] || x.chgBlurbs[0] }))
-      }
-      break
+  if (isChangeName(state)) {
+    if (isLocationBC(state)) {
+      return EntityTypesBcData.map(x => ({ ...x, blurbs: x.chgBlurbs }))
+    }
+    if (isLocationCA(state)) {
+      return EntityTypesXproData.map(x => ({ ...x, blurbs: x.chgBlurbs[0] }))
+    }
+    if (isLocationIN(state)) {
+      // If international blurb is the same as national, map that blurb
+      return EntityTypesXproData.map(x => ({ ...x, blurbs: x.chgBlurbs[1] || x.chgBlurbs[0] }))
+    }
+  }
 
-    case NrRequestActionCodes.CONVERSION:
-      if (getLocation(state) === Location.BC) {
-        return ConversionTypes
-      }
-      break
+  if (isConversion(state)) {
+    if (isLocationBC(state)) {
+      return ConversionTypes
+    }
   }
-  return null
+
+  return []
 }
 
 /** The BC Entity Types. */
@@ -491,8 +492,9 @@ export const getEntityTypesBC = (state: StateIF): EntityI[] => {
       let output = []
       for (let entity of entities) {
         let obj = EntityTypesBcData.find(ent => ent.value === entity)
-        // "CR" type is shortlisted. if CR exists in filtered entity_types, preserve its rank and shortlist keys
-        if (entity === EntityType.CR) {
+        // "CR" type is shortlisted
+        // if CR exists in filtered entity_types, preserve its rank and shortlist keys
+        if (entity === EntityTypes.CR) {
           output.push(obj)
           continue
         }
@@ -531,8 +533,8 @@ export const getEntityTypesBC = (state: StateIF): EntityI[] => {
 /** Get Xpro entity types. */
 export const getEntityTypesXPRO = (state: StateIF): EntityI[] => {
   let _entityTypesXproData = EntityTypesXproData
-  if (getLocation(state) === Location.CA) {
-    _entityTypesXproData = _entityTypesXproData.filter(ent => ent.value !== EntityType.RLC)
+  if (isLocationCA(state)) {
+    _entityTypesXproData = _entityTypesXproData.filter(ent => ent.value !== EntityTypes.RLC)
   }
 
   try {
@@ -541,12 +543,13 @@ export const getEntityTypesXPRO = (state: StateIF): EntityI[] => {
       for (let entity of entities) {
         // use EntityTypesXproData instead of scoped _entityTypesXproData here so that RLC can be included
         let obj = EntityTypesXproData.find(ent => ent.value === entity)
-        // "CR" type is shortlisted. if XCR exists in filtered entity_types, preserve its rank and shortlist keys
-        if (entity === EntityType.XCR) {
+        // "CR" type is shortlisted
+        // if XCR exists in filtered entity_types, preserve its rank and shortlist keys
+        if (entity === EntityTypes.XCR) {
           output.push(obj)
           continue
         }
-        if (getLocation(state) === Location.CA && entity === EntityType.RLC) {
+        if (isLocationCA(state) && entity === EntityTypes.RLC) {
           continue
         }
         let objSansRankAndShortlist = {}
@@ -587,51 +590,51 @@ export const getXproRequestTypeCd = (state: StateIF): XproNameType => {
   if (isAssumedName(state)) {
     switch (getEntityTypeCd(state)) {
       // Xpro Limited Liability Company REST/REN/REH/RESUBMIT -> Xpro Limited Liability Company AS/RESUBMIT
-      case EntityType.RLC: return XproNameType.AL
+      case EntityTypes.RLC: return XproNameType.AL
       // Xpro Corporation NEW_AML/NEW/AML/RESUBMIT -> Xpro Corporation AS/RESUBMIT
-      case EntityType.XCR: return XproNameType.AS
+      case EntityTypes.XCR: return XproNameType.AS
     }
   }
   return null
 }
 
-/** Get entity type options. */
+/** Get entity type options (short list only). */
 export const getEntityTypeOptions = (state: StateIF): Array<EntityI> => {
   const bcOptions: SelectOptionsI[] = getEntityTypesBC(state)?.filter(x => {
     // Set shortlisted entity types for BC Move and Restoration requests.
     if (
-      [NrRequestActionCodes.MOVE, NrRequestActionCodes.RESTORE].includes(getRequestActionCd(state)) &&
-      getLocation(state) === Location.BC
+      (isContinuationIn(state) || isRestoration(state)) &&
+      isLocationBC(state)
     ) {
       // Shortlist order: Limited Company, Cooperative Association
-      if (x.value === EntityType.CP) {
+      if (x.value === EntityTypes.CP) {
         x.shortlist = true
         x.rank = 2
-      } else if ([EntityType.FR, EntityType.GP, EntityType.UL].includes(x.value)) {
+      } else if ([EntityTypes.FR, EntityTypes.GP, EntityTypes.UL].includes(x.value)) {
         x.shortlist = null
         x.rank = null
       }
-    } else if (getRequestActionCd(state) === NrRequestActionCodes.AMALGAMATE && getLocation(state) === Location.BC) {
+    } else if (isAmalgamation(state)) {
       // Shortlist order: Limited Company, Unlimited Liability Company
-      if (x.value === EntityType.UL) {
+      if (x.value === EntityTypes.UL) {
         x.shortlist = true
         x.rank = 2
-      } else if ([EntityType.FR, EntityType.GP, EntityType.CP].includes(x.value)) {
+      } else if ([EntityTypes.FR, EntityTypes.GP, EntityTypes.CP].includes(x.value)) {
         x.shortlist = null
         x.rank = null
       }
     } else {
       // Shortlist order: Limited Company, Sole Proprietorship, DBA, General Partnership
-      if ([EntityType.UL, EntityType.CP].includes(x.value)) {
+      if ([EntityTypes.UL, EntityTypes.CP].includes(x.value)) {
         x.shortlist = null
         x.rank = null
-      } else if (x.value === EntityType.FR) {
+      } else if (x.value === EntityTypes.FR) {
         x.shortlist = true
         x.rank = 2
-      } else if (x.value === EntityType.DBA) {
+      } else if (x.value === EntityTypes.DBA) {
         x.shortlist = true
         x.rank = 3
-      } else if (x.value === EntityType.GP) {
+      } else if (x.value === EntityTypes.GP) {
         x.shortlist = true
         x.rank = 4
       }
@@ -643,41 +646,41 @@ export const getEntityTypeOptions = (state: StateIF): Array<EntityI> => {
 
   const xproOptions: SelectOptionsI[] = getEntityTypesXPRO(state).filter(x => {
     if (
-      getRequestActionCd(state) === NrRequestActionCodes.NEW_BUSINESS &&
-      [Location.CA, Location.IN].includes(getLocation(state))
+      isNewBusiness(state) &&
+      (isLocationCA(state) || isLocationIN(state))
     ) {
       // Shortlist order: Limited Company, Limited Partnership
-      if (x.value === EntityType.XLP) {
+      if (x.value === EntityTypes.XLP) {
         x.shortlist = true
         x.rank = 2
-      } else if (x.value === EntityType.XCP) {
+      } else if (x.value === EntityTypes.XCP) {
         x.shortlist = null
         x.rank = null
       }
     } else if (
-      getRequestActionCd(state) === NrRequestActionCodes.MOVE &&
-      [Location.CA, Location.IN].includes(getLocation(state))
+      isContinuationIn(state) &&
+      (isLocationCA(state) || isLocationIN(state))
     ) {
       // Shortlist order: Limited Company, Cooperative Association
-      if (x.value === EntityType.XLP) {
+      if (x.value === EntityTypes.XLP) {
         x.shortlist = null
         x.rank = null
-      } else if (x.value === EntityType.XCP) {
+      } else if (x.value === EntityTypes.XCP) {
         x.shortlist = true
         x.rank = 2
       }
     } else if (
-      getRequestActionCd(state) === NrRequestActionCodes.CHANGE_NAME &&
-      [Location.CA, Location.IN].includes(getLocation(state))
+      isChangeName(state) &&
+      (isLocationCA(state) || isLocationIN(state))
     ) {
       // Shortlist order: Limited Company, Limited Partnership, Limited Liability Partnership
-      if (x.value === EntityType.XLP) {
+      if (x.value === EntityTypes.XLP) {
         x.shortlist = true
         x.rank = 2
-      } else if (x.value === EntityType.XLL) {
+      } else if (x.value === EntityTypes.XLL) {
         x.shortlist = true
         x.rank = 3
-      } else if (x.value === EntityType.XCP) {
+      } else if (x.value === EntityTypes.XCP) {
         x.shortlist = null
         x.rank = null
       }
@@ -687,7 +690,7 @@ export const getEntityTypeOptions = (state: StateIF): Array<EntityI> => {
     }
   })
 
-  let options: SelectOptionsI[] = (getLocation(state) === Location.BC) ? [...bcOptions] : [...xproOptions]
+  let options: SelectOptionsI[] = (isLocationBC(state)) ? [...bcOptions] : [...xproOptions]
   let n = 4
 
   if (getEntityTypeAddToSelect(state)) {
@@ -699,25 +702,21 @@ export const getEntityTypeOptions = (state: StateIF): Array<EntityI> => {
   options = options.concat({ text: 'View all business types', value: 'INFO', rank: n })
 
   return options.sort((a, b) => {
-    if (a.rank < b.rank) {
-      return -1
-    }
-    if (a.rank > b.rank) {
-      return 1
-    }
+    if (a.rank < b.rank) return -1
+    if (a.rank > b.rank) return 1
     return 0
   })
 }
 
 /** Returned the filtered location options. */
 export const getLocationOptions = (state: StateIF): Array<any> => {
-  if (getRequestActionCd(state) === NrRequestActionCodes.CONVERSION) {
+  if (isConversion(state)) {
     return Locations.filter(location => location.value === Location.BC)
   }
-  if (getRequestActionCd(state) === NrRequestActionCodes.ASSUMED) {
+  if (isAssumed(state)) {
     return Locations.filter(location => location.value !== Location.BC)
   }
-  if (getRequestActionCd(state) === NrRequestActionCodes.MOVE) {
+  if (isContinuationIn(state)) {
     return Locations.filter(location => location.value === Location.BC)
   }
   return Locations.filter(() => true) // copy of Locations
@@ -933,7 +932,7 @@ export const getNrRequestNames = (state: StateIF): RequestNameI[] => {
     }
   } else {
     // Just use the 'name' property to fill in the requestName
-    if (getEntityTypeCd(state) && getLocation(state) === Location.BC && Designations[getEntityTypeCd(state)]?.end) {
+    if (getEntityTypeCd(state) && isLocationBC(state) && Designations[getEntityTypeCd(state)]?.end) {
       requestNames.push({
         name: getName(state),
         designation: getSplitNameDesignation(state).designation,
diff --git a/src/store/mutations.ts b/src/store/mutations.ts
index 24ff4e7ec..5ae0fc55c 100644
--- a/src/store/mutations.ts
+++ b/src/store/mutations.ts
@@ -13,7 +13,7 @@ import {
   WaitingAddressSearchI
 } from '@/interfaces'
 import {
-  EntityType,
+  EntityTypes,
   Location,
   NameCheckErrorType,
   NrAffiliationErrors,
@@ -84,11 +84,11 @@ export const mutateEditMode = (state: StateIF, editMode: boolean) => {
   state.stateModel.newRequestModel.editMode = editMode
 }
 
-export const mutateEntityType = (state: StateIF, entity_type_cd: EntityType) => {
+export const mutateEntityType = (state: StateIF, entity_type_cd: EntityTypes) => {
   state.stateModel.newRequestModel.entity_type_cd = entity_type_cd
 }
 
-export const mutateOriginEntityType = (state: StateIF, origin_entity_type_cd: EntityType) => {
+export const mutateOriginEntityType = (state: StateIF, origin_entity_type_cd: EntityTypes) => {
   state.stateModel.newRequestModel.origin_entity_type_cd = origin_entity_type_cd
 }
 
diff --git a/src/store/state.ts b/src/store/state.ts
index 16785d24c..d2469c602 100644
--- a/src/store/state.ts
+++ b/src/store/state.ts
@@ -1,6 +1,6 @@
 import { NameRequestI, StateModelIF } from '@/interfaces'
 import {
-  EntityType,
+  EntityTypes,
   Location,
   NameCheckErrorType,
   NrAffiliationErrors,
@@ -55,13 +55,13 @@ export const stateModel: StateModelIF = {
     ],
     displayedComponent: 'Tabs',
     doNotAnalyzeEntities: [
-      EntityType.PAR,
-      EntityType.CC,
-      EntityType.CP,
-      EntityType.PA,
-      EntityType.FI,
-      EntityType.XCP,
-      EntityType.SO
+      EntityTypes.PAR,
+      EntityTypes.CC,
+      EntityTypes.CP,
+      EntityTypes.PA,
+      EntityTypes.FI,
+      EntityTypes.XCP,
+      EntityTypes.SO
     ],
     editMode: false,
     entity_type_cd: null,
diff --git a/src/views/landing.vue b/src/views/landing.vue
index 9c57d3449..f74f24a14 100644
--- a/src/views/landing.vue
+++ b/src/views/landing.vue
@@ -16,12 +16,6 @@
             </keep-alive>
           </transition>
         </div>
-
-        <!-- FOR DEBUGGING -->
-        <div>getRequestActionCd={{ getRequestActionCd }}</div>
-        <div>getLocation={{ getLocation }}</div>
-        <div>getEntityTypeCd={{ getEntityTypeCd }}</div>
-        <div>isMrasJurisdiction={{ isMrasJurisdiction }}</div>
       </v-container>
     </v-row>
 
@@ -69,12 +63,6 @@ export default class Landing extends Vue {
   // Global getter
   @Getter getDisplayedComponent!: string
 
-  // FOR DEBUGGING:
-  @Getter getEntityTypeCd!: any
-  @Getter getLocation!: any
-  @Getter getRequestActionCd!: any
-  @Getter isMrasJurisdiction!: boolean
-
   // Global actions
   @Action loadExistingNameRequest!: ActionBindingIF
   @Action setDisplayedComponent!: ActionBindingIF