From f958514ba990622ba2f40be3d38c53e998f3bf96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9verin=20Beauvais?=
 <severinbeauvais@users.noreply.github.com>
Date: Fri, 30 Jun 2023 12:30:32 -0700
Subject: [PATCH] 16634 Implemented new actions menu + cleanup (#616)

* - app version = 5.0.2
- imported latest shared enums
- changed RequestCode to shared NrRequestActionCodes enum
- fixed some whitespace and alignment
- fixed some property/method visibilities
- cleanup up Pick Request Type dialog (removed blurbs, reformatted layout, filtered items)
- implemented new v-select with list items for nested menus
- implemented NameType enum for extraprovincial / assumed names
- updated RequestActions data structure to support nested groups (and new text, etc)
- fixed mobile spacing above nav buttons
- fixed mobile spacing above existing NR buttons
- misc cleanup
- deleted obsolete code

* - fixed slot item variable issues

* - renamed new enum
- reverted declarations

* - removed await from non-async function
- fixed another property visibility issue
- fixed up PickRequestType modal
- implemented some unit tests
- moved and renamed some unit tests
- misc cleanup
---
 jest.config.js                                |   2 +-
 package-lock.json                             |  34 ++--
 package.json                                  |   4 +-
 src/components/common/applicant-info-2.vue    |   7 +-
 src/components/common/applicant-info-3.vue    |  17 +-
 src/components/common/applicant-info-nav.vue  |   4 +-
 src/components/common/names-capture.vue       |  14 +-
 .../dialogs/pick-entity-or-conversion.vue     |   2 +-
 src/components/dialogs/pick-request-type.vue  |  88 ++++----
 .../existing-request-display.vue              |  32 +--
 .../existing-request/names-gray-box.vue       |   2 +-
 .../new-request/name-check/name-check.vue     |   1 -
 src/components/new-request/name-input.vue     |   8 +-
 src/components/new-request/search.vue         | 192 ++++++++++--------
 .../entity-cannot-be-auto-analyzed.vue        |   6 +-
 .../submit-request/reserve-submit.vue         |   4 +-
 src/enums/index.ts                            |   8 +-
 src/enums/request-code.ts                     |  15 --
 src/enums/xpro-name-type.ts                   |  20 ++
 src/interfaces/models.ts                      |  22 +-
 src/interfaces/new-request-interface.ts       |   4 +-
 src/list-data/conversion-types.ts             |  10 +-
 src/list-data/request-action-mapping.ts       |  10 +-
 src/list-data/request-actions.ts              |  97 +++++----
 src/main.ts                                   |   2 +-
 src/mixins/common-mixin.ts                    |  24 +--
 src/modules/payment/models.ts                 |   2 +-
 src/services/namex.services.ts                |  10 +-
 src/store/actions.ts                          |  17 +-
 src/store/getters.ts                          |  72 ++++---
 src/store/mutations.ts                        |   4 +-
 tests/{unit => }/setup.ts                     |   0
 tests/unit/analyze-pending.spec.ts            |   2 +-
 tests/unit/analyze-results.spec.ts            |   2 +-
 tests/unit/applicant-info-1.spec.ts           |   2 +-
 tests/unit/applicant-info-2.spec.ts           |   2 +-
 .../nr-not-required.spec.ts}                  |   2 +-
 .../pick-entity-or-conversion.spec.ts}        |   2 +-
 .../pick-request-type.spec.ts}                |  48 +++--
 ...og.spec.ts => staff-payment-error.spec.ts} |   2 +-
 tests/unit/landing.spec.ts                    |   2 +-
 tests/unit/link-row.spec.ts                   |   2 +-
 tests/unit/name-build-info.spec.ts            |   2 +-
 tests/unit/name-input.spec.ts                 |   2 +-
 tests/unit/names-capture.spec.ts              |   2 +-
 tests/unit/new-request-module.spec.ts         |   2 +-
 tests/unit/new-search.spec.ts                 |   2 +-
 tests/unit/reserve-submit.spec.ts             |   2 +-
 tests/unit/search-pending.spec.ts             |   2 +-
 .../{new-request.spec.ts => search.spec.ts}   |   2 +-
 50 files changed, 452 insertions(+), 364 deletions(-)
 delete mode 100644 src/enums/request-code.ts
 create mode 100644 src/enums/xpro-name-type.ts
 rename tests/{unit => }/setup.ts (100%)
 rename tests/unit/{nr-required-modal.spec.ts => dialogs/nr-not-required.spec.ts} (96%)
 rename tests/unit/{pick-entity-modal.spec.ts => dialogs/pick-entity-or-conversion.spec.ts} (97%)
 rename tests/unit/{pick-request-type-modal.spec.ts => dialogs/pick-request-type.spec.ts} (53%)
 rename tests/unit/dialogs/{staff-payment-error-dialog.spec.ts => staff-payment-error.spec.ts} (98%)
 rename tests/unit/{new-request.spec.ts => search.spec.ts} (97%)

diff --git a/jest.config.js b/jest.config.js
index 2fac1807d..06918bfbf 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -7,7 +7,7 @@ module.exports = {
     }
   },
   preset: '@vue/cli-plugin-unit-jest/presets/typescript-and-babel',
-  setupFiles: ['<rootDir>/tests/unit/setup.ts'],
+  setupFiles: ['<rootDir>/tests/setup.ts'],
   // notify: true,
   // notifyMode: 'always',
   transformIgnorePatterns: []
diff --git a/package-lock.json b/package-lock.json
index a77c29a09..b72f5137b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,15 +1,15 @@
 {
   "name": "name-request",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "name-request",
-      "version": "5.0.1",
+      "version": "5.0.2",
       "dependencies": {
         "@babel/compat-data": "^7.12.13",
-        "@bcrs-shared-components/enums": "1.0.13",
+        "@bcrs-shared-components/enums": "1.0.40",
         "@bcrs-shared-components/genesys-web-message": "1.0.0",
         "@bcrs-shared-components/interfaces": "1.0.22",
         "@bcrs-shared-components/staff-payment": "1.0.29",
@@ -1957,16 +1957,16 @@
       }
     },
     "node_modules/@bcrs-shared-components/corp-type-module": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.4.tgz",
-      "integrity": "sha512-709Wwso0HHH5q31+KUWW22uQyn/Qqz/y7paAg31EWcL70UhnWA2kAKHWJN3GC2IfTrcSjyKsVuvAB1R96b3jcA=="
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.12.tgz",
+      "integrity": "sha512-EjvsDDqysDKNJiJ3CFf3fRxoDmFoKDAO7yOr0kH0JcwWRALKiKhaQRnCKO+Ys726kMkgpQSQFfWiblgFBvcHSg=="
     },
     "node_modules/@bcrs-shared-components/enums": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.13.tgz",
-      "integrity": "sha512-FsKZ0iHE1bQoyTQZsyWffRrpk9zkdBNps3qluGpYDzM1k/JQtGM4dVkQrsAb47/oBw6EG/SDiTYsEQeUY7J7qg==",
+      "version": "1.0.40",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.40.tgz",
+      "integrity": "sha512-7MzM3zMlj3dReWE6w5+FnUdJs2kSWyVUHVkw8gi/nLEsq/F8U6NBYr5lAE0IFR86Dw2SqW+JwW23WqEhANkuNA==",
       "dependencies": {
-        "@bcrs-shared-components/corp-type-module": "^1.0.4"
+        "@bcrs-shared-components/corp-type-module": "^1.0.12"
       }
     },
     "node_modules/@bcrs-shared-components/folio-number-input": {
@@ -27137,16 +27137,16 @@
       }
     },
     "@bcrs-shared-components/corp-type-module": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.4.tgz",
-      "integrity": "sha512-709Wwso0HHH5q31+KUWW22uQyn/Qqz/y7paAg31EWcL70UhnWA2kAKHWJN3GC2IfTrcSjyKsVuvAB1R96b3jcA=="
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.12.tgz",
+      "integrity": "sha512-EjvsDDqysDKNJiJ3CFf3fRxoDmFoKDAO7yOr0kH0JcwWRALKiKhaQRnCKO+Ys726kMkgpQSQFfWiblgFBvcHSg=="
     },
     "@bcrs-shared-components/enums": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.13.tgz",
-      "integrity": "sha512-FsKZ0iHE1bQoyTQZsyWffRrpk9zkdBNps3qluGpYDzM1k/JQtGM4dVkQrsAb47/oBw6EG/SDiTYsEQeUY7J7qg==",
+      "version": "1.0.40",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.40.tgz",
+      "integrity": "sha512-7MzM3zMlj3dReWE6w5+FnUdJs2kSWyVUHVkw8gi/nLEsq/F8U6NBYr5lAE0IFR86Dw2SqW+JwW23WqEhANkuNA==",
       "requires": {
-        "@bcrs-shared-components/corp-type-module": "^1.0.4"
+        "@bcrs-shared-components/corp-type-module": "^1.0.12"
       }
     },
     "@bcrs-shared-components/folio-number-input": {
diff --git a/package.json b/package.json
index 4bb7038b7..08e36d50d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-request",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "private": true,
   "appName": "Name Request UI",
   "sbcName": "SBC Common Components",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@babel/compat-data": "^7.12.13",
-    "@bcrs-shared-components/enums": "1.0.13",
+    "@bcrs-shared-components/enums": "1.0.40",
     "@bcrs-shared-components/genesys-web-message": "1.0.0",
     "@bcrs-shared-components/interfaces": "1.0.22",
     "@bcrs-shared-components/staff-payment": "1.0.29",
diff --git a/src/components/common/applicant-info-2.vue b/src/components/common/applicant-info-2.vue
index 0a8856b76..8328fa988 100644
--- a/src/components/common/applicant-info-2.vue
+++ b/src/components/common/applicant-info-2.vue
@@ -201,6 +201,7 @@
             </span>
           </v-tooltip>
         </v-col>
+
         <ApplicantInfoNav @nextAction="nextAction()" />
       </v-row>
     </v-container>
@@ -213,7 +214,7 @@ import ApplicantInfoNav from '@/components/common/applicant-info-nav.vue'
 import { Action, Getter } from 'vuex-class'
 import { ApplicantI } from '@/interfaces'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import { CorpNumRequests, NrState, RequestCode } from '@/enums'
+import { CorpNumRequests, NrRequestActionCodes, NrState } from '@/enums'
 import { GetFeatureFlag } from '@/plugins'
 
 @Component({
@@ -229,7 +230,7 @@ export default class ApplicantInfo2 extends Vue {
   @Getter getEditMode!: boolean
   @Getter getNrData!: any
   @Getter getNrState!: string
-  @Getter getRequestActionCd!: RequestCode
+  @Getter getRequestActionCd!: NrRequestActionCodes
   @Getter getShowPriorityRequest!: boolean
   @Getter getShowCorpNum!: string
   @Getter isMobile!: boolean
@@ -292,7 +293,7 @@ export default class ApplicantInfo2 extends Vue {
 
   mounted () {
     // Apply optional corpNum validations for Amalgamations as they are NOT a required field but require COLIN lookup.
-    if (this.getRequestActionCd === RequestCode.AML) {
+    if (this.getRequestActionCd === NrRequestActionCodes.AMALGAMATE) {
       this.corpNumFieldLabel += ' (Optional)'
       this.corpNumRules = [
         v => (!v || v.length > 3) || 'Must be at least 4 characters'
diff --git a/src/components/common/applicant-info-3.vue b/src/components/common/applicant-info-3.vue
index 772d8e974..e064988b7 100644
--- a/src/components/common/applicant-info-3.vue
+++ b/src/components/common/applicant-info-3.vue
@@ -31,6 +31,7 @@
 
       <v-row class="mt-0">
         <v-col cols="12" md="2" lg="2" />
+
         <!--PHONE NUMBER-->
         <v-col cols="12" md="5" lg="5">
           <v-text-field :messages="messages['phone']"
@@ -42,6 +43,7 @@
                         hide-details="auto"
                         label="Phone Number" />
         </v-col>
+
         <!--FAX NUMBER-->
         <v-col cols="12" md="5" lg="5">
           <v-text-field :messages="messages['fax']"
@@ -57,6 +59,7 @@
 
       <v-row>
         <v-col cols="12" md="2" lg="2" class="h6">Client</v-col>
+
         <!--FIRST NAME-->
         <v-col cols="12" md="5" lg="5">
           <v-text-field :messages="messages['clientFirst']"
@@ -67,6 +70,7 @@
                         hide-details="auto"
                         label="First Name (Optional)" />
         </v-col>
+
         <!--LAST NAME-->
         <v-col cols="12" md="5" lg="5">
           <v-text-field :messages="messages['clientLast']"
@@ -81,6 +85,7 @@
 
       <v-row v-if="!getEditMode && !isRoleStaff" class="mt-0">
         <v-col cols="12" md="2" lg="2"></v-col>
+
         <!--FOLIO NUMBER-->
         <v-col cols="12" md="5" lg="5">
           <FolioNumberInput
@@ -94,6 +99,7 @@
 
       <v-row v-if="showAllFields">
         <v-col cols="12" md="2" lg="2" class="h6">About The Business</v-col>
+
         <!--NATURE OF BUSINESS-->
         <v-col cols="12" md="5" lg="5" align-self="start">
           <v-tooltip top
@@ -121,6 +127,7 @@
             </span>
           </v-tooltip>
         </v-col>
+
         <!--ADDITIONAL INFORMATION-->
         <v-col cols="12" md="5" lg="5" align-self="start">
           <v-tooltip top
@@ -152,6 +159,7 @@
 
       <v-row class="mt-0">
         <v-col cols="12" md="2" lg="2" />
+
         <!--CORP NUMBER-->
         <v-col cols="12" md="5" lg="5" v-if="getShowCorpNum === CorpNumRequests.COLIN">
           <v-tooltip top
@@ -177,6 +185,7 @@
             </span>
           </v-tooltip>
         </v-col>
+
         <!--TRADEMARK-->
         <v-col cols="12" md="5" lg="5">
           <v-tooltip top
@@ -205,6 +214,7 @@
 
       <v-row class="align-center mt-2 mb-0">
         <v-col cols="12" md="2" lg="2" />
+
         <!--PRIORITY REQUEST-->
         <v-col cols="12" md="5" lg="5">
           <v-tooltip top
@@ -234,6 +244,7 @@
             </span>
           </v-tooltip>
         </v-col>
+
         <ApplicantInfoNav @nextAction="nextAction()" />
       </v-row>
     </v-container>
@@ -248,7 +259,7 @@ import ApplicantInfoNav from '@/components/common/applicant-info-nav.vue'
 import { FolioNumberInput } from '@bcrs-shared-components/folio-number-input'
 import { ApplicantI, SubmissionTypeT } from '@/interfaces'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import { CorpNumRequests, Location, NrState, RequestCode } from '@/enums'
+import { CorpNumRequests, Location, NrRequestActionCodes, NrState } from '@/enums'
 import { GetFeatureFlag } from '@/plugins'
 
 @Component({
@@ -266,7 +277,7 @@ export default class ApplicantInfo3 extends Vue {
   @Getter getLocation!: Location
   @Getter getNrData!: any
   @Getter getNrState!: string
-  @Getter getRequestActionCd!: RequestCode
+  @Getter getRequestActionCd!: NrRequestActionCodes
   @Getter getShowPriorityRequest!: boolean
   @Getter getShowCorpNum!: string
   @Getter getSubmissionType!: SubmissionTypeT
@@ -333,7 +344,7 @@ export default class ApplicantInfo3 extends Vue {
 
   mounted () {
     // Apply optional corpNum validations for Amalgamations as they are NOT a required field but require COLIN lookup.
-    if (this.getRequestActionCd === RequestCode.AML) {
+    if (this.getRequestActionCd === NrRequestActionCodes.AMALGAMATE) {
       this.corpNumFieldLabel += ' (Optional)'
       this.corpNumRules = [
         v => (!v || v.length > 3) || 'Must be at least 4 characters'
diff --git a/src/components/common/applicant-info-nav.vue b/src/components/common/applicant-info-nav.vue
index 2bab28ce0..708bb46ab 100644
--- a/src/components/common/applicant-info-nav.vue
+++ b/src/components/common/applicant-info-nav.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-col cols="12" md="5" lg="5" class="py-0" :class="isMobile ? 'text-center' : 'text-right'">
+  <v-col cols="12" md="5" lg="5" class="py-0" :class="isMobile ? 'mt-6 text-center' : 'text-right'">
     <v-btn x-large
            id="submit-back-btn"
            :class="isMobile ? 'mobile-btn' : 'mr-3'"
@@ -75,7 +75,7 @@ export default class ApplicantInfoNav extends Vue {
   }
 
   @Emit('nextAction')
-  private nextAction () : void {}
+  nextAction () : void {}
 }
 </script>
 
diff --git a/src/components/common/names-capture.vue b/src/components/common/names-capture.vue
index 59a79217f..3adfa696a 100644
--- a/src/components/common/names-capture.vue
+++ b/src/components/common/names-capture.vue
@@ -290,7 +290,7 @@ import ApplicantInfoNav from '@/components/common/applicant-info-nav.vue'
 import { EntityI, NameChoicesIF, NameRequestI, RequestActionsI } from '@/interfaces'
 import { sanitizeName } from '@/plugins'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import { EntityType, Location, RequestCode } from '@/enums'
+import { EntityType, Location, NrRequestActionCodes } from '@/enums'
 import { CommonMixin } from '@/mixins'
 
 /** This component is used for EDITING a Name Request. */
@@ -313,7 +313,7 @@ export default class NamesCapture extends Mixins(CommonMixin) {
   @Getter getName!: string
   @Getter getNameChoices!: NameChoicesIF
   @Getter getNr!: Partial<NameRequestI>
-  @Getter getRequestActionCd!: RequestCode
+  @Getter getRequestActionCd!: NrRequestActionCodes
   @Getter getRequestTypeOptions!: RequestActionsI[]
   @Getter getSubmissionTabNumber!: number
   @Getter isMobile!: boolean
@@ -704,13 +704,13 @@ export default class NamesCapture extends Mixins(CommonMixin) {
     return this.getNameChoices
   }
 
-  get request_action_cd (): RequestCode {
+  get request_action_cd (): NrRequestActionCodes {
     return this.getRequestActionCd
   }
 
-  set request_action_cd (value: RequestCode) {
+  set request_action_cd (value: NrRequestActionCodes) {
     this.setRequestAction(value)
-    if (value === RequestCode.INFO) {
+    if (value === NrRequestActionCodes.INFO) {
       this.setPickRequestTypeModalVisible(true)
     }
   }
@@ -881,8 +881,8 @@ export default class NamesCapture extends Mixins(CommonMixin) {
   }
 
   @Watch('request_action_cd')
-  updateLocationOnAssumedName (newVal: RequestCode, oldVal: RequestCode) {
-    if (newVal === RequestCode.ASSUMED && this.location === Location.BC) {
+  updateLocationOnAssumedName (val: NrRequestActionCodes) {
+    if (val === NrRequestActionCodes.ASSUMED && this.location === Location.BC) {
       this.location = Location.CA
     }
   }
diff --git a/src/components/dialogs/pick-entity-or-conversion.vue b/src/components/dialogs/pick-entity-or-conversion.vue
index 86cef0899..12f7bfffa 100644
--- a/src/components/dialogs/pick-entity-or-conversion.vue
+++ b/src/components/dialogs/pick-entity-or-conversion.vue
@@ -115,7 +115,7 @@ export default class PickEntityOrConversionDialog extends Vue {
   @Action setEntityTypeAddToSelect!: ActionBindingIF
   @Action setPickEntityModalVisible!: ActionBindingIF
 
-  private showSocietiesInfo = false
+  showSocietiesInfo = false
 
   @Watch('showModal')
   handleModalClose (newVal) {
diff --git a/src/components/dialogs/pick-request-type.vue b/src/components/dialogs/pick-request-type.vue
index 89c4a29bd..4abb6135f 100644
--- a/src/components/dialogs/pick-request-type.vue
+++ b/src/components/dialogs/pick-request-type.vue
@@ -1,47 +1,37 @@
 <template>
-  <v-dialog v-model="showModal"
-            id="pick-request-type-modal"
-            max-width="600px"
-            hide-overlay>
-    <v-card class="pa-0" id="pick-request-type-modal-card">
-      <v-card-text class="h4 pa-3 px-5">What would you like to do?</v-card-text>
-      <v-container class="my-n4 pt-0">
-        <v-row>
-          <v-col cols="6">
-            <v-simple-table class="text-left">
-              <tr v-for="type in tableData.col1" :key="type.value+'-tr'">
-                <td class="clickable-cell" :id="type.value" @click="chooseType(type)">
-                  <v-tooltip bottom max-width="500" :disabled="isMobile">
-                    <template v-slot:activator="scope">
-                      <button class="link-sm-sans-ul" v-on="scope.on">{{ type.text }}</button>
-                    </template>
-                    <span>{{ type.blurb }}</span>
-                  </v-tooltip>
-                </td>
-              </tr>
-            </v-simple-table>
+  <v-dialog
+    v-model="showModal"
+    id="pick-request-type-modal"
+    max-width="45rem"
+    hide-overlay
+    persistent
+  >
+    <v-card>
+      <v-card-title class="d-flex justify-space-between">
+        <h4>What would you like to do?</h4>
+        <v-btn icon large class="dialog-close" @click="showModal = false">
+          <v-icon>mdi-close</v-icon>
+        </v-btn>
+      </v-card-title>
+
+      <v-card-text>
+        <v-row no-gutters>
+          <v-col cols="6" class="d-block">
+            <ul v-for="(item, i) in tableData.col1" :key="`col1-${i}`">
+              <li class="clickable-cell" @click="chooseType(item)">
+                <button class="link-sm-sans-ul">{{ item.text }}</button>
+              </li>
+            </ul>
           </v-col>
           <v-col cols="6">
-            <v-simple-table class="text-left">
-              <tr v-for="type in tableData.col2" :key="type.value+'-tr'">
-                <td class="clickable-cell" :id="type.value" @click="chooseType(type)">
-                  <v-tooltip bottom max-width="500" :disabled="isMobile">
-                    <template v-slot:activator="scope">
-                      <button class="link-sm-sans-ul" v-on="scope.on">{{ type.text }}</button>
-                    </template>
-                    <span>{{ type.blurb }}</span>
-                  </v-tooltip>
-                </td>
-              </tr>
-            </v-simple-table>
+            <ul v-for="(item, i) in tableData.col2" :key="`col2-${i}`">
+              <li class="clickable-cell" @click="chooseType(item)">
+                <button class="link-sm-sans-ul">{{ item.text }}</button>
+              </li>
+            </ul>
           </v-col>
         </v-row>
-      </v-container>
-      <v-card-actions class="bg-grey-1 text-center">
-        <div style="display: block; width: 100%;">
-          <button @click="showModal = false"><v-icon>mdi-close</v-icon> Close</button>
-        </div>
-      </v-card-actions>
+      </v-card-text>
     </v-card>
   </v-dialog>
 </template>
@@ -51,14 +41,13 @@ import { Component, Vue } from 'vue-property-decorator'
 import { Action, Getter } from 'vuex-class'
 
 // Interfaces / enums / list data
-import { SelectOptionsI } from '@/interfaces'
+import { RequestActionsI } from '@/interfaces'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
 
 @Component({})
 export default class PickRequestTypeDialog extends Vue {
   // Global getter
   @Getter getPickRequestTypeModalVisible!: boolean
-  @Getter isMobile!: boolean
 
   // Global actions
   @Action setClearErrors!: ActionBindingIF
@@ -75,16 +64,19 @@ export default class PickRequestTypeDialog extends Vue {
   }
 
   get tableData () {
-    const length = this.$requestActions.length
+    // get just the selectable items
+    const items = this.$requestActions.filter(item => !item.isHeader)
+
+    const length = items.length
     const midIndex = length % 2 ? (length + 1) / 2 : (length / 2)
 
     return {
-      col1: this.$requestActions.slice(0, midIndex),
-      col2: this.$requestActions.slice(midIndex, length)
+      col1: items.slice(0, midIndex),
+      col2: items.slice(midIndex, length)
     }
   }
 
-  chooseType (request: SelectOptionsI) {
+  chooseType (request: RequestActionsI) {
     this.setClearErrors(null)
     if (request.value !== 'NEW') {
       this.setExtendedRequestType(request)
@@ -100,6 +92,10 @@ export default class PickRequestTypeDialog extends Vue {
 
 .clickable-cell:hover {
   background-color: $app-lt-blue;
-  cursor: pointer;
+}
+
+// override button text centering
+.clickable-cell button {
+  text-align: unset;
 }
 </style>
diff --git a/src/components/existing-request/existing-request-display.vue b/src/components/existing-request/existing-request-display.vue
index b893f533f..46745bdb6 100644
--- a/src/components/existing-request/existing-request-display.vue
+++ b/src/components/existing-request/existing-request-display.vue
@@ -40,7 +40,7 @@
 
       <transition mode="out-in" name="fade">
         <div class="nr-data">
-          <v-row class="mt-5" :key="refreshCount">
+          <v-row class="mt-6 mb-0" :key="refreshCount">
             <!-- labels and values -->
             <v-col cols="12" md="9" lg="9" class="py-0">
               <v-row dense>
@@ -151,7 +151,7 @@
             </v-col>
 
             <!-- action buttons -->
-            <v-col cols="12" md="3" lg="3" class="py-0">
+            <v-col cols="12" md="3" lg="3" class="py-0" :class="{ 'mt-6': isMobile }">
               <v-row dense>
                 <template v-for="action of actions">
                   <!-- incorporate action is a distinct button below -->
@@ -226,8 +226,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, RequestCode }
-  from '@/enums'
+import { NameState, NrAction, NrState, PaymentStatus, SbcPaymentStatus, PaymentAction, Furnished,
+  NrRequestActionCodes } from '@/enums'
 import { Sleep, GetFeatureFlag, Navigate } from '@/plugins'
 import NamexServices from '@/services/namex.services'
 import ContactInfo from '@/components/common/contact-info.vue'
@@ -275,10 +275,10 @@ export default class ExistingRequestDisplay extends Mixins(
   NrState = NrState
 
   /** This is used in the template as the transition key for the affected template, triggering a fade in/out. */
-  protected refreshCount = 0
+  refreshCount = 0
 
   /** This is used in the template as the transition key for the affected template, triggering a fade in/out. */
-  protected furnished = 'notfurnished'
+  furnished = 'notfurnished'
 
   /** The pending payment, if any. See mounted(). */
   private pendingPayment = null
@@ -407,7 +407,7 @@ export default class ExistingRequestDisplay extends Mixins(
   }
 
   /** The current NR object. */
-  private get nr () {
+  get nr () {
     return this.getNr
   }
 
@@ -426,7 +426,7 @@ export default class ExistingRequestDisplay extends Mixins(
   get showRegisterButton (): boolean {
     return this.isFirm(this.nr) &&
            this.nr.request_action_cd &&
-           this.nr.request_action_cd === RequestCode.NEW &&
+           this.nr.request_action_cd === NrRequestActionCodes.NEW_BUSINESS &&
            (NrState.APPROVED === this.nr.state ||
             this.isConsentUnRequired)
   }
@@ -554,14 +554,14 @@ export default class ExistingRequestDisplay extends Mixins(
   }
 
   /** Returns True if the specified action button should be disabled. */
-  protected isDisabledButton (action: NrAction): boolean {
+  isDisabledButton (action: NrAction): boolean {
     if (action === NrAction.UPGRADE && !this.enableUpgradeButton) return true
     if (this.disableUnfurnished && action !== NrAction.RECEIPTS) return true
     return false
   }
 
   /** Returns tooltip (or '') for the specified action button. */
-  protected actionTooltip (action: NrAction): string {
+  actionTooltip (action: NrAction): string {
     if (action === NrAction.UPGRADE && !this.enableUpgradeButton) {
       return 'Due to the on-going labour dispute between the government and its employees, ' +
         'priority filings are temporarily disabled.'
@@ -570,12 +570,12 @@ export default class ExistingRequestDisplay extends Mixins(
   }
 
   /** Returns True if the specified action should display a red button. */
-  protected isRedButton (action: NrAction): boolean {
+  isRedButton (action: NrAction): boolean {
     return [NrAction.REQUEST_REFUND, NrAction.CANCEL].includes(action)
   }
 
   /** Returns display text for the specified action button. */
-  protected actionText (action: NrAction): string {
+  actionText (action: NrAction): string {
     switch (action) {
       case NrAction.CANCEL: return 'Cancel Name Request'
       case NrAction.RENEW: return 'Renew Name Request ($30)' // FUTURE: fetch this fee
@@ -590,7 +590,7 @@ export default class ExistingRequestDisplay extends Mixins(
     }
   }
 
-  protected async handleButtonClick (action: NrAction) {
+  async handleButtonClick (action: NrAction) {
     // FUTURE: reinstate this check?
     // const confirmed = await newReqModule.confirmAction(action)
     const confirmed = true
@@ -668,7 +668,7 @@ export default class ExistingRequestDisplay extends Mixins(
     // else do nothing -- errors are handled by newReqModule
   }
 
-  protected async refresh (): Promise<void> {
+  async refresh (): Promise<void> {
     this.$root.$emit('showSpinner', true)
     this.refreshCount += 1
     try {
@@ -684,12 +684,12 @@ export default class ExistingRequestDisplay extends Mixins(
     }
   }
 
-  protected showConditionsModal () {
+  showConditionsModal () {
     this.setConditionsModalVisible(true)
   }
 
   /** Called to register the business. */
-  protected async registerYourBusiness (): Promise<void> {
+  async registerYourBusiness (): Promise<void> {
     // safety check
     if (!this.isNrApprovedOrConditional) return
 
diff --git a/src/components/existing-request/names-gray-box.vue b/src/components/existing-request/names-gray-box.vue
index 5051b4fea..983d4fd99 100644
--- a/src/components/existing-request/names-gray-box.vue
+++ b/src/components/existing-request/names-gray-box.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="names-container" class="bg-light-gray">
+  <div id="names-container" class="bg-light-gray mt-5">
     <div class="px-5 py-4 text-name">
       <v-tooltip v-for="name of names" :key="name.choice"
         transition="fade-transition" right content-class="tooltip" :disabled="isMobile"
diff --git a/src/components/new-request/name-check/name-check.vue b/src/components/new-request/name-check/name-check.vue
index 255c74476..bdf603a70 100644
--- a/src/components/new-request/name-check/name-check.vue
+++ b/src/components/new-request/name-check/name-check.vue
@@ -237,7 +237,6 @@ export default class NameCheck extends Vue {
   @Getter getLocationText!: string
   @Getter getNameCheckErrors!: NameCheckErrorI
   @Getter getNumbersCheckUse!: Array<string>
-  @Getter getRequestActionCd!: string
   @Getter getSpecialCharacters!: Array<string>
   @Getter isAnalyzeConflictsPending!: boolean
   @Getter isAnalyzeDesignationPending!: boolean
diff --git a/src/components/new-request/name-input.vue b/src/components/new-request/name-input.vue
index 9b88f5b8e..66b4c9601 100644
--- a/src/components/new-request/name-input.vue
+++ b/src/components/new-request/name-input.vue
@@ -24,7 +24,7 @@
 <script lang="ts">
 import { Component, Prop, Vue, Watch, Emit } from 'vue-property-decorator'
 import { Getter, Action } from 'vuex-class'
-import { Location, RequestCode } from '@/enums'
+import { Location, NrRequestActionCodes } from '@/enums'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
 import { sanitizeName } from '@/plugins'
 import { MRAS_MAX_LENGTH } from '@/components/new-request/constants'
@@ -41,7 +41,7 @@ export default class NameInput extends Vue {
   @Getter getErrors!: string[]
   @Getter getLocation!: Location
   @Getter getName!: string
-  @Getter getRequestActionCd!: RequestCode
+  @Getter getRequestActionCd!: NrRequestActionCodes
   @Getter getIsXproMras!: boolean
 
   // Global actions
@@ -69,7 +69,7 @@ export default class NameInput extends Vue {
     v => (!v || v.length <= MRAS_MAX_LENGTH) || this.err_msg
   ]
   /** The array of validation rules for the MRAS corp num. */
-  private get mrasRules (): Function[] {
+  get mrasRules (): Function[] {
     return [
       v => (/^[0-9a-zA-Z-]+$/.test(v) || 'A corporate number is required'),
       v => (!v || v.length <= 40) || 'Cannot exceed 40 characters' // maximum character count
@@ -117,7 +117,7 @@ export default class NameInput extends Vue {
     if (
       this.getLocation &&
       (this.getLocation !== Location.BC) &&
-      (this.getRequestActionCd !== RequestCode.MVE)
+      (this.getRequestActionCd !== NrRequestActionCodes.MOVE)
     ) {
       return 'Business\'s full legal name in home jurisdiction'
     }
diff --git a/src/components/new-request/search.vue b/src/components/new-request/search.vue
index cb68a1e26..b7b8ca287 100644
--- a/src/components/new-request/search.vue
+++ b/src/components/new-request/search.vue
@@ -1,43 +1,46 @@
 <template>
   <v-container fluid id="new-request-container" class="copy-normal pa-10">
     <v-row no-gutters>
-      <v-col cols="12" class="pt-0 font-weight-bold h6"><span>I need a name to:</span></v-col>
+      <v-col cols="12" class="pt-0 font-weight-bold h6">
+        I need a name to: {{ request_action_cd }} / {{ location }} / {{ entity_type_cd }}
+      </v-col>
     </v-row>
 
     <v-row class="mt-4" no-gutters>
-      <!--request_action_cd-->
+      <!-- request_action_cd -->
       <v-col cols="12" md="4" lg="4">
-        <v-tooltip top
-                   id="search-type-options-select"
-                   content-class="top-tooltip"
-                   transition="fade-transition"
-                   :disabled="request_action_cd !== RequestCode.CNV || isMobile">
-          <template v-slot:activator="scope">
-            <div v-on="scope.on">
-              <v-select :error-messages="getErrors.includes('request_action_cd') ? 'Please select an action' : ''"
-                        :items="$requestActions"
-                        :menu-props="{ bottom: true, offsetY: true}"
-                        @change="clearErrors()"
-                        label="Select an Action"
-                        filled
-                        v-model="request_action_cd">
-                <template slot="item" slot-scope="data">
-                  <v-tooltip :disabled="!data.item.blurbs || isMobile" right transition="fade-transition">
-                    <template v-slot:activator="scope">
-                      <span v-on="scope.on" class="list-item">
-                        {{ data.item.text }}
-                      </span>
-                    </template>
-                    <span>{{ data.item.blurbs }}</span>
-                  </v-tooltip>
-                </template>
-              </v-select>
-            </div>
+        <v-select
+          filled
+          label="Select an Action"
+          :error-messages="getErrors.includes('request_action_cd') ? 'Please select an action' : ''"
+          :items="requestActions"
+          :menu-props="{ bottom: true, offsetY: true, maxHeight: 423 }"
+          @change="clearErrors()"
+        >
+          <template v-slot:item="{ item }">
+            <v-list-item-title
+              v-if="item.isHeader"
+              class="group-header d-flex justify-space-between align-center"
+              @click.stop="toggleActionGroup(item.group)"
+            >
+              <div class="app-blue mr-4">{{ item.text }}</div>
+              <v-icon color="primary">
+                {{ item.group === activeActionGroup ? 'mdi-chevron-up' : 'mdi-chevron-down' }}
+              </v-icon>
+            </v-list-item-title>
+            <v-list-item-title
+              v-else
+              class="group-item ml-2 colour-text"
+              @click="request_action_cd = item.value"
+            >
+              <div class="font-weight-bold">{{ item.text }}</div>
+              <div>{{ item.subtext }}</div>
+            </v-list-item-title>
           </template>
-          <span>{{ getRequestText }}</span>
-        </v-tooltip>
+        </v-select>
       </v-col>
-      <!--location (aka jurisdiction)-->
+
+      <!-- location (aka jurisdiction) -->
       <v-col cols="12" md="4" lg="4" :class="{'px-3': !isMobile }">
         <v-tooltip id="location-options-select"
                    top
@@ -56,16 +59,16 @@
                         filled
                         label="Select a Jurisdiction"
                         v-model="location">
-                <template slot="item" slot-scope="data">
+                <template v-slot:item="{ item }">
                   <v-tooltip
                     right
                     transition="fade-transition"
-                    :disabled="!request_action_cd || !data.item.blurbs || isMobile"
+                    :disabled="!request_action_cd || !item.blurbs || isMobile"
                   >
                     <template v-slot:activator="scope">
-                      <span v-on="scope.on" class="list-item">{{ data.item.text }}</span>
+                      <span v-on="scope.on" class="list-item">{{ item.text }}</span>
                     </template>
-                      <div v-for="(item, index) in data.item.blurbs "
+                      <div v-for="(blurb, index) in item.blurbs "
                            :key="`Location-Blurb-${index}`">
                         <span v-if="request_action_cd === request_action_enum[index]">
                           {{ item }}
@@ -79,13 +82,16 @@
           <span>{{ getLocationText }}</span>
         </v-tooltip>
       </v-col>
-      <!--entity_type_cd-->
+
+      <!-- entity_type_cd -->
       <v-col cols="12" md="4" lg="4">
-        <v-tooltip id="entity-type-options-select"
-                   top
-                   content-class="top-tooltip"
-                   :disabled="request_action_cd !== RequestCode.CNV || !entityConversionText || isMobile"
-                   transition="fade-transition">
+        <v-tooltip
+          id="entity-type-options-select"
+          top
+          content-class="top-tooltip"
+          :disabled="request_action_cd !== NrRequestActionCodes.CONVERSION || !entityConversionText || isMobile"
+          transition="fade-transition"
+        >
           <template v-slot:activator="scope">
             <div v-on="scope.on">
               <v-select :error-messages="getErrors.includes('entity_type_cd') ? 'Please select a business type' : ''"
@@ -97,21 +103,21 @@
                         @change="clearErrors()"
                         filled
                         v-model="entity_type_cd">
-                <template slot="item" slot-scope="data">
+                <template v-slot:item="{ item }">
                   <v-tooltip
                           :right="isScreenLg"
                           :left="!isScreenLg"
-                          :disabled="!data.item.blurbs || isMobile"
+                          :disabled="!item.blurbs || isMobile"
                           :content-class="!isScreenLg ? 'left-tooltip' : ''"
                           transition="fade-transition">
                     <template v-slot:activator="scope">
                       <span v-on="scope.on"
                             class="list-item"
-                            :class="{ 'last-select-item': data.item.value === 'INFO' }">
-                        {{ data.item.text }}
+                            :class="{ 'last-select-item': item.value === 'INFO' }">
+                        {{ item.text }}
                       </span>
                     </template>
-                    <div v-for="(item, index) in entityBlurbs(data.item.value)"
+                    <div v-for="(blurb, index) in entityBlurbs(item.value)"
                          :key="`Blurb-${index}`">
                       <span :class="{ 'tooltip-bullet': index !== 0}">
                         {{ item }}
@@ -128,6 +134,7 @@
     </v-row>
 
     <v-row no-gutters>
+      <!-- jurisdiction for xpro/mras -->
       <v-col cols="12" md="4" lg="4" v-if="getIsXproMras">
         <v-select :error-messages="getErrors.includes('jurisdiction') ? 'Please select a jurisdiction' : ''"
                   :items="jurisdictionOptions"
@@ -136,28 +143,31 @@
                   @change="clearErrors()"
                   filled
                   v-model="jurisdiction">
-          <template slot="item" slot-scope="data">
-            <span class="list-item" :class="{ 'last-select-item': data.item.value === Location.FD }">
-              {{ data.item.text }}
+          <template v-slot:item="{ item }">
+            <span class="list-item" :class="{ 'last-select-item': item.value === Location.FD }">
+              {{ item.text }}
             </span>
           </template>
         </v-select>
       </v-col>
+
+      <!-- name -->
       <v-col :class="{
         'pl-3': (getIsXproMras && !isFederal && !isMobile),
         'pr-3': (!getIsXproMras && showDesignationSelect && !isMobile)
       }"
              :cols="(showDesignationSelect || (getIsXproMras)) && !isMobile ? '8' : '12'">
         <NameInput v-if="!isFederal"
-                   :class="inputCompClass"
                    :is-mras-search="(getIsXproMras && !noCorpNum)"
                    :menu-props="{ bottom: true, offsetY: true}"
                    id="name-input-component"
-                   class="pa-0"
+                   class="mt-0 pa-0"
                    @emit-corp-num-validity="corpNumValid = $event"/>
         <p v-else class="pl-3 text-body-2">Federally incorporated businesses do not need a Name Request. You may
-          register  your extraprovincial business immediately using its existing name at Corporate Online.</p>
+          register your extraprovincial business immediately using its existing name at Corporate Online.</p>
       </v-col>
+
+      <!-- designation -->
       <v-col v-if="showDesignationSelect" cols="12" md="4" lg="4">
         <v-select :class="!entity_type_cd ? 'disabled-custom' : ''"
                   :error-messages="getErrors.includes('designation') ? 'Please select a designation' : ''"
@@ -217,7 +227,7 @@
           </v-btn>
         </v-col>
       </v-row>
-      <v-row v-if="isPremium" class="pt-7" justify="center" no-gutters>
+      <v-row v-if="isPremiumOrStaff" class="pt-7" justify="center" no-gutters>
         <v-col cols="auto">
           <v-btn id="name-check-skip-btn" class="outlined pa-0" :ripple="false" text @click="handleSubmit(false)">
             <span>Submit this Name without checking</span>
@@ -247,7 +257,7 @@ import NameInput from './name-input.vue'
 // Interfaces / Enums / List Data
 import { ConversionTypesI, EntityI } from '@/interfaces'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import { AccountType, EntityType, Location, RequestCode } from '@/enums'
+import { AccountType, EntityType, Location, NrRequestActionCodes } from '@/enums'
 import { CommonMixin } from '@/mixins'
 import { CanJurisdictions, IntlJurisdictions } from '@/list-data'
 
@@ -258,7 +268,7 @@ import { CanJurisdictions, IntlJurisdictions } from '@/list-data'
 export default class NewSearch extends Mixins(CommonMixin) {
   // enums for template
   readonly Location = Location
-  readonly RequestCode = RequestCode
+  readonly NrRequestActionCodes = NrRequestActionCodes
 
   // Global getters
   @Getter getConversionType!: EntityType
@@ -278,8 +288,7 @@ export default class NewSearch extends Mixins(CommonMixin) {
   @Getter getLocationOptions!: any[]
   @Getter getLocationText!: string
   @Getter getNameIsEnglish!: boolean
-  @Getter getRequestActionCd!: RequestCode
-  @Getter getRequestText!: string
+  @Getter getRequestActionCd!: NrRequestActionCodes
   @Getter isMobile!: boolean
 
   // Global actions
@@ -304,16 +313,15 @@ export default class NewSearch extends Mixins(CommonMixin) {
   corpNumValid = true
   readonly corpOnlineLink = 'https://www.corporateonline.gov.bc.ca/'
   locationDisabled = false
-
-  // Local enum
   request_action_enum = [
-    RequestCode.NEW,
-    RequestCode.MVE,
-    RequestCode.REH,
-    RequestCode.AML,
-    RequestCode.CHG,
-    RequestCode.CNV
+    NrRequestActionCodes.NEW_BUSINESS,
+    NrRequestActionCodes.MOVE,
+    NrRequestActionCodes.RESTORE,
+    NrRequestActionCodes.AMALGAMATE,
+    NrRequestActionCodes.CHANGE_NAME,
+    NrRequestActionCodes.CONVERSION
   ]
+  activeActionGroup = NaN
 
   private mounted () {
     this.$nextTick(() => {
@@ -330,11 +338,28 @@ export default class NewSearch extends Mixins(CommonMixin) {
   }
 
   // Local Getters
-  get isPremium (): boolean {
+  get isPremiumOrStaff (): boolean {
     return [AccountType.PREMIUM, AccountType.SBC_STAFF, AccountType.STAFF]
       .includes(JSON.parse(sessionStorage.getItem(SessionStorageKeys.CurrentAccount))?.accountType)
   }
 
+  /** The request action items to display. */
+  get requestActions () {
+    return this.$requestActions.filter(action => {
+      // always show header action
+      if (action.isHeader) return true
+      // show item action if group is open
+      if (action.group === this.activeActionGroup) return true
+      // don't show this action
+      return false
+    })
+  }
+
+  /** If current group is active, deactivate it, otherwise activate group. */
+  toggleActionGroup (group: number) {
+    this.activeActionGroup = (this.activeActionGroup === group) ? NaN : group
+  }
+
   get designation (): string {
     return this.getDesignation
   }
@@ -394,14 +419,6 @@ export default class NewSearch extends Mixins(CommonMixin) {
     return this.$conversionTypes.find(conversion => conversion.value === this.getConversionType)?.text
   }
 
-  get inputCompClass () {
-    let errorTypes = ['entity_type_cd', 'request_action_cd', 'location']
-    if (errorTypes.some(type => this.getErrors.includes(type))) {
-      return 'mt-n5'
-    }
-    return 'mt-n2'
-  }
-
   get isFederal () {
     return (this.location === Location.CA && this.jurisdiction === Location.FD)
   }
@@ -450,17 +467,17 @@ export default class NewSearch extends Mixins(CommonMixin) {
     this.setNoCorpNum(value)
   }
 
-  get request_action_cd (): RequestCode {
+  get request_action_cd (): NrRequestActionCodes {
     return this.getRequestActionCd
   }
 
-  set request_action_cd (value: RequestCode) {
+  set request_action_cd (value: NrRequestActionCodes) {
     const request = this.$requestActions.find(request => request.value === value)
     this.location = null
     if (this.entity_type_cd) {
       this.entity_type_cd = null
     }
-    if (request?.value !== RequestCode.NEW) {
+    if (request?.value !== NrRequestActionCodes.NEW_BUSINESS) {
       this.setExtendedRequestType(request)
     }
     this.setRequestAction(value)
@@ -512,15 +529,15 @@ export default class NewSearch extends Mixins(CommonMixin) {
   }
 
   @Watch('request_action_cd')
-  watchRequestActionCd (newVal: RequestCode) {
+  watchRequestActionCd (newVal: NrRequestActionCodes) {
     // Set default location to BC for the requests where BC is the only location option
-    if ([RequestCode.CNV, RequestCode.MVE].includes(newVal)) {
+    if ([NrRequestActionCodes.CONVERSION, NrRequestActionCodes.MOVE].includes(newVal)) {
       this.setLocation(Location.BC)
       this.locationDisabled = true
       return
     }
     this.locationDisabled = false
-    if ([RequestCode.ASSUMED].includes(newVal)) {
+    if ([NrRequestActionCodes.ASSUMED].includes(newVal)) {
       if (this.location === Location.BC) {
         this.setLocation(Location.CA)
       }
@@ -531,6 +548,18 @@ export default class NewSearch extends Mixins(CommonMixin) {
 
 <style lang="scss" scoped>
 @import '@/assets/styles/theme.scss';
+
+// set min height of request action groups and items only
+::v-deep .v-list-item:has(.group-header),
+::v-deep .v-list-item:has(.group-item) {
+  min-height: 60px;
+}
+
+// set border at top of group headers only
+::v-deep .v-list-item:has(.group-header) {
+  border-top: 1px solid $gray3;
+}
+
 .v-list {
   padding: 0;
 }
@@ -567,9 +596,6 @@ export default class NewSearch extends Mixins(CommonMixin) {
 #goto-corporate-btn {
   min-height: 45px !important;
 }
-#name-input-component {
-  margin-top: 0 !important;
-}
 .mobile-btn {
   width: 17rem !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 83a06a226..20808a3a3 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, RequestCode } from '@/enums'
+import { EntityType, NrRequestActionCodes } from '@/enums'
 
 @Component({
   components: { NameInput }
@@ -59,7 +59,7 @@ export default class EntityCannotBeAutoAnalyzed extends Vue {
   @Getter getName!: string
   @Getter getNameIsEnglish!: boolean
   @Getter getNameIsSlashed!: boolean
-  @Getter getRequestActionCd!: RequestCode
+  @Getter getRequestActionCd!: NrRequestActionCodes
   @Getter getRequestTypeOptions!: RequestActionsI[]
 
   // Global actions
@@ -158,7 +158,7 @@ export default class EntityCannotBeAutoAnalyzed extends Vue {
   }
 
   get requestActionNotSupported (): boolean {
-    const requests = [RequestCode.NEW, RequestCode.DBA, RequestCode.CHG]
+    const requests = [NrRequestActionCodes.NEW_BUSINESS, NrRequestActionCodes.DBA, NrRequestActionCodes.CHANGE_NAME]
     return !(requests.includes(this.getRequestActionCd))
   }
 
diff --git a/src/components/new-request/submit-request/reserve-submit.vue b/src/components/new-request/submit-request/reserve-submit.vue
index f7b6f9975..20fe212a3 100644
--- a/src/components/new-request/submit-request/reserve-submit.vue
+++ b/src/components/new-request/submit-request/reserve-submit.vue
@@ -20,7 +20,7 @@ import { Action, Getter } from 'vuex-class'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
 import { ConditionalReqI, DraftReqI, IssueI, NameRequestI, ReservedReqI } from '@/interfaces'
 import NamexServices from '@/services/namex.services'
-import { Location, NrType, RequestCode } from '@/enums'
+import { Location, NrRequestActionCodes, NrType } from '@/enums'
 
 @Component({})
 export default class ReserveSubmit extends Vue {
@@ -31,7 +31,7 @@ export default class ReserveSubmit extends Vue {
   @Getter getDraftNameReservation!: DraftReqI
   @Getter getLocation!: Location
   @Getter getReservedNameReservation!: ReservedReqI
-  @Getter getRequestActionCd!: RequestCode
+  @Getter getRequestActionCd!: NrRequestActionCodes
   @Getter getShowActualInput!: boolean
   @Getter isMobile!: boolean
 
diff --git a/src/enums/index.ts b/src/enums/index.ts
index 175603437..4a5fcd3c9 100644
--- a/src/enums/index.ts
+++ b/src/enums/index.ts
@@ -19,10 +19,14 @@ export * from './payment-action'
 export * from './payment-method'
 export * from './payment-status'
 export * from './priority-code'
-export * from './request-code'
 export * from './routes'
 export * from './rollback-actions'
 export * from './sbc-payment-status'
+export * from './xpro-name-type'
 
 // external enums
-export { StaffPaymentOptions } from '@bcrs-shared-components/enums'
+export {
+  NrRequestActionCodes,
+  NrRequestTypeCodes,
+  StaffPaymentOptions
+} from '@bcrs-shared-components/enums'
diff --git a/src/enums/request-code.ts b/src/enums/request-code.ts
deleted file mode 100644
index 46a8ee98d..000000000
--- a/src/enums/request-code.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/** Enum for Request Code. Not to be confused with NR Action codes. */
-export enum RequestCode {
-  NEW = 'NEW', // new request
-  MVE = 'MVE', // move request
-  REH = 'REH', // restore or reinstate request
-  AML = 'AML', // amalgamate request
-  CHG = 'CHG', // change name request
-  CNV = 'CNV', // conversion request
-  DBA = 'DBA', // doing business as request
-  ASSUMED = 'ASSUMED', // assumed name request // FUTURE: should be AS?
-  REN = 'REN', // restore with new name request (renew)
-  INFO = 'INFO', // special value for sub-menu
-  REST = 'REST', // restore
-  RESUBMIT = 'RESUBMIT', // resubmit
-}
diff --git a/src/enums/xpro-name-type.ts b/src/enums/xpro-name-type.ts
new file mode 100644
index 000000000..65658b8fd
--- /dev/null
+++ b/src/enums/xpro-name-type.ts
@@ -0,0 +1,20 @@
+/** These are request type codes for extraprovincial/assumed name companies. */
+export enum XproNameType {
+  /** Extraprovincial Limited Liability Company - Extraprovincial Assumed Name */
+  AL = 'AL',
+
+  /** Extraprovincial Registration (Foreign Corporation) - Extraprovincial Assumed Name */
+  AS = 'AS',
+
+  /** Extraprovincial Registration (Foreign Corporation) - Extraprovincial Name */
+  CO = 'CO',
+
+  /** Extraprovincial Unlimited Liability Company - for AS or RESUBMIT */
+  UA = 'UA',
+
+  /** (Legacy Type) Extraprovincial Society - for AS or RESUBMIT */
+  XASO = 'XASO',
+
+  /** (Legacy Type) Extraprovincial Society - for ACHG or RESUBMIT */
+  XCASO = 'XCASO'
+}
diff --git a/src/interfaces/models.ts b/src/interfaces/models.ts
index c46e03058..c21dec738 100644
--- a/src/interfaces/models.ts
+++ b/src/interfaces/models.ts
@@ -3,9 +3,9 @@ import {
   Location,
   NameCheckAnalysisJurisdiction,
   NameCheckAnalysisType,
+  NrRequestActionCodes,
   NrState,
-  PriorityCode,
-  RequestCode
+  PriorityCode
 } from '@/enums'
 
 export type SubmissionTypeT = 'examination' | 'consent' | 'normal'
@@ -62,7 +62,7 @@ export interface ConditionalReqI {
   natureBusinessInfo: string
   previousRequestId?: string
   priorityCd: PriorityCode
-  request_action_cd: RequestCode
+  request_action_cd: NrRequestActionCodes
   request_type_cd?: string
   stateCd: NrState.COND_RESERVED
   submit_count: number
@@ -101,7 +101,7 @@ export interface DraftReqI {
   natureBusinessInfo?: string
   previousRequestId?: string
   priorityCd: PriorityCode
-  request_action_cd: RequestCode
+  request_action_cd: NrRequestActionCodes
   stateCd: NrState.DRAFT
   submit_count: number
   tradeMark?: string
@@ -173,7 +173,7 @@ export interface NewRequestNameSearchI {
   entity_type_cd: string
   location: Location
   name: string
-  request_action_cd: RequestCode
+  request_action_cd: NrRequestActionCodes
   request_type_cd?: string
 }
 
@@ -202,11 +202,13 @@ export interface RequestActionMappingI {
 }
 
 export interface RequestActionsI {
-  text: string
-  value: RequestCode
-  blurbs?: string
+  group?: number
+  isHeader?: boolean
   rank?: number
   shortDesc?: string
+  subtext?: string
+  text: string
+  value?: NrRequestActionCodes // items only (not headers)
 }
 
 export interface RequestNameI {
@@ -234,7 +236,7 @@ export interface ReservedReqI {
   natureBusinessInfo: string
   previousRequestId?: string
   priorityCd: PriorityCode
-  request_action_cd: RequestCode
+  request_action_cd: NrRequestActionCodes
   stateCd: NrState.RESERVED
   submit_count: number
   tradeMark: string
@@ -256,7 +258,7 @@ export interface SelectionI {
 
 export interface SelectOptionsI {
   text: string
-  value: any
+  value: any // depends on menu
   [propName: string]: any // excess properties
 }
 
diff --git a/src/interfaces/new-request-interface.ts b/src/interfaces/new-request-interface.ts
index 5c49f39d6..ba8e1766f 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, RequestCode } from '@/enums'
+import { EntityType, Location, NrAffiliationErrors, NrRequestActionCodes } from '@/enums'
 
 interface RequestNameMapI extends RequestNameI {}
 
@@ -56,7 +56,7 @@ export interface NewRequestIF {
   pickRequestTypeModalVisible: boolean
   priorityRequest: boolean
   quickSearchNames: any[]
-  request_action_cd: RequestCode
+  request_action_cd: NrRequestActionCodes
   request_jurisdiction_cd: string
   requestExaminationOrProvideConsent: RequestOrConsentIF
   showActualInput: boolean
diff --git a/src/list-data/conversion-types.ts b/src/list-data/conversion-types.ts
index a1648b478..cb993f3eb 100644
--- a/src/list-data/conversion-types.ts
+++ b/src/list-data/conversion-types.ts
@@ -1,4 +1,4 @@
-import { EntityType } from '@/enums'
+import { EntityType, NrRequestTypeCodes } from '@/enums'
 import { ConversionTypesI } from '@/interfaces/models'
 
 export const ConversionTypes: ConversionTypesI[] = [
@@ -9,7 +9,7 @@ export const ConversionTypes: ConversionTypesI[] = [
     blurbs: [
       'Alter business type from a limited company to an unlimited liability company.'
     ],
-    value: 'UC',
+    value: NrRequestTypeCodes.CONVERT_ULC,
     rank: 1,
     shortlist: true
   },
@@ -20,7 +20,7 @@ export const ConversionTypes: ConversionTypesI[] = [
     blurbs: [
       'Alter business type from a limited company to a community contribution company.'
     ],
-    value: 'CCV',
+    value: NrRequestTypeCodes.CONVERT_CCC,
     rank: 2,
     shortlist: true
   },
@@ -31,7 +31,7 @@ export const ConversionTypes: ConversionTypesI[] = [
     blurbs: [
       'Alter business type from a limited company to a benefit company.'
     ],
-    value: 'BECV',
+    value: NrRequestTypeCodes.CONVERT_BEN,
     shortlist: false
   },
   {
@@ -41,7 +41,7 @@ export const ConversionTypes: ConversionTypesI[] = [
     blurbs: [
       'Alter business type from a benefit company to a limited company.'
     ],
-    value: 'BECR',
+    value: NrRequestTypeCodes.CONVERT_CORP,
     shortlist: false
   },
   {
diff --git a/src/list-data/request-action-mapping.ts b/src/list-data/request-action-mapping.ts
index 7315c830d..4adeeb3ca 100644
--- a/src/list-data/request-action-mapping.ts
+++ b/src/list-data/request-action-mapping.ts
@@ -1,4 +1,4 @@
-import { EntityType, RequestCode } from '@/enums'
+import { EntityType, NrRequestActionCodes } from '@/enums'
 import { RequestActionMappingI, MappingI } from '@/interfaces'
 
 const entityTypesBC = [
@@ -77,10 +77,10 @@ export const XproMapping: MappingI = {
 }
 
 export const ColinRequestActions = [
-  RequestCode.AML,
-  RequestCode.CHG,
-  RequestCode.CNV,
-  RequestCode.REH
+  NrRequestActionCodes.AMALGAMATE,
+  NrRequestActionCodes.CHANGE_NAME,
+  NrRequestActionCodes.CONVERSION,
+  NrRequestActionCodes.RESTORE
 ]
 
 export const ColinRequestTypes = [
diff --git a/src/list-data/request-actions.ts b/src/list-data/request-actions.ts
index 5b930fd36..c8bd5f6ba 100644
--- a/src/list-data/request-actions.ts
+++ b/src/list-data/request-actions.ts
@@ -1,63 +1,78 @@
-import { RequestCode } from '@/enums'
+import { NrRequestActionCodes } from '@/enums'
 import { RequestActionsI } from '@/interfaces/models'
 
+/** All the request actions - some are group headers and others are selectable items. */
 export const RequestActions: RequestActionsI[] = [
   {
-    text: 'Register or Incorporate a',
+    isHeader: true,
+    group: 0,
+    text: 'For businesses that do not exist yet:'
+  },
+  {
+    group: 0,
+    text: 'Start a new BC-based business',
+    subtext: 'Incorporation or Registration',
     shortDesc: 'New Request',
-    value: RequestCode.NEW,
-    blurbs: `Create a new business in British Columbia or register a business you formed in another province or
-              territory, country or federal jurisdiction so that you may also conduct business here in BC.`
+    value: NrRequestActionCodes.NEW_BUSINESS
   },
   {
-    text: 'Relocate into',
-    shortDesc: 'Move Request',
-    value: RequestCode.MVE,
-    blurbs: `Transfer a corporation you formed in another jurisdiction so that it becomes a BC company.`
+    isHeader: true,
+    group: 1,
+    text: 'For businesses that already exist outside BC:'
   },
-  // COMMENTED OUT FOR FUTURE IMPLEMENTATION
-  // {
-  //   text: 'Assume a New Name in BC',
-  //   shortDesc: 'Assumed Name Request',
-  //   value: RequestCode.ASSUMED,
-  //   blurb: `You have an existing business in another province. You are closing your business there and moving your
-  //           business to BC, however, the name of your business is already in use in BC`
-  // },
-  {
-    text: 'Restore or Reinstate a',
-    shortDesc: 'Restore-Historical Request',
-    value: RequestCode.REH,
-    blurbs: `You have a corporation, cooperative association, society or financial institution that has been dissolved
-              or cancelled.  You want to start up again and use the same name or a new name.  You will need the
-              incorporation number assigned to you by BC Registries and Online Services.`
+  {
+    group: 1,
+    text: 'Register a business in BC that is incorporated in another jurisdiction',
+    subtext: 'Extraprovincial Registration',
+    shortDesc: 'New Request',
+    value: NrRequestActionCodes.NEW_BUSINESS
   },
   {
-    text: 'Amalgamate two or more',
-    shortDesc: 'Amalgamation Request',
-    value: RequestCode.AML,
-    blurbs: 'You have two or more businesses that you want to combine to create a new business.'
+    group: 1,
+    text: 'End business registration in another jurisdiction and transfer to BC',
+    subtext: 'Continuation In',
+    shortDesc: 'Move Request',
+    value: NrRequestActionCodes.MOVE
+  },
+  {
+    isHeader: true,
+    group: 2,
+    text: 'For businesses that are already incorporated or registered in BC:'
   },
   {
-    text: 'Change the name of an existing',
+    group: 2,
+    text: 'Change the name of an existing BC business',
+    subtext: 'Name Change',
     shortDesc: 'Change of Name Request',
-    value: RequestCode.CHG,
-    blurbs: `You have an existing business that is registered or incorporated in BC and you want to change your name.
-              You will need the incorporation or firm number assigned to you by BC Registries and Online Services.`
+    value: NrRequestActionCodes.CHANGE_NAME
   },
   {
-    text: 'Change (alter) the business type of a',
+    group: 2,
+    text: 'Combine two or more businesses in BC',
+    subtext: 'Amalgamation',
+    shortDesc: 'Amalgamation Request',
+    value: NrRequestActionCodes.AMALGAMATE
+  },
+  {
+    group: 2,
+    text: 'Alter from one BC business type to another',
+    subtext: 'Alteration',
     shortDesc: 'Conversion Request',
-    value: RequestCode.CNV,
-    blurbs: `You want to alter from one type of corporation to another.  For example you are a limited company and
-              want to become an unlimited liability company.   You will need the incorporation number assigned to you
-              by BC Registries and Online Services.`
+    value: NrRequestActionCodes.CONVERSION
+  },
+  {
+    group: 2,
+    text: 'Reactivate a BC or Extraprovincial company',
+    subtext: 'Restoration or Reinstatement',
+    shortDesc: 'Restore-Historical Request',
+    value: NrRequestActionCodes.RESTORE
   }
   // COMMENTED OUT FOR FUTURE IMPLEMENTATION
   // {
-  //   text: 'Restore with a New Name',
+  //   group: 2,
+  //   text: 'Restore a business that has been dissolved or cancelled',
+  //   subtext: 'Restoration or Reinstatement',
   //   shortDesc: 'Restore-New Request',
-  //   value: RequestCode.REN,
-  //   blurb: `You have a business that has been dissolved or cancelled. You want to start up again with a new name.
-  //           You will need your incorporation or firm number assigned to you by Registries.`
+  //   value: NrRequestActionCodes.RENEW
   // }
 ]
diff --git a/src/main.ts b/src/main.ts
index a25187c97..4b55d16bc 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -30,7 +30,7 @@ Vue.config.devtools = true
 async function startVue () {
   // Fetch the configuration
   const envConfig = await getConfig()
-  const store = await getVuexStore()
+  const store = getVuexStore()
 
   // FUTURE: remove these config assignments if possible
   // Load environment config
diff --git a/src/mixins/common-mixin.ts b/src/mixins/common-mixin.ts
index 1146c7ee1..f5e7eb443 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, RequestCode } from '@/enums'
+import { EntityType, PriorityCode, NrRequestActionCodes } from '@/enums'
 
 @Component({})
 export class CommonMixin extends Vue {
@@ -53,18 +53,18 @@ export class CommonMixin extends Vue {
    * Returns request action text for the the specified code.
    * See namex -> api/namex/resources/name_requests/report_resource.py::_get_request_action_cd_description()
    */
-  requestActionCdToText (cd: RequestCode): string {
+  requestActionCdToText (cd: NrRequestActionCodes): string {
     switch (cd) {
-      case RequestCode.NEW: return 'New Business'
-      case RequestCode.MVE: return 'Continuation In'
-      case RequestCode.REH: return 'Restoration or Reinstatement'
-      case RequestCode.AML: return 'Amalgamation'
-      case RequestCode.CHG: return 'Name Change'
-      case RequestCode.CNV: return 'Alteration'
-      case RequestCode.DBA: return 'Doing Business As'
-      case RequestCode.ASSUMED: return 'Assumed Named'
-      case RequestCode.REN: return 'Restoration or Reinstatement'
-      case RequestCode.REST: return 'Restoration or Reinstatement'
+      case NrRequestActionCodes.NEW_BUSINESS: return 'New Business'
+      case NrRequestActionCodes.MOVE: return 'Continuation In'
+      case NrRequestActionCodes.RESTORE: return 'Restoration or Reinstatement'
+      case NrRequestActionCodes.AMALGAMATE: return 'Amalgamation'
+      case NrRequestActionCodes.CHANGE_NAME: return 'Name Change'
+      case NrRequestActionCodes.CONVERSION: return 'Alteration'
+      case NrRequestActionCodes.DBA: return 'Doing Business As'
+      case NrRequestActionCodes.ASSUMED: return 'Assumed Named'
+      case NrRequestActionCodes.RENEW: return 'Restoration or Reinstatement'
+      case NrRequestActionCodes.RESTORATION: return 'Restoration or Reinstatement'
       // the following may be returned by the namex API:
       case 'NRO-NEWAML' as any: return 'Amalgamation'
       case 'NRO-REST' as any: return 'Restoration or Reinstatement'
diff --git a/src/modules/payment/models.ts b/src/modules/payment/models.ts
index 9eeaaa609..d9d4e293b 100644
--- a/src/modules/payment/models.ts
+++ b/src/modules/payment/models.ts
@@ -29,7 +29,7 @@ export interface NameRequestReceipt {
 }
 
 export interface CreatePaymentParams {
-  action: string // FUTURE: use type 'NrAction' or 'RequestCode' ?
+  action: string // FUTURE: use type 'NrAction' or 'NrRequestActionCodes' ?
   nrId: number
   filingType: string // FUTURE: use type 'FilingTypes' ?
   priorityRequest: boolean
diff --git a/src/services/namex.services.ts b/src/services/namex.services.ts
index 594072f34..1f1d1ea5e 100644
--- a/src/services/namex.services.ts
+++ b/src/services/namex.services.ts
@@ -12,7 +12,7 @@ import {
   StatsI
 } from '@/interfaces'
 import { RequestActions } from '@/list-data'
-import { NrAction, NrState, RequestCode, RollbackActions } from '@/enums'
+import { NrAction, NrState, NrRequestActionCodes, RollbackActions } from '@/enums'
 import { NameRequestPayment } from '@/modules/payment/models'
 import { appBaseURL } from '../router/router'
 
@@ -39,7 +39,7 @@ export default class NamexServices {
   static axios = axiosNamex
 
   static async addRequestActionComment (
-    requestActionCd: RequestCode,
+    requestActionCd: NrRequestActionCodes,
     data: NameRequestI
   ): Promise<NameRequestI> {
     try {
@@ -401,7 +401,7 @@ export default class NamexServices {
     throw new Error(`Invalid response = ${response}`)
   }
 
-  static async patchNameRequests (nrId: number, requestActionCd: RequestCode, nr: NameRequestI): Promise<any> {
+  static async patchNameRequests (nrId: number, requestActionCd: NrRequestActionCodes, nr: NameRequestI): Promise<any> {
     try {
       // const nr = getters.getEditNameReservation
       const requestData: any = nr && await this.addRequestActionComment(requestActionCd, nr)
@@ -448,7 +448,7 @@ export default class NamexServices {
   }
 
   static async postNameRequest (
-    requestActionCd: RequestCode,
+    requestActionCd: NrRequestActionCodes,
     data: NameRequestI
   ): Promise<NameRequestI> {
     try {
@@ -489,7 +489,7 @@ export default class NamexServices {
 
   static async putNameReservation (
     nrId: number,
-    requestActionCd: RequestCode,
+    requestActionCd: NrRequestActionCodes,
     data: NameRequestI
   ): Promise<NameRequestI> {
     try {
diff --git a/src/store/actions.ts b/src/store/actions.ts
index 2b405120e..6ff2007b8 100644
--- a/src/store/actions.ts
+++ b/src/store/actions.ts
@@ -8,10 +8,11 @@ import {
   NameCheckAnalysisType,
   NameCheckConflictType,
   NameCheckErrorType,
+  XproNameType,
   NrAffiliationErrors,
+  NrRequestActionCodes,
   NrState,
-  NrType,
-  RequestCode
+  NrType
 } from '@/enums'
 import { BAD_REQUEST, NOT_FOUND, OK, SERVICE_UNAVAILABLE } from 'http-status-codes'
 import removeAccents from 'remove-accents'
@@ -256,11 +257,13 @@ const commitExistingData = ({ commit, getters }) => {
     commit('mutateEntityTypeAddToSelect', obj)
   }
   let { requestTypeCd, request_action_cd } = getters.getNr
-  if (['AS', 'AL', 'XASO', 'XCASO', 'UA'].includes(requestTypeCd)) {
-    request_action_cd = RequestCode.ASSUMED
+  if (
+    [XproNameType.AS, XproNameType.AL, XproNameType.XASO, XproNameType.XCASO, XproNameType.UA].includes(requestTypeCd)
+  ) {
+    request_action_cd = NrRequestActionCodes.ASSUMED
   }
   commit('mutateRequestAction', request_action_cd)
-  if (request_action_cd !== RequestCode.NEW) {
+  if (request_action_cd !== NrRequestActionCodes.NEW_BUSINESS) {
     let reqObj = RequestActions.find(type => type.value === request_action_cd)
     commit('mutateExtendedRequestType', reqObj)
   }
@@ -583,7 +586,7 @@ export const setExtendedRequestType: ActionIF = ({ commit }, extendedRequestType
   commit('mutateExtendedRequestType', extendedRequestType)
 }
 
-export const setRequestAction: ActionIF = ({ commit }, requestAction: RequestCode): void => {
+export const setRequestAction: ActionIF = ({ commit }, requestAction: NrRequestActionCodes): void => {
   commit('mutateRequestAction', requestAction)
 }
 
@@ -1053,7 +1056,7 @@ export const startAnalyzeName: ActionIF = async ({ commit, getters }) => {
     if (!getters.getDesignation) commit('setErrors', 'designation')
   }
   if ([Location.CA, Location.IN].includes(getters.getLocation) &&
-    ![RequestCode.MVE].includes(getters.getRequestActionCd) && !getters.getJurisdictionCd) {
+    ![NrRequestActionCodes.MOVE].includes(getters.getRequestActionCd) && !getters.getJurisdictionCd) {
     commit('setErrors', 'jurisdiction')
     return
   }
diff --git a/src/store/getters.ts b/src/store/getters.ts
index d2b4cf05e..85c204821 100644
--- a/src/store/getters.ts
+++ b/src/store/getters.ts
@@ -30,10 +30,11 @@ import {
   CorpNumRequests,
   EntityType,
   Location,
+  XproNameType,
   NrAffiliationErrors,
   NrState,
   PriorityCode,
-  RequestCode
+  NrRequestActionCodes
 } from '@/enums'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
 
@@ -122,7 +123,7 @@ export const getEntityTypeCd = (state: StateIF): EntityType => {
 }
 
 /** The Request Code. */
-export const getRequestActionCd = (state: StateIF): RequestCode => {
+export const getRequestActionCd = (state: StateIF): NrRequestActionCodes => {
   return state.stateModel.newRequestModel.request_action_cd
 }
 
@@ -141,7 +142,7 @@ export const getCorpSearch = (state: StateIF): string => {
 
 /** True if current request action code is "conversion". */
 export const getIsConversion = (state: StateIF): boolean => {
-  return getRequestActionCd(state) === RequestCode.CNV
+  return getRequestActionCd(state) === NrRequestActionCodes.CONVERSION
 }
 
 export const getExistingRequestSearch = (state: StateIF): ExistingRequestSearchI => {
@@ -158,7 +159,10 @@ export const getErrors = (state: StateIF): string[] => {
 
 /** True if XproMras. */
 export const getIsXproMras = (state: StateIF): boolean => {
-  return ([Location.CA, Location.IN].includes(getLocation(state)) && (getRequestActionCd(state) !== RequestCode.MVE))
+  return (
+    [Location.CA, Location.IN].includes(getLocation(state)) &&
+    (getRequestActionCd(state) !== NrRequestActionCodes.MOVE)
+  )
 }
 
 export const getHasNoCorpNum = (state: StateIF): boolean => {
@@ -178,7 +182,7 @@ export const getExtendedRequestType = (state: StateIF): SelectOptionsI => {
 }
 
 export const getRequestTypeOptions = (state: StateIF): RequestActionsI[] => {
-  let option = RequestActions.find(type => type.value === RequestCode.NEW)
+  let option = RequestActions.find(type => type.value === NrRequestActionCodes.NEW_BUSINESS)
   option.rank = 1
   let options = [option]
   let n = 2
@@ -188,11 +192,14 @@ export const getRequestTypeOptions = (state: StateIF): RequestActionsI[] => {
     n = 3
   }
   let { requestTypeCd } = getNr(state)
-  if (getEditMode(state) && ['AS', 'AL', 'XASO', 'XCASO', 'UA'].includes(requestTypeCd)) {
-    options.push({ text: 'Assume an', value: RequestCode.ASSUMED, rank: n })
+  if (
+    getEditMode(state) &&
+    [XproNameType.AS, XproNameType.AL, XproNameType.XASO, XproNameType.XCASO, XproNameType.UA].includes(requestTypeCd)
+  ) {
+    options.push({ text: 'Assume an', value: NrRequestActionCodes.ASSUMED, rank: n })
     n++
   }
-  options.push({ text: 'View All Request Actions', value: RequestCode.INFO, rank: n })
+  options.push({ text: 'View All Request Actions', value: NrRequestActionCodes.INFO, rank: n })
 
   return options.sort((a, b) => {
     if (a.rank < b.rank) {
@@ -345,7 +352,7 @@ export const getConversionTypeOptions = (state: StateIF): ConversionTypesI[] =>
 /** Map the appropriate Blurb based on the request action and location */
 export const getEntityBlurbs = (state: StateIF): Array<EntityI | ConversionTypesI> => {
   switch (getRequestActionCd(state)) {
-    case RequestCode.NEW:
+    case NrRequestActionCodes.NEW_BUSINESS:
       if (getLocation(state) === Location.BC) {
         return EntityTypesBcData
       }
@@ -357,13 +364,13 @@ export const getEntityBlurbs = (state: StateIF): Array<EntityI | ConversionTypes
       }
       break
 
-    case RequestCode.MVE:
+    case NrRequestActionCodes.MOVE:
       if (getLocation(state) === Location.BC) {
         return EntityTypesBcData.map(x => ({ ...x, blurbs: x.mveBlurbs }))
       }
       break
 
-    case RequestCode.REH:
+    case NrRequestActionCodes.RESTORE:
       if (getLocation(state) === Location.BC) {
         return EntityTypesBcData.map(x => ({ ...x, blurbs: x.rehBlurbs }))
       }
@@ -372,7 +379,7 @@ export const getEntityBlurbs = (state: StateIF): Array<EntityI | ConversionTypes
       }
       break
 
-    case RequestCode.AML:
+    case NrRequestActionCodes.AMALGAMATE:
       if (getLocation(state) === Location.BC) {
         return EntityTypesBcData.map(x => ({ ...x, blurbs: x.amlBlurbs }))
       }
@@ -385,7 +392,7 @@ export const getEntityBlurbs = (state: StateIF): Array<EntityI | ConversionTypes
       }
       break
 
-    case RequestCode.CHG:
+    case NrRequestActionCodes.CHANGE_NAME:
       if (getLocation(state) === Location.BC) {
         return EntityTypesBcData.map(x => ({ ...x, blurbs: x.chgBlurbs }))
       }
@@ -398,7 +405,7 @@ export const getEntityBlurbs = (state: StateIF): Array<EntityI | ConversionTypes
       }
       break
 
-    case RequestCode.CNV:
+    case NrRequestActionCodes.CONVERSION:
       if (getLocation(state) === Location.BC) {
         return ConversionTypes
       }
@@ -509,14 +516,17 @@ export const getShowXproJurisdiction = (state: StateIF): boolean => {
   return getLocation(state) !== Location.BC
 }
 
-export const getXproRequestTypeCd = (state: StateIF): string => {
+// For reference, see request_type_mapping in Namex constants file.
+export const getXproRequestTypeCd = (state: StateIF): XproNameType => {
   if (getIsAssumedName(state)) {
     switch (getEntityTypeCd(state)) {
-      case EntityType.RLC: return 'AL'
-      case EntityType.XCR: return 'AS'
+      // Xpro Limited Liability Company REST/REN/REH/RESUBMIT -> Xpro Limited Liability Company AS/RESUBMIT
+      case EntityType.RLC: return XproNameType.AL
+      // Xpro Corporation NEW_AML/NEW/AML/RESUBMIT -> Xpro Corporation AS/RESUBMIT
+      case EntityType.XCR: return XproNameType.AS
     }
   }
-  return ''
+  return null
 }
 
 /** Get entity type options. */
@@ -524,7 +534,7 @@ export const getEntityTypeOptions = (state: StateIF): Array<EntityI> => {
   let bcOptions: SelectOptionsI[] = getEntityTypesBC(state)?.filter(x => {
     // Set shortlisted entity types for BC Move and Restoration requests.
     if (
-      [RequestCode.MVE, RequestCode.REH].includes(getRequestActionCd(state)) &&
+      [NrRequestActionCodes.MOVE, NrRequestActionCodes.RESTORE].includes(getRequestActionCd(state)) &&
       getLocation(state) === Location.BC
     ) {
       // Shortlist order: Limited company, Cooperative association
@@ -535,7 +545,7 @@ export const getEntityTypeOptions = (state: StateIF): Array<EntityI> => {
         x.shortlist = null
         x.rank = null
       }
-    } else if (getRequestActionCd(state) === RequestCode.AML && getLocation(state) === Location.BC) {
+    } else if (getRequestActionCd(state) === NrRequestActionCodes.AMALGAMATE && getLocation(state) === Location.BC) {
       // Shortlist order: Limited company, Unlimited liability company
       if (x.value === EntityType.UL) {
         x.shortlist = true
@@ -566,7 +576,7 @@ export const getEntityTypeOptions = (state: StateIF): Array<EntityI> => {
   })
   let xproOptions: SelectOptionsI[] = getEntityTypesXPRO(state).filter(x => {
     if (
-      getRequestActionCd(state) === RequestCode.NEW &&
+      getRequestActionCd(state) === NrRequestActionCodes.NEW_BUSINESS &&
       [Location.CA, Location.IN].includes(getLocation(state))
     ) {
       // Shortlist order: Limited company, Limited partnership
@@ -578,7 +588,7 @@ export const getEntityTypeOptions = (state: StateIF): Array<EntityI> => {
         x.rank = null
       }
     } else if (
-      getRequestActionCd(state) === RequestCode.MVE &&
+      getRequestActionCd(state) === NrRequestActionCodes.MOVE &&
       [Location.CA, Location.IN].includes(getLocation(state))
     ) {
       // Shortlist order: Limited company, Cooperative association
@@ -590,7 +600,7 @@ export const getEntityTypeOptions = (state: StateIF): Array<EntityI> => {
         x.rank = 2
       }
     } else if (
-      getRequestActionCd(state) === RequestCode.CHG &&
+      getRequestActionCd(state) === NrRequestActionCodes.CHANGE_NAME &&
       [Location.CA, Location.IN].includes(getLocation(state))
     ) {
       // Shortlist order: Limited company, Limited partnership, Limited liability partnership
@@ -631,13 +641,13 @@ export const getEntityTypeOptions = (state: StateIF): Array<EntityI> => {
 
 /** Returned the filtered location options. */
 export const getLocationOptions = (state: StateIF): Array<any> => {
-  if (getRequestActionCd(state) === RequestCode.CNV) {
+  if (getRequestActionCd(state) === NrRequestActionCodes.CONVERSION) {
     return Locations.filter(location => location.value === Location.BC)
   }
-  if (getRequestActionCd(state) === RequestCode.ASSUMED) {
+  if (getRequestActionCd(state) === NrRequestActionCodes.ASSUMED) {
     return Locations.filter(location => location.value !== Location.BC)
   }
-  if (getRequestActionCd(state) === RequestCode.MVE) {
+  if (getRequestActionCd(state) === NrRequestActionCodes.MOVE) {
     return Locations.filter(location => location.value === Location.BC)
   }
   return Locations.filter(() => true) // copy of Locations
@@ -678,12 +688,12 @@ export const getShowCorpNum = (state: StateIF): CorpNumRequests.COLIN | CorpNumR
   ) {
     if (
       getLocation(state) === Location.CA &&
-      [RequestCode.NEW, RequestCode.ASSUMED].includes(getRequestActionCd(state))
+      [NrRequestActionCodes.NEW_BUSINESS, NrRequestActionCodes.ASSUMED].includes(getRequestActionCd(state))
     ) {
       return CorpNumRequests.MRAS
     }
     if (getLocation(state) === Location.BC &&
-      [RequestCode.MVE].includes(getRequestActionCd(state))
+      [NrRequestActionCodes.MOVE].includes(getRequestActionCd(state))
     ) {
       return CorpNumRequests.MRAS
     }
@@ -853,7 +863,7 @@ export const getNrRequestNames = (state: StateIF): RequestNameI[] => {
   const nrNames = getNrNames(state)
 
   const defaultValues = {
-    name_type_cd: getAssumedName(state) ? 'AS' : 'CO',
+    name_type_cd: getAssumedName(state) ? XproNameType.AS : XproNameType.CO,
     consent_words: '',
     conflict1: '',
     conflict1_num: ''
@@ -1040,7 +1050,7 @@ export const getConditionalNameReservation = (state: StateIF): ConditionalReqI =
       name: getName(state),
       choice: 1,
       designation: getSplitNameDesignation(state).designation,
-      name_type_cd: getIsAssumedName(state) ? 'AS' : 'CO',
+      name_type_cd: getIsAssumedName(state) ? XproNameType.AS : XproNameType.CO,
       consent_words: getConsentWords(state).length > 0 ? getConsentWords(state) : '',
       conflict1: getConsentConflicts(state).name,
       conflict1_num: getConsentConflicts(state).corpNum ? getConsentConflicts(state).corpNum : ''
@@ -1056,7 +1066,7 @@ export const getConditionalNameReservation = (state: StateIF): ConditionalReqI =
     priorityCd: PriorityCode.NO,
     entity_type_cd: getEntityTypeCd(state), // FUTURE: fix entity_type_cd type
     request_action_cd: getRequestActionCd(state),
-    request_type_cd: getXproRequestTypeCd(state) ? getXproRequestTypeCd(state) : '',
+    request_type_cd: getXproRequestTypeCd(state) || '',
     stateCd: NrState.COND_RESERVED,
     english: getNameIsEnglish(state),
     nameFlag: getIsPersonsName(state),
diff --git a/src/store/mutations.ts b/src/store/mutations.ts
index df58e5587..f324c044e 100644
--- a/src/store/mutations.ts
+++ b/src/store/mutations.ts
@@ -18,7 +18,7 @@ import {
   NameCheckErrorType,
   NrAffiliationErrors,
   PriorityCode,
-  RequestCode
+  NrRequestActionCodes
 } from '@/enums'
 
 export const clearErrors = (state: StateIF) => {
@@ -265,7 +265,7 @@ export const mutatePriorityRequest = (state: StateIF, priorityRequest: boolean)
   state.stateModel.newRequestModel.priorityRequest = priorityRequest
 }
 
-export const mutateRequestAction = (state: StateIF, requestCd: RequestCode) => {
+export const mutateRequestAction = (state: StateIF, requestCd: NrRequestActionCodes) => {
   state.stateModel.newRequestModel.conversionType = null
   state.stateModel.newRequestModel.request_action_cd = requestCd
 }
diff --git a/tests/unit/setup.ts b/tests/setup.ts
similarity index 100%
rename from tests/unit/setup.ts
rename to tests/setup.ts
diff --git a/tests/unit/analyze-pending.spec.ts b/tests/unit/analyze-pending.spec.ts
index 7c1a426dc..f1b50c933 100644
--- a/tests/unit/analyze-pending.spec.ts
+++ b/tests/unit/analyze-pending.spec.ts
@@ -8,7 +8,7 @@ const vuetify = new Vuetify()
 
 localVue.use(Vuetify)
 
-describe('analyze-pending', () => {
+describe('AnalyzePending component', () => {
   it('is an empty test', () => {})
   // let wrapper: any
   // beforeAll(async () => {
diff --git a/tests/unit/analyze-results.spec.ts b/tests/unit/analyze-results.spec.ts
index 1a6638e6a..7ab40c81c 100644
--- a/tests/unit/analyze-results.spec.ts
+++ b/tests/unit/analyze-results.spec.ts
@@ -23,7 +23,7 @@ const vuetify = new Vuetify()
 //   })
 // }
 
-describe('analyze-results', () => {
+describe('AnalyzeResults component', () => {
   it('is an empty test', () => {})
   // let lengthTestData = testData.length
   // let wrapper: any
diff --git a/tests/unit/applicant-info-1.spec.ts b/tests/unit/applicant-info-1.spec.ts
index f0b931857..6be6b2697 100644
--- a/tests/unit/applicant-info-1.spec.ts
+++ b/tests/unit/applicant-info-1.spec.ts
@@ -10,7 +10,7 @@ const vuetify = new Vuetify()
 
 localVue.use(Vuetify)
 
-describe('applicant-info-1', () => {
+describe('ApplicantInfo1 component', () => {
   it('is an empty test', () => {})
   // let wrapper
 
diff --git a/tests/unit/applicant-info-2.spec.ts b/tests/unit/applicant-info-2.spec.ts
index c45c82ad9..c3930ed5a 100644
--- a/tests/unit/applicant-info-2.spec.ts
+++ b/tests/unit/applicant-info-2.spec.ts
@@ -8,7 +8,7 @@ const localVue = createLocalVue()
 const vuetify = new Vuetify()
 localVue.use(Vuetify)
 
-describe('applicant-info-2', () => {
+describe('ApplicantInfo2 component', () => {
   it('is an empty test', () => {})
   // let wrapper: any
 
diff --git a/tests/unit/nr-required-modal.spec.ts b/tests/unit/dialogs/nr-not-required.spec.ts
similarity index 96%
rename from tests/unit/nr-required-modal.spec.ts
rename to tests/unit/dialogs/nr-not-required.spec.ts
index 2e5ab4db2..0de1f7ead 100644
--- a/tests/unit/nr-required-modal.spec.ts
+++ b/tests/unit/dialogs/nr-not-required.spec.ts
@@ -7,7 +7,7 @@ const vuetify = new Vuetify()
 
 localVue.use(Vuetify)
 
-describe('nr-required-modal', () => {
+describe('NrNotRequiredDialog', () => {
   it('is an empty test', () => {})
   // let wrapper: any
 
diff --git a/tests/unit/pick-entity-modal.spec.ts b/tests/unit/dialogs/pick-entity-or-conversion.spec.ts
similarity index 97%
rename from tests/unit/pick-entity-modal.spec.ts
rename to tests/unit/dialogs/pick-entity-or-conversion.spec.ts
index 7e59558bc..94328c33b 100644
--- a/tests/unit/pick-entity-modal.spec.ts
+++ b/tests/unit/dialogs/pick-entity-or-conversion.spec.ts
@@ -11,7 +11,7 @@ const vuetify = new Vuetify()
 
 localVue.use(Vuetify)
 
-describe('pick-entity-modal', () => {
+describe('PickEntityOrConversionDialog', () => {
   it('is an empty test', () => {})
   // let wrapper: any
 
diff --git a/tests/unit/pick-request-type-modal.spec.ts b/tests/unit/dialogs/pick-request-type.spec.ts
similarity index 53%
rename from tests/unit/pick-request-type-modal.spec.ts
rename to tests/unit/dialogs/pick-request-type.spec.ts
index 4d1e5ad24..90f13ecf2 100644
--- a/tests/unit/pick-request-type-modal.spec.ts
+++ b/tests/unit/dialogs/pick-request-type.spec.ts
@@ -1,27 +1,43 @@
-import { mount, createLocalVue } from '@vue/test-utils'
-import Vuetify from 'vuetify'
-import { PickRequestTypeDialog } from '@/components/dialogs'
+import Vue from 'vue'
+import { shallowMount } from '@vue/test-utils'
+import { getVuetify } from '@/plugins'
+import { getVuexStore } from '@/store'
+import { RequestActions } from '@/list-data'
+import PickRequestTypeDialog from '@/components/dialogs/pick-request-type.vue'
 // import newReqModule from '@/store/new-request-module'
 
+const vuetify = getVuetify()
+const store = getVuexStore()
+
 // Prevent the warning "[Vuetify] Unable to locate target [data-app]"
 document.body.setAttribute('data-app', 'true')
 
-const localVue = createLocalVue()
-const vuetify = new Vuetify()
-
-localVue.use(Vuetify)
+describe('PickRequestTypeDialog', () => {
+  it('renders the dialog when showModal is true', () => {
+    const wrapper = shallowMount(PickRequestTypeDialog, {
+      vuetify,
+      store,
+      mocks: {
+        $requestActions: RequestActions
+      },
+      computed: { showModal: () => true }
+    })
 
-describe('pick-request-type-modal', (): void => {
-  it('is an empty test', () => {})
-  // let wrapper: any
+    // verify dialog and title
+    expect(wrapper.isVisible()).toBe(true)
+    expect(wrapper.find('h4').text()).toBe('What would you like to do?')
+    expect(wrapper.find('v-icon-stub').text()).toBe('mdi-close')
 
-  // beforeEach(() => {
-  //   wrapper = mount(PickRequestTypeDialog, { localVue, vuetify })
-  // })
+    // verify list items
+    const texts = ['Start', 'Register', 'End', 'Change', 'Combine', 'Alter', 'Reactivate']
+    const items = wrapper.findAll('.clickable-cell')
+    expect(items.length).toBe(7)
+    for (let i = 0; i < items.length; i++) {
+      expect(items.at(i).text()).toContain(texts[i])
+    }
 
-  // afterEach(() => {
-  //   wrapper.destroy()
-  // })
+    wrapper.destroy()
+  })
 
   // it('When the modal visibility state key is set to false, the components internal getter is false', () => {
   //   newReqModule.store.state.newRequestModule.pickRequestTypeModalVisible = false
diff --git a/tests/unit/dialogs/staff-payment-error-dialog.spec.ts b/tests/unit/dialogs/staff-payment-error.spec.ts
similarity index 98%
rename from tests/unit/dialogs/staff-payment-error-dialog.spec.ts
rename to tests/unit/dialogs/staff-payment-error.spec.ts
index f0132b3ab..e691f606e 100644
--- a/tests/unit/dialogs/staff-payment-error-dialog.spec.ts
+++ b/tests/unit/dialogs/staff-payment-error.spec.ts
@@ -8,7 +8,7 @@ const vuetify = new Vuetify({})
 // Prevent the warning "[Vuetify] Unable to locate target [data-app]"
 document.body.setAttribute('data-app', 'true')
 
-describe('Staff Payment Error Dialog', () => {
+describe('StaffPaymentErrorDialog', () => {
   const notEnoughBalance = [{
     message: `There is not enough balance in this Routing slip. The current balance is: $30.00`,
     payment_error_type: 'INSUFFICIENT_BALANCE_IN_ROUTING_SLIP'
diff --git a/tests/unit/landing.spec.ts b/tests/unit/landing.spec.ts
index c757c9cdd..acf3c8dae 100644
--- a/tests/unit/landing.spec.ts
+++ b/tests/unit/landing.spec.ts
@@ -18,7 +18,7 @@ const stubs = {
   quillEditor: true
 }
 
-describe('landing part 1', () => {
+describe('Landing view', () => {
   it('is an empty test', () => {})
   //   let wrapper: any
 
diff --git a/tests/unit/link-row.spec.ts b/tests/unit/link-row.spec.ts
index 83818715f..721d72165 100644
--- a/tests/unit/link-row.spec.ts
+++ b/tests/unit/link-row.spec.ts
@@ -9,7 +9,7 @@ const vuetify = new Vuetify()
 
 localVue.use(Vuetify)
 
-describe('link-row', () => {
+describe('LinkRow component', () => {
   it('is an empty test', () => {})
   // let wrapper: any
 
diff --git a/tests/unit/name-build-info.spec.ts b/tests/unit/name-build-info.spec.ts
index c4c64df45..e4baf1e86 100644
--- a/tests/unit/name-build-info.spec.ts
+++ b/tests/unit/name-build-info.spec.ts
@@ -10,7 +10,7 @@ const vuetify = new Vuetify()
 
 localVue.use(Vuetify)
 
-describe('name-build-info', () => {
+describe('NameBuildInfo component', () => {
   it('is an empty test', () => {})
   // let wrapper: any
 
diff --git a/tests/unit/name-input.spec.ts b/tests/unit/name-input.spec.ts
index cd81e7cdd..3660240e2 100644
--- a/tests/unit/name-input.spec.ts
+++ b/tests/unit/name-input.spec.ts
@@ -8,7 +8,7 @@ const vuetify = new Vuetify()
 
 localVue.use(Vuetify)
 
-describe('name-input', () => {
+describe('NameInput component', () => {
   it('is an empty test', () => {})
   // let wrapper: any
 
diff --git a/tests/unit/names-capture.spec.ts b/tests/unit/names-capture.spec.ts
index 55d733015..4f51201f0 100644
--- a/tests/unit/names-capture.spec.ts
+++ b/tests/unit/names-capture.spec.ts
@@ -9,7 +9,7 @@ const vuetify = new Vuetify()
 
 localVue.use(Vuetify)
 
-describe('names-capture', () => {
+describe('NamesCapture component', () => {
   it('is an empty test', () => {})
   // describe('It initially renders correctly', () => {
   //   let wrapper
diff --git a/tests/unit/new-request-module.spec.ts b/tests/unit/new-request-module.spec.ts
index 3c300d0ad..3c5351596 100644
--- a/tests/unit/new-request-module.spec.ts
+++ b/tests/unit/new-request-module.spec.ts
@@ -1,7 +1,7 @@
 // import store from '@/store/new-request-module'
 
 // Testing behavior of getters.showCorpNum: (state) => return value
-describe('new-request-module', () => {
+describe('New Request module', () => {
   it('is an empty test', () => {})
   // /* -- SETUP CONSTANTS FOR TESTING -- */
   // function setState ({ entityType, requestAction, location, jurisdiction }) {
diff --git a/tests/unit/new-search.spec.ts b/tests/unit/new-search.spec.ts
index c3e054e2d..92958ea61 100644
--- a/tests/unit/new-search.spec.ts
+++ b/tests/unit/new-search.spec.ts
@@ -8,7 +8,7 @@ const vuetify = new Vuetify()
 
 localVue.use(Vuetify)
 
-describe('new-search', () => {
+describe('NewSearch component', () => {
   it('is an empty test', () => {})
   // let wrapper: any
 
diff --git a/tests/unit/reserve-submit.spec.ts b/tests/unit/reserve-submit.spec.ts
index 014529e67..02bcb5a95 100644
--- a/tests/unit/reserve-submit.spec.ts
+++ b/tests/unit/reserve-submit.spec.ts
@@ -26,7 +26,7 @@ async function provideWrapper (setup) {
 
 const sandbox = sinon.createSandbox()
 
-describe('reserve-submit', () => {
+describe('ReserveSubmit component', () => {
   it('is an empty test', () => {})
   // describe('Case: it handles the NORMAL route (!setup) properly', () => {
   //   sandbox.spy(newReqModule, 'postNameRequest')
diff --git a/tests/unit/search-pending.spec.ts b/tests/unit/search-pending.spec.ts
index 247f5ac44..ae6a817b0 100644
--- a/tests/unit/search-pending.spec.ts
+++ b/tests/unit/search-pending.spec.ts
@@ -7,7 +7,7 @@ const vuetify = new Vuetify()
 
 localVue.use(Vuetify)
 
-describe('search-pending', () => {
+describe('SearchPending component', () => {
   it('is an empty test', () => {})
   // const wrapper = mount(SearchPending, {
   //   localVue,
diff --git a/tests/unit/new-request.spec.ts b/tests/unit/search.spec.ts
similarity index 97%
rename from tests/unit/new-request.spec.ts
rename to tests/unit/search.spec.ts
index fffaa2870..787a994c5 100644
--- a/tests/unit/new-request.spec.ts
+++ b/tests/unit/search.spec.ts
@@ -8,7 +8,7 @@ const vuetify = new Vuetify()
 
 localVue.use(Vuetify)
 
-describe('new-request', () => {
+describe('Search component', () => {
   it('is an empty test', () => {})
   // let wrapper: any