From 531f63ef1c5f1662a1b46f095f426ae1edcf8631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9verin=20Beauvais?=
 <severinbeauvais@users.noreply.github.com>
Date: Fri, 10 Feb 2023 15:35:38 -0800
Subject: [PATCH] - separated Name Translation from Name Request Info (#512)

- ported Business Name from Edit UI component
- copied CorrectXXX from Edit UI
- removed obsolete code from Restoration Business Name
- deleted some local enums
- imported some shared enums
- cleaned up dissolution types
- created/fixed/expanded unit tests
- misc cleanup
- app version = 4.5.17
---
 package-lock.json                             | 302 +++++++++--------
 package.json                                  |  32 +-
 src/App.vue                                   |  33 +-
 .../Dissolution/CareAndCustodySelect.vue      |   4 +-
 .../Incorporation/UploadMemorandum.vue        |   6 +-
 src/components/Incorporation/UploadRules.vue  |   6 +-
 src/components/Restoration/BusinessName.vue   | 317 ++++++++++++++++++
 .../Restoration/CorrectCompanyName.vue        |  85 +++++
 .../Restoration/CorrectNameOptions.vue        | 226 +++++++++++++
 .../Restoration/CorrectNameRequest.vue        | 253 ++++++++++++++
 .../Restoration/CorrectNameToNumber.vue       |  82 +++++
 src/components/common/Actions.vue             |   2 +-
 src/components/common/EntityInfo.vue          |   2 +-
 src/components/common/NameRequestInfo.vue     | 248 ++------------
 src/components/common/NameTranslation.vue     | 225 +++++++++++++
 src/dialogs/NameRequestInvalidErrorDialog.vue |   2 +-
 src/enums/filingNames.ts                      |  12 -
 src/enums/filingTypes.ts                      |   6 -
 src/enums/index.ts                            |  13 +-
 src/enums/name-change-options.ts              |   5 +
 src/enums/nameRequestStates.ts                |  22 --
 src/enums/nameRequestTypes.ts                 |   6 -
 src/enums/restorationTypes.ts                 |   6 -
 src/enums/roleTypes.ts                        |  10 -
 .../common/correct-name-option-interface.ts   |   8 +
 src/interfaces/index.ts                       |  13 +-
 .../name-request-interface.ts                 |   2 +-
 src/mixins/filing-template-mixin.ts           |   2 +-
 src/mixins/name-request-mixin.ts              |  14 +
 src/resources/BreadCrumbResource.ts           |   2 +-
 src/router/routes.ts                          |  10 +-
 src/store/getters/state-getters.ts            |  22 +-
 src/utils/feature-flag-utils.ts               |   2 +-
 .../IncorporationDefineCompany.vue            |   6 +-
 .../RestorationApplicantInformation.vue       |   6 +-
 .../RestorationBusinessInformation.vue        |   6 +-
 .../Restoration/RestorationBusinessName.vue   | 302 +++--------------
 tests/unit/App.spec.ts                        |   5 +-
 tests/unit/NameRequestInfo.spec.ts            | 285 +++++-----------
 tests/unit/NameTranslation.spec.ts            |  61 ++++
 .../RestorationApplicantInformation.spec.ts   |  56 +++-
 .../RestorationBusinessInformation.spec.ts    |  19 +-
 tests/unit/RestorationBusinessName.spec.ts    |  61 +++-
 tests/unit/RestorationReviewConfirm.spec.ts   |  84 ++++-
 44 files changed, 1847 insertions(+), 1024 deletions(-)
 create mode 100644 src/components/Restoration/BusinessName.vue
 create mode 100644 src/components/Restoration/CorrectCompanyName.vue
 create mode 100644 src/components/Restoration/CorrectNameOptions.vue
 create mode 100644 src/components/Restoration/CorrectNameRequest.vue
 create mode 100644 src/components/Restoration/CorrectNameToNumber.vue
 create mode 100644 src/components/common/NameTranslation.vue
 delete mode 100644 src/enums/filingNames.ts
 delete mode 100644 src/enums/filingTypes.ts
 create mode 100644 src/enums/name-change-options.ts
 delete mode 100644 src/enums/nameRequestStates.ts
 delete mode 100644 src/enums/nameRequestTypes.ts
 delete mode 100644 src/enums/restorationTypes.ts
 delete mode 100644 src/enums/roleTypes.ts
 create mode 100644 src/interfaces/common/correct-name-option-interface.ts
 create mode 100644 tests/unit/NameTranslation.spec.ts

diff --git a/package-lock.json b/package-lock.json
index f1913e2df..978eef2ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,33 +1,33 @@
 {
   "name": "business-create-ui",
-  "version": "4.5.16",
+  "version": "4.5.17",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "business-create-ui",
-      "version": "4.5.16",
+      "version": "4.5.17",
       "dependencies": {
         "@babel/compat-data": "^7.19.1",
-        "@bcrs-shared-components/breadcrumb": "2.1.6",
-        "@bcrs-shared-components/business-lookup": "1.1.8",
-        "@bcrs-shared-components/certify": "2.1.6",
-        "@bcrs-shared-components/completing-party": "2.1.6",
+        "@bcrs-shared-components/breadcrumb": "2.1.9",
+        "@bcrs-shared-components/business-lookup": "1.1.11",
+        "@bcrs-shared-components/certify": "2.1.9",
+        "@bcrs-shared-components/completing-party": "2.1.9",
         "@bcrs-shared-components/confirm-dialog": "1.2.1",
-        "@bcrs-shared-components/contact-info": "1.2.6",
+        "@bcrs-shared-components/contact-info": "1.2.9",
         "@bcrs-shared-components/corp-type-module": "1.0.9",
-        "@bcrs-shared-components/court-order-poa": "3.0.2",
-        "@bcrs-shared-components/date-picker": "1.2.6",
+        "@bcrs-shared-components/court-order-poa": "3.0.5",
+        "@bcrs-shared-components/date-picker": "1.2.9",
         "@bcrs-shared-components/document-delivery": "1.2.0",
-        "@bcrs-shared-components/effective-date-time": "1.1.6",
-        "@bcrs-shared-components/enums": "1.0.28",
+        "@bcrs-shared-components/effective-date-time": "1.1.9",
+        "@bcrs-shared-components/enums": "1.0.31",
         "@bcrs-shared-components/help-business-number": "1.1.1",
-        "@bcrs-shared-components/interfaces": "1.0.49",
+        "@bcrs-shared-components/interfaces": "1.0.52",
         "@bcrs-shared-components/limited-restoration-panel": "1.0.0",
-        "@bcrs-shared-components/nature-of-business": "1.2.3",
-        "@bcrs-shared-components/relationships-panel": "1.0.0",
-        "@bcrs-shared-components/staff-comments": "1.3.6",
-        "@bcrs-shared-components/staff-payment": "2.1.6",
+        "@bcrs-shared-components/nature-of-business": "1.2.8",
+        "@bcrs-shared-components/relationships-panel": "1.0.5",
+        "@bcrs-shared-components/staff-comments": "1.3.9",
+        "@bcrs-shared-components/staff-payment": "2.1.9",
         "@bcrs-shared-components/web-chat": "2.1.1",
         "@mdi/font": "^5.9.55",
         "@sentry/browser": "^5.30.0",
@@ -1814,39 +1814,39 @@
       }
     },
     "node_modules/@bcrs-shared-components/breadcrumb": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/breadcrumb/-/breadcrumb-2.1.6.tgz",
-      "integrity": "sha512-Vi+tDrV+/5cS7yShxDpMtR4ERmNqCWtASD2mlZPlF6yUxqlElKp5nV/PZFERFz+NpD0zcVLBimCLJy4GouH7cg==",
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/breadcrumb/-/breadcrumb-2.1.9.tgz",
+      "integrity": "sha512-NQjd/eYThXpyeq6+nfPxy3lBZNW+tJg4g5cps4PWMeI4Ii+4DCm4kTNymsoKlzSj4V0rGTumBw+o6Ht374IHUw==",
       "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "node_modules/@bcrs-shared-components/business-lookup": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/business-lookup/-/business-lookup-1.1.8.tgz",
-      "integrity": "sha512-8/Gw6BGc5JKIK/CvW62gTHmx5mobzry2nRKnt/6QqUy2l+7CfcoQLTjLORxTMfG9CbneHU3iTbgSD10/Pk3uYw==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/business-lookup/-/business-lookup-1.1.11.tgz",
+      "integrity": "sha512-3LOEM2qFC4frXoQUWPQhaO9C5L6OwOFBqIH+4LVHddAX2warzdK1bxeo7DE+ASnQsVLNzNNogt/356FKW/7Niw==",
       "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-debounce-decorator": "^1.0.1",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "node_modules/@bcrs-shared-components/certify": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/certify/-/certify-2.1.6.tgz",
-      "integrity": "sha512-Bd13HBT6Ir+yRKj6LIV8YYk6ml6RnGAKq0DtK2qBW8PTL6gUw1RmlPoFYXFAwv6Y7crECpzXmKloLhkjN7N4+Q==",
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/certify/-/certify-2.1.9.tgz",
+      "integrity": "sha512-QPqlvKRiZicpBhRI25d6u1VFIFrP2PMAVExHZ9IXQCuN7Mil7NRhugHCoJmovxUNbd5rnipZzQ7jfFaQkgC+Cw==",
       "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "node_modules/@bcrs-shared-components/completing-party": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/completing-party/-/completing-party-2.1.6.tgz",
-      "integrity": "sha512-PNcOXiSSvSsfXzFKMqUt4H4Wo0cIoYD7AMiuEtaxoUj2Vo6p95j+WvCzjuzYEXowcz7ZWvO56y1letN9HabZVQ==",
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/completing-party/-/completing-party-2.1.9.tgz",
+      "integrity": "sha512-suGJaf5uCwQk0BOWWDYakXIFYUNQAwVA87OZ/WLAcvAnIsnybYyCUeP4elatNLctijiwhuTiH4YoLpLgglkgMw==",
       "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "lodash": "4.17.21",
         "sbc-common-components": "3.0.1",
         "vue-property-decorator": "^9.1.2"
@@ -1903,11 +1903,11 @@
       }
     },
     "node_modules/@bcrs-shared-components/contact-info": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/contact-info/-/contact-info-1.2.6.tgz",
-      "integrity": "sha512-zY3QFwk1tx1zgQnY/xBuFpF3fBr+VGr5P7sQ8DUepoXBZjtCJ09NdzdVqb43dXH23J32rSjwjL1bWelzsrOlWg==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/contact-info/-/contact-info-1.2.9.tgz",
+      "integrity": "sha512-XYDj1b4AHFAb/xxTahOORCXfkhHy0OQwFhJz45mP6pAR6+/8OS0ygsEu8OpR6yd6M4VYanEvWJWNQg46Qa4S+w==",
       "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2",
         "vue-the-mask": "^0.11.1"
       }
@@ -1918,20 +1918,20 @@
       "integrity": "sha512-w52/6yvCW92oplOScHuP33gLSA7rsJ9ENyaZ6JKEK78rdrFdCrs1m4/Umr0DQWXUbwZQ43xn2jKXvYWDmIe1Mg=="
     },
     "node_modules/@bcrs-shared-components/court-order-poa": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/court-order-poa/-/court-order-poa-3.0.2.tgz",
-      "integrity": "sha512-DY+mwq90ok+yBHYlfeciUuZoFELoN2kRkVEHJRRtN/w7657mNtSdqKikAGECFIqCSO7whwDnoa9lRsv1iaDssg==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/court-order-poa/-/court-order-poa-3.0.5.tgz",
+      "integrity": "sha512-0ujMxsHtKgD6gFnlrMoEQOejgsGz+qRSvgQ4VKFoDCf9aCZjO5rDi3KroFKUveGqiGpwcyXUYKToqJ+u8e31dA==",
       "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "node_modules/@bcrs-shared-components/date-picker": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/date-picker/-/date-picker-1.2.6.tgz",
-      "integrity": "sha512-pStDvEcwPF0b23d16ExY7SdG1p2lNdSLenhgCHmtB+GinHX9aapBJEzx8539GM6o87pZWajxN+UeQVOSr3ITOQ==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/date-picker/-/date-picker-1.2.9.tgz",
+      "integrity": "sha512-U7aVdxedZLJUVTtz3CxMO1A9rLtTwlbxrT43fsHFdmZWsP4mTf8Zg6i/Ng3kts2EwaBbuqytzvnQzLeNsUjg2Q==",
       "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
@@ -1944,30 +1944,30 @@
       }
     },
     "node_modules/@bcrs-shared-components/effective-date-time": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/effective-date-time/-/effective-date-time-1.1.6.tgz",
-      "integrity": "sha512-EDYNxR8PfeGTqnEl0PrzMEtvgpNoyR7mDj8K6HD+AJVcJRxDrMAC31eaGmApGTgXmvPigOnB5GZr8Mc61JRpUw==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/effective-date-time/-/effective-date-time-1.1.9.tgz",
+      "integrity": "sha512-J1REzMTDVLTZFXJE+57/+lw4KSeyJOuwzOoOvC4i3ZT7bliZeoOK/YXOB/RDlpWt+nREZfWLlnEDdmggcNo9KQ==",
       "dependencies": {
-        "@bcrs-shared-components/date-picker": "^1.2.6",
-        "@bcrs-shared-components/enums": "^1.0.28",
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/date-picker": "^1.2.9",
+        "@bcrs-shared-components/enums": "^1.0.31",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "node_modules/@bcrs-shared-components/enums": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.28.tgz",
-      "integrity": "sha512-Gsgu44BAy5TJ/wsAr/7B86EqrTEPVcw5HsTi+HmD63w2vj0rYGE+t8Rg9/hjRYdBkTUBr0XL8SnfEeyoOy5Pzw==",
+      "version": "1.0.31",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.31.tgz",
+      "integrity": "sha512-xi2k5vdgtIvNzfrv6XMnIFmzuAyKzTKx6Zq+7dTgI9uNVxitmEt55ErFzpmIoIOxHcSm6WQebKyzW34srEf+tA==",
       "dependencies": {
         "@bcrs-shared-components/corp-type-module": "^1.0.9"
       }
     },
     "node_modules/@bcrs-shared-components/folio-number-input": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/folio-number-input/-/folio-number-input-1.1.6.tgz",
-      "integrity": "sha512-6MRi1/+ZebBWybiJD08/HqlcuHlOp1+7FCM9F466y0nLwxH77/keD/diKrvWqh/9t04VK+i7GDpvUkgi3d80Dg==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/folio-number-input/-/folio-number-input-1.1.9.tgz",
+      "integrity": "sha512-pARp6HgE1e6wanI+W4L6rxvMmjim7tjAxi3m+06uz2zwyWuqO1lXx0RbxBDLxPLVttbU2iN5QP7a7DkMvuc5Pg==",
       "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
@@ -1980,11 +1980,11 @@
       }
     },
     "node_modules/@bcrs-shared-components/interfaces": {
-      "version": "1.0.49",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.49.tgz",
-      "integrity": "sha512-gVtSWvkhVmDoR6nwPjZt2H2pHDDGXl9e30dn7HpZaYi0pfTF9aP29GZi6VSrNJAopxdZBP3g+Qt7r9tIl9MznA==",
+      "version": "1.0.52",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.52.tgz",
+      "integrity": "sha512-G9PDdzt6qPTtIVDnWPTp/gWOAxGWYBld9vS7ztS4MsLp+BgpzBP8Rc4FB01sO2nQGP0GUG+R/JNMp6jKPM/ATw==",
       "dependencies": {
-        "@bcrs-shared-components/enums": "^1.0.28",
+        "@bcrs-shared-components/enums": "^1.0.31",
         "vue": "^2.7.10"
       }
     },
@@ -1997,40 +1997,48 @@
       }
     },
     "node_modules/@bcrs-shared-components/nature-of-business": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/nature-of-business/-/nature-of-business-1.2.3.tgz",
-      "integrity": "sha512-BkVlF+l6tHg882guy7zeWOBQqRUIUMPHBGi1mwrtiK/9i6TtNHMCVLam+gxBXzd5WO9u7PMLbK05dCKJFZu3jQ==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/nature-of-business/-/nature-of-business-1.2.8.tgz",
+      "integrity": "sha512-Ptp5oqTN/iPgPILL7WVD/txmTrMqt8rm0tiXIuC4aqaGeKbCN3OLex5WBltUip4UelW3td6YSuZyW2sapJOe+w==",
       "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.0.47",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "node_modules/@bcrs-shared-components/relationships-panel": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/relationships-panel/-/relationships-panel-1.0.0.tgz",
-      "integrity": "sha512-Mk8O3zfnS6+/rRCQrEhubdC10CZvsqM5FF5Xcxc0qHKKw0G1ecmKOTw/IrQztpHTvtc+rIAbPp0DnOA1VUYWtA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/relationships-panel/-/relationships-panel-1.0.5.tgz",
+      "integrity": "sha512-KK7p8wu8GFwpmbzy34HjOFFUpvzS2qbpCPaKiP78LQSi+wd0Z8mI9amV0GPI94osRI5RkKD2xKTUkdz1TAHuSg==",
       "dependencies": {
-        "@bcrs-shared-components/enums": "^1.0.28",
+        "@bcrs-shared-components/enums": "^1.0.33",
         "vue-property-decorator": "^9.1.2"
       }
     },
+    "node_modules/@bcrs-shared-components/relationships-panel/node_modules/@bcrs-shared-components/enums": {
+      "version": "1.0.33",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.33.tgz",
+      "integrity": "sha512-SWiZI2GnpUDAreKAXoPv8km9n0VYln8Sa4KF82hhZ9zQ+5yZhwlPgF8qvgCqmz2Pd3pEt3F1szrAKr6yGKjJzA==",
+      "dependencies": {
+        "@bcrs-shared-components/corp-type-module": "^1.0.9"
+      }
+    },
     "node_modules/@bcrs-shared-components/staff-comments": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/staff-comments/-/staff-comments-1.3.6.tgz",
-      "integrity": "sha512-4tfpYtszdSblHSGdokctFO8tFQkx1Ln7a4eJZ1MvwWp/SYFXY+84olws7Gnroq2vqHs9wQpeeCQZEeforsJGHQ==",
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/staff-comments/-/staff-comments-1.3.9.tgz",
+      "integrity": "sha512-yYbar69aFVSfGrJ88vssSzatbHprvpO0N1U4QBXfE3MSVkXLEGEHk5ZqmhBiq1ttvl1QaOHY+wXlGyMBHzBBYw==",
       "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "node_modules/@bcrs-shared-components/staff-payment": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/staff-payment/-/staff-payment-2.1.6.tgz",
-      "integrity": "sha512-XzpLbZYV/7Swj+yKS2V51yO6TWWvGtd0psJMusaatKgF9hl9LI4r8Srth3gB78pzA76boi56bY9lszcJ0Irofg==",
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/staff-payment/-/staff-payment-2.1.9.tgz",
+      "integrity": "sha512-a0DP2NboIQ1OG8XYIpVsFBWW9JBx6i06p3pkf4gVT1/HFN7bC3D3m+ZhUQYM2vmrXeMNU39d1ol2sWevFJz45g==",
       "dependencies": {
-        "@bcrs-shared-components/enums": "^1.0.28",
-        "@bcrs-shared-components/folio-number-input": "^1.1.6",
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/enums": "^1.0.31",
+        "@bcrs-shared-components/folio-number-input": "^1.1.9",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
@@ -25509,39 +25517,39 @@
       }
     },
     "@bcrs-shared-components/breadcrumb": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/breadcrumb/-/breadcrumb-2.1.6.tgz",
-      "integrity": "sha512-Vi+tDrV+/5cS7yShxDpMtR4ERmNqCWtASD2mlZPlF6yUxqlElKp5nV/PZFERFz+NpD0zcVLBimCLJy4GouH7cg==",
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/breadcrumb/-/breadcrumb-2.1.9.tgz",
+      "integrity": "sha512-NQjd/eYThXpyeq6+nfPxy3lBZNW+tJg4g5cps4PWMeI4Ii+4DCm4kTNymsoKlzSj4V0rGTumBw+o6Ht374IHUw==",
       "requires": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "@bcrs-shared-components/business-lookup": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/business-lookup/-/business-lookup-1.1.8.tgz",
-      "integrity": "sha512-8/Gw6BGc5JKIK/CvW62gTHmx5mobzry2nRKnt/6QqUy2l+7CfcoQLTjLORxTMfG9CbneHU3iTbgSD10/Pk3uYw==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/business-lookup/-/business-lookup-1.1.11.tgz",
+      "integrity": "sha512-3LOEM2qFC4frXoQUWPQhaO9C5L6OwOFBqIH+4LVHddAX2warzdK1bxeo7DE+ASnQsVLNzNNogt/356FKW/7Niw==",
       "requires": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-debounce-decorator": "^1.0.1",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "@bcrs-shared-components/certify": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/certify/-/certify-2.1.6.tgz",
-      "integrity": "sha512-Bd13HBT6Ir+yRKj6LIV8YYk6ml6RnGAKq0DtK2qBW8PTL6gUw1RmlPoFYXFAwv6Y7crECpzXmKloLhkjN7N4+Q==",
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/certify/-/certify-2.1.9.tgz",
+      "integrity": "sha512-QPqlvKRiZicpBhRI25d6u1VFIFrP2PMAVExHZ9IXQCuN7Mil7NRhugHCoJmovxUNbd5rnipZzQ7jfFaQkgC+Cw==",
       "requires": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "@bcrs-shared-components/completing-party": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/completing-party/-/completing-party-2.1.6.tgz",
-      "integrity": "sha512-PNcOXiSSvSsfXzFKMqUt4H4Wo0cIoYD7AMiuEtaxoUj2Vo6p95j+WvCzjuzYEXowcz7ZWvO56y1letN9HabZVQ==",
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/completing-party/-/completing-party-2.1.9.tgz",
+      "integrity": "sha512-suGJaf5uCwQk0BOWWDYakXIFYUNQAwVA87OZ/WLAcvAnIsnybYyCUeP4elatNLctijiwhuTiH4YoLpLgglkgMw==",
       "requires": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "lodash": "4.17.21",
         "sbc-common-components": "3.0.1",
         "vue-property-decorator": "^9.1.2"
@@ -25600,11 +25608,11 @@
       }
     },
     "@bcrs-shared-components/contact-info": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/contact-info/-/contact-info-1.2.6.tgz",
-      "integrity": "sha512-zY3QFwk1tx1zgQnY/xBuFpF3fBr+VGr5P7sQ8DUepoXBZjtCJ09NdzdVqb43dXH23J32rSjwjL1bWelzsrOlWg==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/contact-info/-/contact-info-1.2.9.tgz",
+      "integrity": "sha512-XYDj1b4AHFAb/xxTahOORCXfkhHy0OQwFhJz45mP6pAR6+/8OS0ygsEu8OpR6yd6M4VYanEvWJWNQg46Qa4S+w==",
       "requires": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2",
         "vue-the-mask": "^0.11.1"
       }
@@ -25615,20 +25623,20 @@
       "integrity": "sha512-w52/6yvCW92oplOScHuP33gLSA7rsJ9ENyaZ6JKEK78rdrFdCrs1m4/Umr0DQWXUbwZQ43xn2jKXvYWDmIe1Mg=="
     },
     "@bcrs-shared-components/court-order-poa": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/court-order-poa/-/court-order-poa-3.0.2.tgz",
-      "integrity": "sha512-DY+mwq90ok+yBHYlfeciUuZoFELoN2kRkVEHJRRtN/w7657mNtSdqKikAGECFIqCSO7whwDnoa9lRsv1iaDssg==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/court-order-poa/-/court-order-poa-3.0.5.tgz",
+      "integrity": "sha512-0ujMxsHtKgD6gFnlrMoEQOejgsGz+qRSvgQ4VKFoDCf9aCZjO5rDi3KroFKUveGqiGpwcyXUYKToqJ+u8e31dA==",
       "requires": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "@bcrs-shared-components/date-picker": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/date-picker/-/date-picker-1.2.6.tgz",
-      "integrity": "sha512-pStDvEcwPF0b23d16ExY7SdG1p2lNdSLenhgCHmtB+GinHX9aapBJEzx8539GM6o87pZWajxN+UeQVOSr3ITOQ==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/date-picker/-/date-picker-1.2.9.tgz",
+      "integrity": "sha512-U7aVdxedZLJUVTtz3CxMO1A9rLtTwlbxrT43fsHFdmZWsP4mTf8Zg6i/Ng3kts2EwaBbuqytzvnQzLeNsUjg2Q==",
       "requires": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
@@ -25641,30 +25649,30 @@
       }
     },
     "@bcrs-shared-components/effective-date-time": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/effective-date-time/-/effective-date-time-1.1.6.tgz",
-      "integrity": "sha512-EDYNxR8PfeGTqnEl0PrzMEtvgpNoyR7mDj8K6HD+AJVcJRxDrMAC31eaGmApGTgXmvPigOnB5GZr8Mc61JRpUw==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/effective-date-time/-/effective-date-time-1.1.9.tgz",
+      "integrity": "sha512-J1REzMTDVLTZFXJE+57/+lw4KSeyJOuwzOoOvC4i3ZT7bliZeoOK/YXOB/RDlpWt+nREZfWLlnEDdmggcNo9KQ==",
       "requires": {
-        "@bcrs-shared-components/date-picker": "^1.2.6",
-        "@bcrs-shared-components/enums": "^1.0.28",
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/date-picker": "^1.2.9",
+        "@bcrs-shared-components/enums": "^1.0.31",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "@bcrs-shared-components/enums": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.28.tgz",
-      "integrity": "sha512-Gsgu44BAy5TJ/wsAr/7B86EqrTEPVcw5HsTi+HmD63w2vj0rYGE+t8Rg9/hjRYdBkTUBr0XL8SnfEeyoOy5Pzw==",
+      "version": "1.0.31",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.31.tgz",
+      "integrity": "sha512-xi2k5vdgtIvNzfrv6XMnIFmzuAyKzTKx6Zq+7dTgI9uNVxitmEt55ErFzpmIoIOxHcSm6WQebKyzW34srEf+tA==",
       "requires": {
         "@bcrs-shared-components/corp-type-module": "^1.0.9"
       }
     },
     "@bcrs-shared-components/folio-number-input": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/folio-number-input/-/folio-number-input-1.1.6.tgz",
-      "integrity": "sha512-6MRi1/+ZebBWybiJD08/HqlcuHlOp1+7FCM9F466y0nLwxH77/keD/diKrvWqh/9t04VK+i7GDpvUkgi3d80Dg==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/folio-number-input/-/folio-number-input-1.1.9.tgz",
+      "integrity": "sha512-pARp6HgE1e6wanI+W4L6rxvMmjim7tjAxi3m+06uz2zwyWuqO1lXx0RbxBDLxPLVttbU2iN5QP7a7DkMvuc5Pg==",
       "requires": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
@@ -25677,11 +25685,11 @@
       }
     },
     "@bcrs-shared-components/interfaces": {
-      "version": "1.0.49",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.49.tgz",
-      "integrity": "sha512-gVtSWvkhVmDoR6nwPjZt2H2pHDDGXl9e30dn7HpZaYi0pfTF9aP29GZi6VSrNJAopxdZBP3g+Qt7r9tIl9MznA==",
+      "version": "1.0.52",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.52.tgz",
+      "integrity": "sha512-G9PDdzt6qPTtIVDnWPTp/gWOAxGWYBld9vS7ztS4MsLp+BgpzBP8Rc4FB01sO2nQGP0GUG+R/JNMp6jKPM/ATw==",
       "requires": {
-        "@bcrs-shared-components/enums": "^1.0.28",
+        "@bcrs-shared-components/enums": "^1.0.31",
         "vue": "^2.7.10"
       }
     },
@@ -25694,40 +25702,50 @@
       }
     },
     "@bcrs-shared-components/nature-of-business": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/nature-of-business/-/nature-of-business-1.2.3.tgz",
-      "integrity": "sha512-BkVlF+l6tHg882guy7zeWOBQqRUIUMPHBGi1mwrtiK/9i6TtNHMCVLam+gxBXzd5WO9u7PMLbK05dCKJFZu3jQ==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/nature-of-business/-/nature-of-business-1.2.8.tgz",
+      "integrity": "sha512-Ptp5oqTN/iPgPILL7WVD/txmTrMqt8rm0tiXIuC4aqaGeKbCN3OLex5WBltUip4UelW3td6YSuZyW2sapJOe+w==",
       "requires": {
-        "@bcrs-shared-components/interfaces": "^1.0.47",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "@bcrs-shared-components/relationships-panel": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/relationships-panel/-/relationships-panel-1.0.0.tgz",
-      "integrity": "sha512-Mk8O3zfnS6+/rRCQrEhubdC10CZvsqM5FF5Xcxc0qHKKw0G1ecmKOTw/IrQztpHTvtc+rIAbPp0DnOA1VUYWtA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/relationships-panel/-/relationships-panel-1.0.5.tgz",
+      "integrity": "sha512-KK7p8wu8GFwpmbzy34HjOFFUpvzS2qbpCPaKiP78LQSi+wd0Z8mI9amV0GPI94osRI5RkKD2xKTUkdz1TAHuSg==",
       "requires": {
-        "@bcrs-shared-components/enums": "^1.0.28",
+        "@bcrs-shared-components/enums": "^1.0.33",
         "vue-property-decorator": "^9.1.2"
+      },
+      "dependencies": {
+        "@bcrs-shared-components/enums": {
+          "version": "1.0.33",
+          "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.33.tgz",
+          "integrity": "sha512-SWiZI2GnpUDAreKAXoPv8km9n0VYln8Sa4KF82hhZ9zQ+5yZhwlPgF8qvgCqmz2Pd3pEt3F1szrAKr6yGKjJzA==",
+          "requires": {
+            "@bcrs-shared-components/corp-type-module": "^1.0.9"
+          }
+        }
       }
     },
     "@bcrs-shared-components/staff-comments": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/staff-comments/-/staff-comments-1.3.6.tgz",
-      "integrity": "sha512-4tfpYtszdSblHSGdokctFO8tFQkx1Ln7a4eJZ1MvwWp/SYFXY+84olws7Gnroq2vqHs9wQpeeCQZEeforsJGHQ==",
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/staff-comments/-/staff-comments-1.3.9.tgz",
+      "integrity": "sha512-yYbar69aFVSfGrJ88vssSzatbHprvpO0N1U4QBXfE3MSVkXLEGEHk5ZqmhBiq1ttvl1QaOHY+wXlGyMBHzBBYw==",
       "requires": {
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "@bcrs-shared-components/staff-payment": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/staff-payment/-/staff-payment-2.1.6.tgz",
-      "integrity": "sha512-XzpLbZYV/7Swj+yKS2V51yO6TWWvGtd0psJMusaatKgF9hl9LI4r8Srth3gB78pzA76boi56bY9lszcJ0Irofg==",
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/staff-payment/-/staff-payment-2.1.9.tgz",
+      "integrity": "sha512-a0DP2NboIQ1OG8XYIpVsFBWW9JBx6i06p3pkf4gVT1/HFN7bC3D3m+ZhUQYM2vmrXeMNU39d1ol2sWevFJz45g==",
       "requires": {
-        "@bcrs-shared-components/enums": "^1.0.28",
-        "@bcrs-shared-components/folio-number-input": "^1.1.6",
-        "@bcrs-shared-components/interfaces": "^1.0.49",
+        "@bcrs-shared-components/enums": "^1.0.31",
+        "@bcrs-shared-components/folio-number-input": "^1.1.9",
+        "@bcrs-shared-components/interfaces": "^1.0.52",
         "vue-property-decorator": "^9.1.2"
       }
     },
diff --git a/package.json b/package.json
index 6421231fc..f8008045a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "4.5.16",
+  "version": "4.5.17",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",
@@ -13,26 +13,26 @@
   },
   "dependencies": {
     "@babel/compat-data": "^7.19.1",
-    "@bcrs-shared-components/breadcrumb": "2.1.6",
-    "@bcrs-shared-components/business-lookup": "1.1.8",
-    "@bcrs-shared-components/certify": "2.1.6",
-    "@bcrs-shared-components/completing-party": "2.1.6",
+    "@bcrs-shared-components/breadcrumb": "2.1.9",
+    "@bcrs-shared-components/business-lookup": "1.1.11",
+    "@bcrs-shared-components/certify": "2.1.9",
+    "@bcrs-shared-components/completing-party": "2.1.9",
     "@bcrs-shared-components/confirm-dialog": "1.2.1",
-    "@bcrs-shared-components/contact-info": "1.2.6",
+    "@bcrs-shared-components/contact-info": "1.2.9",
     "@bcrs-shared-components/corp-type-module": "1.0.9",
-    "@bcrs-shared-components/court-order-poa": "3.0.2",
-    "@bcrs-shared-components/date-picker": "1.2.6",
+    "@bcrs-shared-components/court-order-poa": "3.0.5",
+    "@bcrs-shared-components/date-picker": "1.2.9",
     "@bcrs-shared-components/document-delivery": "1.2.0",
-    "@bcrs-shared-components/effective-date-time": "1.1.6",
-    "@bcrs-shared-components/enums": "1.0.28",
+    "@bcrs-shared-components/effective-date-time": "1.1.9",
+    "@bcrs-shared-components/enums": "1.0.31",
     "@bcrs-shared-components/help-business-number": "1.1.1",
-    "@bcrs-shared-components/interfaces": "1.0.49",
-    "@bcrs-shared-components/nature-of-business": "1.2.3",
-    "@bcrs-shared-components/staff-comments": "1.3.6",
-    "@bcrs-shared-components/staff-payment": "2.1.6",
-    "@bcrs-shared-components/web-chat": "2.1.1",
-    "@bcrs-shared-components/relationships-panel": "1.0.0",
+    "@bcrs-shared-components/interfaces": "1.0.52",
     "@bcrs-shared-components/limited-restoration-panel": "1.0.0",
+    "@bcrs-shared-components/nature-of-business": "1.2.8",
+    "@bcrs-shared-components/relationships-panel": "1.0.5",
+    "@bcrs-shared-components/staff-comments": "1.3.9",
+    "@bcrs-shared-components/staff-payment": "2.1.9",
+    "@bcrs-shared-components/web-chat": "2.1.1",
     "@mdi/font": "^5.9.55",
     "@sentry/browser": "^5.30.0",
     "@sentry/integrations": "^5.30.0",
diff --git a/src/App.vue b/src/App.vue
index da216e9c2..e3bbddd4a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -115,8 +115,9 @@
               <header>
                 <h1>{{ getFilingName }}</h1>
               </header>
-              <p class="mt-4" v-if="getFilingSubtitle">
-                {{ getFilingSubtitle }}
+              <p class="mt-4" v-if="isFirmDissolution">
+                Confirm the following information, select the dissolution date and certify
+                your dissolution before filing.
               </p>
 
               <Stepper class="mt-10" v-if="isStepperView" />
@@ -144,7 +145,7 @@
                   <SbcFeeSummary
                     :filingData="feeFilingData"
                     :payURL="payApiUrl"
-                    :filingLabel="filingLabelText"
+                    :filingLabel="filingLabel"
                   />
                 </affix>
               </aside>
@@ -242,7 +243,6 @@ export default class App extends Vue {
   @Getter isIncorporationFiling!: boolean
   @Getter getSteps!: Array<StepIF>
   @Getter isSbcStaff!: boolean
-  @Getter getFilingSubtitle!: string
   @Getter getUserFirstName!: string
   @Getter getUserLastName!: string
   @Getter getUserPhone!: string
@@ -391,10 +391,15 @@ export default class App extends Vue {
     )
   }
 
-  /** The Fee Summary filing text for businesses. */
-  get filingLabelText (): string {
+  /** Whether the current filing is a firm dissolution. */
+  get isFirmDissolution (): boolean {
+    return (this.isTypeFirm && this.isDissolutionFiling)
+  }
+
+  /** The fee summary filing label. */
+  get filingLabel (): string {
     // text override for firm dissolutions
-    return (this.isTypeFirm && this.isDissolutionFiling) ? 'Dissolution' : null
+    return this.isFirmDissolution ? 'Dissolution' : null
   }
 
   /** The About text. */
@@ -408,11 +413,11 @@ export default class App extends Vue {
       case FilingTypes.INCORPORATION_APPLICATION: return 'Application'
       case FilingTypes.REGISTRATION: return 'Registration'
       case FilingTypes.RESTORATION: return 'Restoration'
-      case FilingTypes.VOLUNTARY_DISSOLUTION: return 'Filing'
+      case FilingTypes.DISSOLUTION: return 'Filing'
     }
   }
 
-  // check to use stepper view or not
+  /** Whether to use stepper view. */
   get isStepperView (): boolean {
     return !this.$route.meta.noStepper
   }
@@ -671,7 +676,7 @@ export default class App extends Vue {
       // then try to re-route them
       if (this.$route.meta.filingType !== this.getFilingType) {
         switch (this.getFilingType) {
-          case FilingTypes.VOLUNTARY_DISSOLUTION:
+          case FilingTypes.DISSOLUTION:
             if (this.isTypeFirm) {
               this.$router.push(RouteNames.DISSOLUTION_FIRM).catch(() => {})
             } else {
@@ -689,7 +694,7 @@ export default class App extends Vue {
             return
           default:
             this.invalidRouteDialog = true
-            throw new Error(`Invalid filing type = ${this.getFilingType}`) // go to catch()
+            throw new Error(`fetchData(): invalid filing type = ${this.getFilingType}`) // go to catch()
         }
       }
 
@@ -755,7 +760,7 @@ export default class App extends Vue {
     // parse draft filing into the store and get the resources
     let resources: ResourceIF
     switch (this.getFilingType) {
-      case FilingTypes.VOLUNTARY_DISSOLUTION:
+      case FilingTypes.DISSOLUTION:
         draftFiling = {
           ...this.buildDissolutionFiling(),
           ...draftFiling
@@ -772,7 +777,7 @@ export default class App extends Vue {
         resources = RestorationResources.find(x => x.entityType === this.getEntityType)
         break
       default:
-        throw new Error(`Invalid filing type = ${this.getFilingType}`)
+        throw new Error(`handleDissolutionOrRestoration(): invalid filing type = ${this.getFilingType}`)
     }
 
     // set the resources
@@ -819,7 +824,7 @@ export default class App extends Vue {
         resources = RegistrationResources.find(x => x.entityType === this.getEntityType)
         break
       default:
-        throw new Error(`Invalid filing type = ${this.getFilingType}`)
+        throw new Error(`handleIaOrRegistration(): invalid filing type = ${this.getFilingType}`)
     }
 
     // set the resources
diff --git a/src/components/Dissolution/CareAndCustodySelect.vue b/src/components/Dissolution/CareAndCustodySelect.vue
index d6fb0bddc..db73cdcb6 100644
--- a/src/components/Dissolution/CareAndCustodySelect.vue
+++ b/src/components/Dissolution/CareAndCustodySelect.vue
@@ -45,12 +45,14 @@ import { RoleTypes } from '@/enums'
 export default class CareAndCustodySelect extends Vue {
   @Prop({ default: false }) readonly showErrorSummary!: boolean
 
+  // for template
   readonly RoleTypes = RoleTypes
 
+  // local variable
   protected liquidatorOrCustodian = null as RoleTypes
 
   protected changeCareAndCustodyType (): void {
-    // Todo: Apply option to store when required
+    // FUTURE: save `liquidatorOrCustodian` to store when required
   }
 }
 </script>
diff --git a/src/components/Incorporation/UploadMemorandum.vue b/src/components/Incorporation/UploadMemorandum.vue
index 6885f3ab9..9eaa7706e 100644
--- a/src/components/Incorporation/UploadMemorandum.vue
+++ b/src/components/Incorporation/UploadMemorandum.vue
@@ -414,10 +414,8 @@ export default class UploadMemorandum extends Vue {
 <style lang="scss" scoped>
 @import '@/assets/styles/theme.scss';
 
-header {
-  p {
-    padding-top: 0.5rem;
-  }
+header p {
+  padding-top: 0.5rem;
 }
 
 ul {
diff --git a/src/components/Incorporation/UploadRules.vue b/src/components/Incorporation/UploadRules.vue
index 7afb02ca4..39ff6d4ed 100644
--- a/src/components/Incorporation/UploadRules.vue
+++ b/src/components/Incorporation/UploadRules.vue
@@ -372,10 +372,8 @@ export default class UploadRules extends Vue {
 <style lang="scss" scoped>
 @import '@/assets/styles/theme.scss';
 
-header {
-  p {
-    padding-top: 0.5rem;
-  }
+header p {
+  padding-top: 0.5rem;
 }
 
 ul {
diff --git a/src/components/Restoration/BusinessName.vue b/src/components/Restoration/BusinessName.vue
new file mode 100644
index 000000000..901947b61
--- /dev/null
+++ b/src/components/Restoration/BusinessName.vue
@@ -0,0 +1,317 @@
+<template>
+  <div id="business-name">
+    <div class="section-container" :class="{'invalid-section': invalidSection}">
+      <!-- Business Name -->
+      <v-row no-gutters>
+        <v-col cols="12" sm="3" class="pr-4">
+          <label :class="{'error-text': invalidSection}">
+            <strong>Business Name</strong>
+          </label>
+        </v-col>
+
+        <!-- Editing Mode -->
+        <template v-if="isEditingNames">
+          <v-col cols="12" sm="9" class="pt-4 pt-sm-0">
+            <CorrectNameOptions
+              :correctionNameChoices="nameChangeOptions"
+              @isSaved="onNameChange($event)"
+              @cancel="isEditingNames = false"
+            />
+          </v-col>
+        </template>
+
+        <!-- Display Mode -->
+        <template v-else>
+          <v-col cols="12" sm="7" class="mt-n1 pt-4 pt-sm-0">
+            <div class="company-name font-weight-bold text-uppercase">{{ companyName }}</div>
+
+            <!-- Name Request Info -->
+            <template v-if="hasNewNr">
+              <div class="company-name mt-2">{{getNameRequest.nrNum || 'Unknown'}}</div>
+              <div class="company-info mt-4">
+                <span class="subtitle">Business Type: </span>
+                <span :class="{ 'has-conflict': isConflictingLegalType}"
+                      class="info-text">{{GetCorpFullDescription(getNameRequest.legalType)}}
+                </span>
+                <v-tooltip
+                  v-if="isConflictingLegalType"
+                  top
+                  content-class="top-tooltip"
+                  transition="fade-transition"
+                  nudge-right="3"
+                >
+                  <template v-slot:activator="{ on }">
+                    <v-icon v-on="on" color="error" small>
+                      mdi-alert
+                    </v-icon>
+                  </template>
+                  <span>Business Types do not match. The Name Request type must match the business type before
+                    you can continue.</span>
+                </v-tooltip>
+              </div>
+              <div class="company-info">
+                <span class="subtitle">Request Type: </span>
+                <span class="info-text">{{getNrRequestDesc(getNameRequest.requestType)}}</span>
+              </div>
+              <div class="company-info">
+                <span class="subtitle">Expiry Date: </span>
+                <span class="info-text">{{expiryDate || 'Unknown'}}</span>
+              </div>
+              <div class="company-info">
+                <span class="subtitle">Status: </span>
+                <span class="info-text text-capitalize">{{nrStatus}}</span>
+              </div>
+            </template>
+          </v-col>
+
+          <!-- Actions -->
+          <v-col cols="2" class="my-n1">
+            <div class="actions mr-4">
+              <v-btn v-if="hasCompanyNameChanged" text color="primary" id="btn-undo" @click="resetName()">
+                <v-icon small>mdi-undo</v-icon>
+                <span>Undo</span>
+              </v-btn>
+            </div>
+          </v-col>
+        </template>
+      </v-row>
+
+      <!-- Name Request Applicant -->
+      <v-row v-if="hasNewNr" no-gutters class="sub-section">
+        <v-col cols="12" sm="3" class="pr-4">
+          <label class="pr-4">
+            <strong>Name Request Applicant</strong>
+          </label>
+        </v-col>
+
+        <v-col cols="12" sm="9" class="pt-4 pt-sm-0">
+          <div class="name-request-applicant-info">
+            <span class="subtitle">Name: </span>
+            <span class="info-text">{{nrApplicant.fullName}}</span>
+          </div>
+          <div class="name-request-applicant-info">
+            <span class="subtitle">Address: </span>
+            <span class="info-text">{{nrApplicant.fullAddress}}</span>
+          </div>
+          <div class="name-request-applicant-info">
+            <span class="subtitle">Email: </span>
+            <span class="info-text">{{nrApplicant.emailAddress || 'N/A'}}</span>
+          </div>
+          <div class="name-request-applicant-info">
+            <span class="subtitle">Phone: </span>
+            <span class="info-text">{{phoneNumber || 'N/A'}}</span>
+          </div>
+        </v-col>
+      </v-row>
+    </div>
+
+    <!-- Name Translation -->
+    <NameTranslation @hasNameTranslation="emitHasNameTranslation($event)" />
+  </div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+import { Component, Emit, Prop, Watch } from 'vue-property-decorator'
+import { Action, Getter } from 'vuex-class'
+import { ActionBindingIF, EntitySnapshotIF, FlagsCompanyInfoIF, NameRequestApplicantIF, NameRequestIF }
+  from '@/interfaces/'
+import { ContactPointIF } from '@bcrs-shared-components/interfaces/'
+import { CommonMixin, DateMixin, NameRequestMixin } from '@/mixins/'
+import { CoopTypes, NameChangeOptions } from '@/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import CorrectNameOptions from '@/components/Restoration/CorrectNameOptions.vue'
+import NameTranslation from '@/components/common/NameTranslation.vue'
+
+@Component({
+  components: {
+    CorrectNameOptions,
+    NameTranslation
+  },
+  mixins: [
+    CommonMixin,
+    DateMixin,
+    NameRequestMixin
+  ]
+})
+export default class BusinessName extends Vue {
+  // for template
+  readonly GetCorpFullDescription = GetCorpFullDescription
+
+  @Prop({ default: false }) getComponentValidate!: boolean
+
+  // Global getters
+  @Getter getNameRequest!: NameRequestIF
+  @Getter getBusinessNumber!: string
+  @Getter getNameRequest!: NameRequestIF
+  @Getter getEntityType!: CorpTypeCd
+
+  // Global actions
+  // @Action setEditingCompanyName!: ActionBindingIF
+  // @Action setValidComponent!: ActionBindingIF
+
+  // *** TODO
+  private setEditingCompanyName (): void {}
+  private setValidComponent (): void {}
+
+  protected dropdown: boolean = null
+  protected hasCompanyNameChanged = false
+  protected correctNameChoices: Array<string> = []
+  protected isEditingNames = false
+  protected isEditingType = false
+  protected isEditingTranslations = false
+
+  /** The current NR number. */
+  get nrNum (): string {
+    return this.getNameRequest.nrNum
+  }
+
+  /** True if a new NR number has been entered. */
+  get hasNewNr (): boolean {
+    return !!this.getNameRequest.nrNum
+  }
+
+  /** True if entity type is different from NR legal type. */
+  get isConflictingLegalType (): boolean {
+    return (this.getEntityType !== this.getNameRequest.legalType)
+  }
+
+  /** The section validity state (when prompted by app). */
+  get invalidSection (): boolean {
+    return (this.getComponentValidate && this.isEditingNames)
+  }
+
+  /** The translation section validity state (when prompted by app). */
+  get invalidTranslationSection (): boolean {
+    return (this.getComponentValidate && this.isEditingTranslations)
+  }
+
+  /** The company name (from NR, or incorporation number). */
+  get companyName (): string {
+    if (this.nameRequestLegalName) return this.nameRequestLegalName
+
+    return `${this.getBusinessNumber || '[Incorporation Number]'} B.C. Ltd.`
+  }
+
+  /** Name Request applicant info */
+  get nrApplicant (): NameRequestApplicantIF {
+    return this.getNameRequest.applicants // not an array
+  }
+
+  /** Name Request status */
+  get nrStatus (): string {
+    return (this.getNameRequest.status || '').toLowerCase()
+  }
+
+  /** Name Request expiry */
+  get expiryDate (): string {
+    const expiry = this.getNameRequest.expiry
+    if (expiry) {
+      return this.apiToPacificDateTime(expiry)
+    }
+    return null
+  }
+
+  /** The Name Request Legal Name (approved name). */
+  // *** TODO: reconcile this with getNameRequestApprovedName()
+  get nameRequestLegalName (): string {
+    return this.getNrApprovedName(this.getNameRequest)
+  }
+
+  /** Name Request phone number */
+  get phoneNumber (): string {
+    return this.toDisplayPhone(this.nrApplicant.phoneNumber)
+  }
+
+  /** The current options for change of name correction or edit. */
+  get nameChangeOptions (): Array<NameChangeOptions> {
+    return [
+      NameChangeOptions.CORRECT_NAME_TO_NUMBER,
+      NameChangeOptions.CORRECT_NEW_NR
+    ]
+  }
+
+  /** Whether a new business legal name was entered.. */
+  // *** TODO: combine this with isNewName ?
+  get isNewName () {
+    const originalName = this.nameRequestLegalName
+    const currentName = this.getEntitySnapshot?.businessInfo.legalName
+    return (originalName !== currentName)
+  }
+
+  /** Reset company name values to original. */
+  protected resetName () {
+    // *** TODO: implement
+    // // reset business information, except for association type.
+    // const businessInfo = { ...this.getEntitySnapshot.businessInfo, associationType: this.getAssociationType }
+    // this.setBusinessInformation(businessInfo)
+
+    // // reset name request
+    // this.setNameRequest({
+    //   legalType: this.getEntitySnapshot.businessInfo.legalType,
+    //   legalName: this.getEntitySnapshot.businessInfo.legalName,
+    //   nrNumber: this.getEntitySnapshot.businessInfo.nrNumber
+    // })
+
+    // reset flag
+    this.hasCompanyNameChanged = false
+  }
+
+  /**
+   * Updates UI when Name Request is updated (ie, on resume draft)
+   * or when correct name options are done.
+   */
+  @Watch('getNameRequest')
+  private onNameChange (isSaved = false): void {
+    this.hasCompanyNameChanged = this.isNewName
+    if (isSaved) this.isEditingNames = false
+  }
+
+  /** Updates store initially and when isEditingName property has changed. */
+  @Watch('isEditingNames', { immediate: true })
+  private onEditingNameChanged (val: boolean): void {
+    this.setValidComponent({ key: 'isValidCompanyName', value: !val })
+    this.setEditingCompanyName(val)
+  }
+
+  /** Updates store initially and when isEditingType property has changed. */
+  @Watch('isEditingType', { immediate: true })
+  private onEditingTypeChanged (val: boolean): void {
+    this.setValidComponent({ key: 'isValidBusinessType', value: !val })
+  }
+
+  /** Updates store initially and when isEditingTranslations property has changed. */
+  @Watch('isEditingTranslations', { immediate: true })
+  private onEditingTranslationChanged (val: boolean): void {
+    this.setValidComponent({ key: 'isValidNameTranslation', value: !val })
+  }
+
+  @Emit('hasNameTranslation')
+  protected emitHasNameTranslation (val: boolean): void {}
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+.company-name {
+  font-size: $px-24;
+}
+
+.company-info {
+  padding-top: 0.5rem;
+}
+
+.name-request-applicant-info:not(:first-child) {
+  padding-top: 0.5rem
+}
+
+.actions {
+  position: absolute;
+  right: 0;
+
+  .v-btn {
+    min-width: 0.5rem;
+  }
+}
+</style>
diff --git a/src/components/Restoration/CorrectCompanyName.vue b/src/components/Restoration/CorrectCompanyName.vue
new file mode 100644
index 000000000..b665a4747
--- /dev/null
+++ b/src/components/Restoration/CorrectCompanyName.vue
@@ -0,0 +1,85 @@
+<template>
+  <v-form id="correct-name-form" ref="correctNameForm" v-model="valid" lazy-validation>
+    <v-row no-gutters>
+      <v-col>
+        <v-text-field
+          v-model="companyName"
+          id="company-name-input"
+          class="mb-n3"
+          filled
+          :rules="companyNameRules"
+        />
+      </v-col>
+    </v-row>
+  </v-form>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+import { Component, Prop, Watch, Emit } from 'vue-property-decorator'
+import { Action, Getter } from 'vuex-class'
+import { CommonMixin } from '@/mixins/'
+import { ActionBindingIF, NameRequestIF } from '@/interfaces/'
+import { NameChangeOptions } from '@/enums/'
+
+@Component({
+  mixins: [
+    CommonMixin
+  ]
+})
+export default class CorrectCompanyName extends Vue {
+  /** Form Submission Prop */
+  @Prop({ default: null }) readonly formType!: NameChangeOptions
+
+  @Action setNameRequest!: ActionBindingIF
+
+  @Getter getNameRequestLegalName!: string
+  @Getter getNameRequest!: NameRequestIF
+
+  // Local properties
+  protected valid = false
+  protected companyName = ''
+
+  // Form Ref
+  $refs: { correctNameForm: HTMLFormElement }
+
+  // Rules
+  readonly companyNameRules = [
+    (v: string) => !!v || ' A company name is required'
+  ]
+
+  /** Called when component is mounted. */
+  mounted (): void {
+    // Set the current company name to the form
+    if (this.getNameRequestLegalName) {
+      this.companyName = this.getNameRequestLegalName
+    }
+  }
+
+  /** Watch for form submission and emit results. */
+  @Watch('formType')
+  private onSubmit (): void {
+    // this component should only see correct-name form type
+    if (this.formType === NameChangeOptions.CORRECT_NAME) {
+      // set the new company name
+      this.setNameRequest({
+        ...this.getNameRequest,
+        legalName: this.companyName
+      })
+      this.emitIsSaved(true)
+    }
+  }
+
+  /** Inform parent the process is complete. */
+  @Emit('isSaved')
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  private emitIsSaved (isSaved: boolean): void {}
+
+  /** Inform parent when form is valid and ready for submission. */
+  @Watch('valid')
+  @Emit('isValid')
+  private emitValid (): boolean {
+    return this.valid
+  }
+}
+</script>
diff --git a/src/components/Restoration/CorrectNameOptions.vue b/src/components/Restoration/CorrectNameOptions.vue
new file mode 100644
index 000000000..bd3ad1b54
--- /dev/null
+++ b/src/components/Restoration/CorrectNameOptions.vue
@@ -0,0 +1,226 @@
+<template>
+  <v-container id="name-options-container" class="pa-0 pr-4">
+    <p class="info-text mb-5 pb-5 bottom-border" v-if="!isOneOption">
+      You can correct the company name in one of the following ways:
+    </p>
+    <v-expansion-panels v-model="panel" class="bottom-border" accordion>
+      <v-expansion-panel
+        v-for="(item,i) in displayedOptions"
+        class="mb-4"
+        :id="`x-panel-${item.id}`"
+        :key="i"
+        :disabled="isOneOption"
+        @click="identifyForm(item.id)"
+      >
+        <v-expansion-panel-header :class="{'name-options-header': isOneOption}">
+          <span class="names-option-title">{{item.title}}</span>
+          <template v-slot:actions>
+            <v-icon color="primary">mdi-menu-down</v-icon>
+          </template>
+        </v-expansion-panel-header>
+
+        <v-expansion-panel-content class="name-options-content pt-4">
+          <div v-if="item.description" class="info-text mb-4" color="primary">{{item.description}}</div>
+          <component
+            :is="item.component"
+            :key="item.id"
+            :formType="formType"
+            :validate="validateNameChange"
+            @isSaved="emitIsSaved($event)"
+            @isValid="isFormValid = $event"
+          />
+        </v-expansion-panel-content>
+      </v-expansion-panel>
+    </v-expansion-panels>
+
+    <div class="action-btns">
+      <v-btn
+        id="done-btn"
+        large color="primary"
+        :loading="isLoading"
+        @click="submitNameCorrection()"
+      >
+        <span>Done</span>
+      </v-btn>
+
+      <v-btn
+        id="cancel-btn"
+        large outlined color="primary"
+        @click="emitCancel()"
+      >
+        <span>Cancel</span>
+      </v-btn>
+    </div>
+  </v-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+import { Component, Emit, Prop } from 'vue-property-decorator'
+import { CorrectNameOptionIF } from '@/interfaces/'
+import { NameChangeOptions } from '@/enums/'
+
+// for some reason, CorrectXXX cannot be imported from ./
+// (it breaks a bunch of unit tests)
+import CorrectCompanyName from '@/components/Restoration/CorrectCompanyName.vue'
+import CorrectNameToNumber from '@/components/Restoration/CorrectNameToNumber.vue'
+import CorrectNameRequest from '@/components/Restoration/CorrectNameRequest.vue'
+
+/**
+ * Operation:
+ * 1. To initialize this component option list, pass in an array of id's of the components you want to display.
+ *    I.e., ['correct-new-nr', 'correct-name', 'correct-name-to-number']
+ * 2. If this options list is only passed one value the option panel will be open by default.
+ * 3. The parent component will have to watch for the 'save' and 'cancel' events and handle them accordingly.
+ */
+@Component({
+  components: {
+    CorrectCompanyName,
+    CorrectNameToNumber,
+    CorrectNameRequest
+  }
+})
+export default class CorrectNameOptions extends Vue {
+  /** The options to display */
+  @Prop() readonly correctionNameChoices!: Array<string>
+
+  // local properties
+  protected displayedOptions: Array<CorrectNameOptionIF> = []
+  protected panel: number = null
+  protected formType: NameChangeOptions = null
+  protected currentFormType: NameChangeOptions = null
+  protected isLoading = false
+  protected isFormValid = false
+  protected validateNameChange = false
+
+  readonly correctionNameOptions: Array<CorrectNameOptionIF> = [
+    {
+      id: NameChangeOptions.CORRECT_NAME,
+      title: 'Edit the company name',
+      description: 'Correct typographical errors in the existing company name.',
+      component: CorrectCompanyName
+    },
+    {
+      id: NameChangeOptions.CORRECT_NAME_TO_NUMBER,
+      title: 'Use the incorporation number as the name',
+      description: null,
+      component: CorrectNameToNumber
+    },
+    {
+      id: NameChangeOptions.CORRECT_NEW_NR,
+      title: 'Use a new name request number',
+      description: 'Enter the new Name Request Number (e.g., NR 1234567) and either the applicant phone number ' +
+        'OR the applicant email that was used when the name was requested.',
+      component: CorrectNameRequest
+    }
+  ]
+
+  /** Called when component is mounted. */
+  mounted (): void {
+    // Filter the options to be displayed by what id's were passed from the parent component
+    this.displayedOptions = this.correctionNameOptions.filter(
+      option => this.correctionNameChoices.includes(option.id)
+    )
+    // open by default and assign id if only 1 option
+    if (this.isOneOption) {
+      this.panel = 0
+      this.currentFormType = this.displayedOptions[0].id
+    }
+  }
+
+  get isOneOption (): boolean {
+    return (this.correctionNameChoices.length === 1)
+  }
+
+  /** Trigger form submission */
+  protected submitNameCorrection (): void {
+    if (this.isFormValid) {
+      this.isLoading = true
+      this.formType = this.currentFormType
+    } else this.validateNameChange = true
+  }
+
+  /** Identify the current form */
+  protected identifyForm (type: NameChangeOptions) {
+    this.currentFormType = type
+    this.isFormValid = false
+  }
+
+  /** Inform Parent name correction process is done. */
+  @Emit('isSaved')
+  protected emitIsSaved (isSaved: boolean): boolean {
+    this.isLoading = false
+    this.formType = null
+    if (isSaved) this.panel = null
+    return isSaved
+  }
+
+  /** cancel name correction */
+  @Emit('cancel')
+  protected emitCancel (): void {
+    this.panel = null
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+.name-options-header {
+  align-items: start;
+}
+
+.bottom-border {
+  border-color: rgba(0, 0, 0, 0.1) !important;
+  border-bottom: 1px solid;
+}
+
+.v-expansion-panel:not(:first-child) {
+  padding-top: 1.25rem;
+}
+
+.names-option-title {
+  font-size: 1rem;
+  color: $app-blue;
+}
+
+.v-expansion-panel-content {
+  :deep(.v-expansion-panel-content__wrap) {
+    padding: 0;
+  }
+}
+
+.v-expansion-panel-header {
+  padding: .25rem 0 0;
+  color: $app-blue;
+}
+
+.v-expansion-panel--active > .v-expansion-panel-header {
+  font-weight: bold;
+  min-height: 3rem;
+
+  .names-option-title {
+    color: $gray9 !important;
+  }
+}
+
+.action-btns {
+  margin: 30px 0;
+  display: flex;
+  justify-content: flex-end;
+
+  .v-btn + .v-btn {
+    margin-left: 0.5rem;
+  }
+
+  .v-btn {
+    min-width: 6.5rem;
+  }
+
+  #done-btn[disabled] {
+    color: white !important;
+    background-color: $app-blue !important;
+    opacity: 0.2;
+  }
+}
+</style>
diff --git a/src/components/Restoration/CorrectNameRequest.vue b/src/components/Restoration/CorrectNameRequest.vue
new file mode 100644
index 000000000..9bf931060
--- /dev/null
+++ b/src/components/Restoration/CorrectNameRequest.vue
@@ -0,0 +1,253 @@
+<template>
+  <v-form id="correct-nr-form" ref="correctNrForm" v-model="formValid" lazy-validation>
+    <!-- Dialogs -->
+    <ConfirmDialogShared
+      ref="confirm"
+      attach="#app"
+    />
+
+    <v-row no-gutters>
+      <v-col cols="1" class="mt-1">
+        <v-btn x-small fab outlined :ripple="false" color="gray7" class="step-icon" tabindex="-1">1</v-btn>
+      </v-col>
+      <v-col>
+        <v-text-field
+          v-model="nameRequestNumber"
+          class="text-input-field"
+          filled
+          label="Enter the NR Number"
+          hint="Example: NR 1234567"
+          persistent-hint
+          :rules="done && nrNumRules"
+          id="nr-number"
+          @keyup="uppercase('nameRequestNumber')"
+        />
+      </v-col>
+    </v-row>
+
+    <v-row no-gutters class="mt-4 mb-n1">
+      <v-col cols="1" class="mt-1">
+        <v-btn x-small fab outlined :ripple="false" color="gray7" class="step-icon" tabindex="-1">2</v-btn>
+      </v-col>
+      <v-col cols="5">
+        <v-text-field
+          v-model="applicantPhone"
+          class="text-input-field"
+          filled
+          label="Applicant's Phone Number"
+          hint="Example: 555-555-5555"
+          persistent-hint
+          type="tel"
+          :rules="done && phoneRules"
+          id="applicant-phone"
+        />
+      </v-col>
+      <div class="ma-5">or</div>
+      <v-col>
+        <v-text-field
+          v-model="applicantEmail"
+          class="text-input-field"
+          filled
+          label="Applicant's Notification Email"
+          hint="Example: name@email.com"
+          persistent-hint
+          type="email"
+          :rules="done && emailRules"
+          id="applicant-email"
+        />
+      </v-col>
+    </v-row>
+  </v-form>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+import { Component, Prop, Watch, Emit } from 'vue-property-decorator'
+import { Action, Getter } from 'vuex-class'
+import { ConfirmDialog as ConfirmDialogShared } from '@bcrs-shared-components/confirm-dialog/'
+import { CommonMixin, NameRequestMixin } from '@/mixins/'
+import { ActionBindingIF, ConfirmDialogType, NameRequestIF, NrCorrectionIF, NrResponseIF } from '@/interfaces/'
+import { NameChangeOptions } from '@/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+
+@Component({
+  components: {
+    ConfirmDialogShared
+  },
+  mixins: [
+    CommonMixin,
+    NameRequestMixin
+  ]
+})
+export default class CorrectNameRequest extends Vue {
+  // Refs
+  $refs!: {
+    confirm: ConfirmDialogType
+    correctNrForm: HTMLFormElement
+  }
+
+  /** The form type. */
+  @Prop({ default: null }) readonly formType!: NameChangeOptions
+
+  /** Whether to perform validation. */
+  @Prop({ default: false }) readonly validate!: boolean
+
+  @Action setNameRequest!: ActionBindingIF
+
+  @Getter getNameRequest!: NameRequestIF
+  @Getter getEntityType!: CorpTypeCd
+
+  // V-model properties
+  protected formValid = false
+  protected nameRequestNumber = ''
+  protected applicantPhone = ''
+  protected applicantEmail = ''
+
+  // FUTURE: use this to turn on/off validations
+  protected done = true
+
+  // Rules
+  readonly nrNumRules = [
+    (v: string) => !!v || 'Name Request Number is required',
+    (v: string) => this.isValidNrNumber(v) || 'Name Request Number is invalid'
+  ]
+  readonly phoneRules = [
+    (v: string) => !/^\s/g.test(v) || 'Invalid spaces', // leading spaces
+    (v: string) => !/\s$/g.test(v) || 'Invalid spaces', // trailing spaces
+    (v: string) => !(v?.length > 12) || 'Phone number is invalid'
+  ]
+  readonly emailRules = [
+    (v: string) => !/^\s/g.test(v) || 'Invalid spaces', // leading spaces
+    (v: string) => !/\s$/g.test(v) || 'Invalid spaces', // trailing spaces
+    (v: string) => this.isValidEmail(v) || 'Email is invalid'
+  ]
+
+  // Validations
+  get isFormValid (): boolean {
+    return this.formValid && !!this.nameRequestNumber &&
+      (!!this.applicantPhone || !!this.applicantEmail)
+  }
+
+  private isValidEmail (value: string): boolean {
+    if (value?.length < 1) return true
+    return ((!!this.applicantPhone && !!value) || !!this.validateEmailFormat(value))
+  }
+
+  private isValidNrNumber (value: string): boolean {
+    const VALID_FORMAT = new RegExp(/^(NR )\d{7}$/)
+    return VALID_FORMAT.test(value)
+  }
+
+  private validateEmailFormat (value: string): boolean {
+    // eslint-disable-next-line max-len
+    const VALID_FORMAT = new RegExp(/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/)
+    return VALID_FORMAT.test(value)
+  }
+
+  @Watch('validate')
+  private onValidate (): void {
+    this.$refs.correctNrForm.validate()
+  }
+
+  /** Watch for form submission and emit results. */
+  @Watch('formType')
+  private async onSubmit (): Promise<any> {
+    // this component should only see correct-new-nr form type
+    if (this.formType === NameChangeOptions.CORRECT_NEW_NR) {
+      try {
+        // Validate and return the name request data
+        const nr: NrResponseIF = await this.validateNameRequest(
+          this.nameRequestNumber,
+          this.applicantPhone,
+          this.applicantEmail
+        )
+
+        if (this.getEntityType !== nr.legalType) {
+          // Invalid NR type, inform parent the process is done and prompt confirm dialog
+          this.emitIsSaved()
+
+          const dialogContent = `<p class="info-text">This ${GetCorpFullDescription(nr.entity_type_cd)} ` +
+            `Name Request does not match the current business type ` +
+            `<b>${GetCorpFullDescription(this.getEntityType)}</b>.\n\n` +
+            `The Name Request type must match the business type before you can continue.</p>`
+          await this.showConfirmDialog(
+            this.$refs.confirm,
+            'Name Request Type Does Not Match Business Type',
+            dialogContent,
+            'OK'
+          )
+        } else {
+          this.parseNameRequest(nr)
+          this.emitIsSaved(true)
+        }
+      } catch {
+        // "validateNameRequest" handles its own errors
+        // Inform parent process is complete
+        this.emitIsSaved()
+      }
+    }
+  }
+
+  /**
+   * Parse and Set the Name Request date to Store.
+   * @param nr The name request data
+   */
+  private parseNameRequest (nr: NrResponseIF): void {
+    const nrCorrection: NrCorrectionIF = {
+      legalType: nr.legalType,
+      nrNumber: this.nameRequestNumber,
+      legalName: this.getNrApprovedName(nr) || '',
+      expiry: nr.expirationDate,
+      status: nr.state,
+      requestType: nr.request_action_cd,
+      applicant: {
+        fullName: this.formatFullName(nr.applicants),
+        fullAddress: this.formatFullAddress(nr.applicants),
+        phoneNumber: nr.applicants.phoneNumber,
+        emailAddress: nr.applicants.emailAddress
+      }
+    }
+
+    // set the new correction NR data
+    this.setNameRequest({ ...this.getNameRequest, ...nrCorrection })
+  }
+
+  /** Inform parent the process is complete. */
+  @Emit('isSaved')
+  private emitIsSaved (isSaved = false): boolean {
+    if (!isSaved) this.$refs.correctNrForm.resetValidation()
+    return isSaved
+  }
+
+  /** Inform parent when form is valid and ready for submission. */
+  @Watch('formValid')
+  @Watch('nameRequestNumber')
+  @Watch('applicantPhone')
+  @Watch('applicantEmail')
+  @Emit('isValid')
+  private emitValid (): boolean {
+    return this.isFormValid
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+.step-icon {
+  font-size: small;
+  font-weight: bold;
+  pointer-events: none;
+}
+
+:deep(#nr-number) {
+  // hide uppercase transformation delay from user
+  text-transform: uppercase;
+}
+
+:deep(.theme--light.v-label) {
+  font-size: 1rem;
+  color: $gray7;
+  font-weight: normal;
+}
+</style>
diff --git a/src/components/Restoration/CorrectNameToNumber.vue b/src/components/Restoration/CorrectNameToNumber.vue
new file mode 100644
index 000000000..08653e93d
--- /dev/null
+++ b/src/components/Restoration/CorrectNameToNumber.vue
@@ -0,0 +1,82 @@
+<template>
+  <v-form id="correct-name-to-number-form" lazy-validation>
+    <v-row no-gutters>
+      <v-col>
+        <v-checkbox
+          v-model="correctToNumbered"
+          id="correct-name-to-number-checkbox"
+          class="mb-n5"
+          :label="`Change the company name to ${businessId} B.C. Ltd.`"
+        />
+      </v-col>
+    </v-row>
+  </v-form>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+import { Component, Prop, Watch, Emit } from 'vue-property-decorator'
+import { Action, Getter } from 'vuex-class'
+import { ActionBindingIF, NameRequestIF } from '@/interfaces/'
+import { NameChangeOptions } from '@/enums/'
+
+@Component({})
+export default class CorrectNameToNumber extends Vue {
+  /** Form Submission Prop */
+  @Prop({ default: null }) readonly formType!: NameChangeOptions
+
+  @Action setNameRequest!: ActionBindingIF
+
+  @Getter getNameRequest!: NameRequestIF
+  @Getter getBusinessId!: string
+
+  // Local properties
+  correctToNumbered = false
+
+  get businessId (): string {
+    return this.getBusinessId && this.getBusinessId.substring(2)
+  }
+
+  /** Watch for form submission and emit results. */
+  @Watch('formType')
+  private async onSubmit (): Promise<any> {
+    // this component should only see correct-name-to-number form type
+    if (this.formType === NameChangeOptions.CORRECT_NAME_TO_NUMBER) {
+      // delete the current legal name and NR number
+      this.setNameRequest({
+        ...this.getNameRequest,
+        legalName: undefined,
+        nrNumber: undefined
+      })
+      this.emitIsSaved(true)
+    }
+  }
+
+  /** Inform parent the process is complete. */
+  @Emit('isSaved')
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  private emitIsSaved (isSaved: boolean): void {}
+
+  /** Inform parent when form is valid and ready for submission. */
+  @Watch('correctToNumbered')
+  @Emit('isValid')
+  private emitValid (): boolean {
+    return this.correctToNumbered
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+.v-input--selection-controls {
+  padding: 0;
+  margin: 0;
+}
+
+:deep(.theme--light.v-label) {
+  font-size: 1rem;
+  color: $gray7;
+  font-weight: normal;
+}
+</style>
diff --git a/src/components/common/Actions.vue b/src/components/common/Actions.vue
index c138e5e77..0d37dbc05 100644
--- a/src/components/common/Actions.vue
+++ b/src/components/common/Actions.vue
@@ -307,7 +307,7 @@ export default class Actions extends Vue {
         return this.buildRegistrationFiling()
       case FilingTypes.RESTORATION:
         return this.buildRestorationFiling()
-      case FilingTypes.VOLUNTARY_DISSOLUTION:
+      case FilingTypes.DISSOLUTION:
         return this.buildDissolutionFiling()
     }
   }
diff --git a/src/components/common/EntityInfo.vue b/src/components/common/EntityInfo.vue
index 746531b90..a4525b9c9 100644
--- a/src/components/common/EntityInfo.vue
+++ b/src/components/common/EntityInfo.vue
@@ -153,7 +153,7 @@ export default class EntityInfo extends Vue {
 
   get legalName (): string {
     switch (this.getFilingType) {
-      case FilingTypes.VOLUNTARY_DISSOLUTION:
+      case FilingTypes.DISSOLUTION:
         return this.getBusinessLegalName
       case FilingTypes.INCORPORATION_APPLICATION:
         return this.getNameRequestApprovedName
diff --git a/src/components/common/NameRequestInfo.vue b/src/components/common/NameRequestInfo.vue
index aa8329b96..f507665c4 100644
--- a/src/components/common/NameRequestInfo.vue
+++ b/src/components/common/NameRequestInfo.vue
@@ -1,14 +1,9 @@
 <template>
-  <div id="name-request-summary">
-    <ConfirmDialog
-      ref="confirmTranslationRemovalDialog"
-      attach="#name-request-summary"
-    />
-
+  <div id="name-request-info">
     <template v-if="getNameRequestNumber">
       <div class="section-container">
         <!-- Name Request -->
-        <v-row no-gutters id="name-request-info">
+        <v-row no-gutters id="name-request">
           <v-col cols="12" sm="3" class="pr-4">
             <label>
               <strong>Name Request</strong>
@@ -34,7 +29,7 @@
 
       <!-- Name Request Applicant -->
       <div class="section-container">
-        <v-row no-gutters id="name-request-applicant-info">
+        <v-row no-gutters id="name-request-applicant">
           <v-col cols="12" sm="3" class="pr-4">
             <label>
               <strong>Name Request Applicant</strong>
@@ -87,93 +82,23 @@
     </template>
 
     <!-- Name Translation -->
-    <template v-if="showNameTranslation">
-      <div
-        class="section-container"
-        :class="{ 'invalid-section': getShowErrors && !isValidNameTranslation }"
-      >
-        <v-row no-gutters id="name-translation-info">
-          <v-col cols="12" sm="3" class="pr-4">
-            <label>
-              <strong>Name Translation</strong>
-            </label>
-          </v-col>
-
-          <v-col cols="12" sm="9" class="pt-4 pt-sm-0">
-            <v-checkbox
-              class="pt-0 mt-0"
-              v-model="hasNameTranslation"
-              id="name-translation-checkbox"
-              @click="confirmNameTranslation()"
-              hide-details
-            >
-              <template v-slot:label>
-                <span class="translation-checkbox-label">
-                  This company uses one or more translations of its name outside of Canada.
-                </span>
-              </template>
-            </v-checkbox>
-
-            <template v-if="hasNameTranslation">
-              <p class="mt-4 mb-0">
-                <b>Note:</b> Name translations must use the Latin Alphabet (English, French, etc.).
-                Names that use other writing systems must spell the name phonetically in English or
-                French.
-              </p>
-
-              <v-btn
-                outlined color="primary"
-                class="mt-6"
-                @click="isAddingNameTranslation = true"
-                :disabled="isAddingNameTranslation"
-              >
-                <v-icon>mdi-plus</v-icon>
-                <span>Add a Name Translation</span>
-              </v-btn>
-
-              <!-- Add Name Translation component -->
-              <div v-if="isAddingNameTranslation" class="mt-6">
-                <AddNameTranslation
-                  :edit-name-translation="editingNameTranslation"
-                  @addTranslation="addNameTranslation($event)"
-                  @cancelTranslation="cancelNameTranslation()"
-                  @removeTranslation="removeNameTranslation(editIndex)"
-                />
-              </div>
-
-              <!-- List Name Translation component -->
-              <div v-if="getNameTranslations && getNameTranslations.length > 0" class="mt-6">
-                <ListNameTranslations
-                  :isAddingNameTranslation="isAddingNameTranslation"
-                  :translationsList="getNameTranslations"
-                  @editTranslation="editNameTranslation($event)"
-                  @removeTranslation="removeNameTranslation($event)"
-                />
-              </div>
-            </template>
-          </v-col>
-        </v-row>
-      </div>
-    </template>
+    <NameTranslation
+      v-if="showNameTranslation"
+      @hasNameTranslation="emitHasNameTranslation($event)"
+    />
   </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue'
 import { Component, Emit, Watch } from 'vue-property-decorator'
-import { Action, Getter } from 'vuex-class'
+import { Getter } from 'vuex-class'
 import { getName } from 'country-list'
-import AddNameTranslation from '@/components/common/AddNameTranslation.vue'
-import { ConfirmDialog } from '@bcrs-shared-components/confirm-dialog'
-import ListNameTranslations from '@/components/common/ListNameTranslations.vue'
+import NameTranslation from '@/components/common/NameTranslation.vue'
 import { CorpTypeCd, NameRequestStates } from '@/enums'
 import {
-  ActionBindingIF,
-  ConfirmDialogType,
   NameRequestApplicantIF,
-  NameRequestIF,
-  NameTranslationIF,
-  RegistrationStateIF
+  NameRequestIFRegistrationStateIF
 } from '@/interfaces'
 import { DateMixin } from '@/mixins'
 import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
@@ -181,47 +106,29 @@ import { Capitalize } from '@/utils'
 
 @Component({
   components: {
-    AddNameTranslation,
-    ConfirmDialog,
-    ListNameTranslations
+    NameTranslation
   },
   mixins: [
     DateMixin
   ]
 })
 export default class NameRequestInfo extends Vue {
-  // Refs
-  $refs!: {
-    confirmTranslationRemovalDialog: ConfirmDialogType
-  }
-
   // For template
   readonly NameRequestStates = NameRequestStates
   readonly Capitalize = Capitalize
 
-  // Local properties
-  protected hasNameTranslation = false
-  protected isAddingNameTranslation = true
-  protected editingNameTranslation = ''
-  protected editIndex = -1
-
   readonly RECEIVED_STATE = 'Received'
   readonly NOT_RECEIVED_STATE = 'Not Received'
   readonly NOT_REQUIRED_STATE = 'Not Required'
   readonly WAIVED_STATE = 'Waived'
 
-  @Action setNameTranslationState!: ActionBindingIF
-
   @Getter getEntityType!: CorpTypeCd
   @Getter getNameRequest!: NameRequestIF
   @Getter getNameRequestNumber!: string
   @Getter getNameRequestApprovedName!: string
-  @Getter getNameTranslations!: NameTranslationIF[]
-  @Getter getRegistration!: RegistrationStateIF
   @Getter isTypeCoop: boolean
   @Getter isTypeSoleProp: boolean
   @Getter isTypePartnership: boolean
-  @Getter getShowErrors!: boolean
 
   /** The entity type description.  */
   get getEntityTypeDescription (): string {
@@ -237,11 +144,6 @@ export default class NameRequestInfo extends Vue {
     return 'New Business'
   }
 
-  get showNameTranslation (): boolean {
-    if (this.isTypeCoop || this.isTypeSoleProp || this.isTypePartnership) return false
-    return true
-  }
-
   /** The expiration date. */
   get expirationDate (): string {
     return this.apiToPacificDateTime(this.getNameRequest.expirationDate, true)
@@ -318,125 +220,29 @@ export default class NameRequestInfo extends Vue {
     return this.applicant.phoneNumber
   }
 
-  /**
-   * Adds or updates a name translation.
-   * @param name The name to add
-   */
-  protected addNameTranslation (name: string): void {
-    const nameTranslations = Object.assign([], this.getNameTranslations)
-
-    // Handle name translation adds or updates
-    this.editIndex > -1
-      ? nameTranslations[this.editIndex].name = name
-      : nameTranslations.push({ name })
-
-    this.setNameTranslationState(nameTranslations)
-
-    // Emit Validation
-    this.emitHasNameTranslation()
-
-    this.cancelNameTranslation()
-  }
-
-  /**
-   * Sets specified name translation to be edited.
-   * @param index Index number of the name translation to edit
-   */
-  protected editNameTranslation (index: number): void {
-    const nameTranslations = Object.assign([], this.getNameTranslations)
-    this.editingNameTranslation = nameTranslations[index].name
-    this.editIndex = index
-    this.isAddingNameTranslation = true
-  }
-
-  /**
-   * Removes a name translation.
-   * @param index Index number of the name translation to remove
-   */
-  protected removeNameTranslation (index: number): void {
-    const nameTranslations = Object.assign([], this.getNameTranslations)
-    nameTranslations.splice(index, 1)
-
-    this.setNameTranslationState(nameTranslations)
-
-    // Emit Validation
-    this.emitHasNameTranslation()
-
-    this.cancelNameTranslation()
-  }
-
-  /** Cancels adding or editing of name translation. */
-  protected cancelNameTranslation (): void {
-    this.isAddingNameTranslation = false
-    this.editingNameTranslation = ''
-    this.editIndex = -1
-  }
-
-  /** Handles name translation checkbox logic. */
-  protected confirmNameTranslation (val: boolean) {
-    // if user is unchecking the box and there are name translations
-    // then prompt whether to delete them all
-    if (!this.hasNameTranslation && this.getNameTranslations?.length > 0) {
-      // open confirmation dialog and wait for response
-      this.$refs.confirmTranslationRemovalDialog.open(
-        'Remove All Name Translations',
-        'De-selecting the Name Translation option will remove all name translations.',
-        {
-          width: '45rem',
-          persistent: true,
-          yes: 'Remove All Translations',
-          no: null,
-          cancel: 'Cancel'
-        }
-      ).then(async (confirm) => {
-        if (confirm) {
-          this.setNameTranslationState([])
-          // clear the checkbox
-          this.hasNameTranslation = false
-        }
-      }).catch(() => {
-        // reset the checkbox
-        this.hasNameTranslation = true
-      })
-    }
-
-    // Emit Validation
-    this.emitHasNameTranslation()
-  }
-
-  /** Whether name translation is valid. */
-  get isValidNameTranslation (): boolean {
-    return (this.hasNameTranslation ? this.getNameTranslations?.length > 0 : true)
+  /** Whether to show the name translation component. */
+  get showNameTranslation (): boolean {
+    if (this.isTypeCoop || this.isTypeSoleProp || this.isTypePartnership) return false
+    return true
   }
 
-  // Events
   @Emit('hasNameTranslation')
-  protected emitHasNameTranslation (): boolean {
-    return this.isValidNameTranslation
-  }
-
-  @Watch('getNameTranslations', { deep: true, immediate: true })
-  private updateNameTranslation (): void {
-    if (this.getNameTranslations?.length > 0) {
-      this.isAddingNameTranslation = false
-      this.hasNameTranslation = true
-    }
-  }
+  protected emitHasNameTranslation (val: boolean): void {}
 }
 </script>
 
 <style lang="scss" scoped>
 @import '@/assets/styles/theme.scss';
 
-p {
-  font-size: $px-14;
-}
-
 ul {
   font-size: $px-15;
   margin: 0;
   padding: 0;
   list-style-type: none;
+
+  li:not(:first-child) {
+    margin-top: 8px;
+  }
 }
 
 #name-request-title,
@@ -452,18 +258,4 @@ ul {
     margin-left: -1.5em;
   }
 }
-
-#name-translation-info {
-  .translation-checkbox-label {
-    font-size: $px-14;
-    color: $gray9;
-  }
-}
-
-.name-request-list-items,
-.applicant-list-items {
-  li:not(:first-child) {
-    margin-top: 8px;
-  }
-}
 </style>
diff --git a/src/components/common/NameTranslation.vue b/src/components/common/NameTranslation.vue
new file mode 100644
index 000000000..300a453fc
--- /dev/null
+++ b/src/components/common/NameTranslation.vue
@@ -0,0 +1,225 @@
+<template>
+  <div id="name-translation">
+    <ConfirmDialog
+      ref="confirmDialog"
+      attach="#name-translation"
+    />
+
+    <div
+      class="section-container"
+      :class="{ 'invalid-section': getShowErrors && !isValidNameTranslation }"
+    >
+      <v-row no-gutters id="name-translation-info">
+        <v-col cols="12" sm="3" class="pr-4">
+          <label>
+            <strong>Name Translation</strong>
+          </label>
+        </v-col>
+
+        <v-col cols="12" sm="9" class="pt-4 pt-sm-0">
+          <v-checkbox
+            class="pt-0 mt-0"
+            v-model="hasNameTranslation"
+            id="name-translation-checkbox"
+            @click="confirmNameTranslation()"
+            hide-details
+          >
+            <template v-slot:label>
+              <span class="translation-checkbox-label">
+                This company uses one or more translations of its name outside of Canada.
+              </span>
+            </template>
+          </v-checkbox>
+
+          <template v-if="hasNameTranslation">
+            <p class="mt-4 mb-0">
+              <b>Note:</b> Name translations must use the Latin Alphabet (English, French, etc.).
+              Names that use other writing systems must spell the name phonetically in English or
+              French.
+            </p>
+
+            <v-btn
+              outlined color="primary"
+              class="mt-6"
+              @click="isAddingNameTranslation = true"
+              :disabled="isAddingNameTranslation"
+            >
+              <v-icon>mdi-plus</v-icon>
+              <span>Add a Name Translation</span>
+            </v-btn>
+
+            <!-- Add Name Translation component -->
+            <div v-if="isAddingNameTranslation" class="mt-6">
+              <AddNameTranslation
+                :edit-name-translation="editingNameTranslation"
+                @addTranslation="addNameTranslation($event)"
+                @cancelTranslation="cancelNameTranslation()"
+                @removeTranslation="removeNameTranslation(editIndex)"
+              />
+            </div>
+
+            <!-- List Name Translation component -->
+            <div v-if="getNameTranslations && getNameTranslations.length > 0" class="mt-6">
+              <ListNameTranslations
+                :isAddingNameTranslation="isAddingNameTranslation"
+                :translationsList="getNameTranslations"
+                @editTranslation="editNameTranslation($event)"
+                @removeTranslation="removeNameTranslation($event)"
+              />
+            </div>
+          </template>
+        </v-col>
+      </v-row>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+import { Component, Emit, Watch } from 'vue-property-decorator'
+import { Action, Getter } from 'vuex-class'
+import { ConfirmDialog } from '@bcrs-shared-components/confirm-dialog'
+import AddNameTranslation from '@/components/common/AddNameTranslation.vue'
+import ListNameTranslations from '@/components/common/ListNameTranslations.vue'
+import { ActionBindingIF, ConfirmDialogType, NameTranslationIF } from '@/interfaces'
+import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+
+@Component({
+  components: {
+    AddNameTranslation,
+    ConfirmDialog,
+    ListNameTranslations
+  }
+})
+export default class NameRequestInfo extends Vue {
+  // Refs
+  $refs!: {
+    confirmDialog: ConfirmDialogType
+  }
+
+  // Local properties
+  protected hasNameTranslation = false
+  protected isAddingNameTranslation = true
+  protected editingNameTranslation = ''
+  protected editIndex = -1
+
+  @Action setNameTranslationState!: ActionBindingIF
+
+  @Getter getNameTranslations!: NameTranslationIF[]
+  @Getter getShowErrors!: boolean
+
+  /** Whether name translation is valid. */
+  get isValidNameTranslation (): boolean {
+    return (this.hasNameTranslation ? this.getNameTranslations?.length > 0 : true)
+  }
+
+  /**
+   * Adds or updates a name translation.
+   * @param name The name to add
+   */
+  protected addNameTranslation (name: string): void {
+    const nameTranslations = Object.assign([], this.getNameTranslations)
+
+    // Handle name translation adds or updates
+    this.editIndex > -1
+      ? nameTranslations[this.editIndex].name = name
+      : nameTranslations.push({ name })
+
+    this.setNameTranslationState(nameTranslations)
+
+    // Emit Validation
+    this.emitHasNameTranslation()
+
+    this.cancelNameTranslation()
+  }
+
+  /**
+   * Sets specified name translation to be edited.
+   * @param index Index number of the name translation to edit
+   */
+  protected editNameTranslation (index: number): void {
+    const nameTranslations = Object.assign([], this.getNameTranslations)
+    this.editingNameTranslation = nameTranslations[index].name
+    this.editIndex = index
+    this.isAddingNameTranslation = true
+  }
+
+  /**
+   * Removes a name translation.
+   * @param index Index number of the name translation to remove
+   */
+  protected removeNameTranslation (index: number): void {
+    const nameTranslations = Object.assign([], this.getNameTranslations)
+    nameTranslations.splice(index, 1)
+
+    this.setNameTranslationState(nameTranslations)
+
+    // Emit Validation
+    this.emitHasNameTranslation()
+
+    this.cancelNameTranslation()
+  }
+
+  /** Cancels adding or editing of name translation. */
+  protected cancelNameTranslation (): void {
+    this.isAddingNameTranslation = false
+    this.editingNameTranslation = ''
+    this.editIndex = -1
+  }
+
+  /** Handles name translation checkbox logic. */
+  protected confirmNameTranslation (val: boolean) {
+    // if user is unchecking the box and there are name translations
+    // then prompt whether to delete them all
+    if (!this.hasNameTranslation && this.getNameTranslations?.length > 0) {
+      // open confirmation dialog and wait for response
+      this.$refs.confirmDialog.open(
+        'Remove All Name Translations',
+        'De-selecting the Name Translation option will remove all name translations.',
+        {
+          width: '45rem',
+          persistent: true,
+          yes: 'Remove All Translations',
+          no: null,
+          cancel: 'Cancel'
+        }
+      ).then(async (confirm) => {
+        if (confirm) {
+          this.setNameTranslationState([])
+          // clear the checkbox
+          this.hasNameTranslation = false
+        }
+      }).catch(() => {
+        // reset the checkbox
+        this.hasNameTranslation = true
+      })
+    }
+
+    // Emit Validation
+    this.emitHasNameTranslation()
+  }
+
+  @Watch('getNameTranslations', { deep: true, immediate: true })
+  private updateNameTranslation (): void {
+    if (this.getNameTranslations?.length > 0) {
+      this.isAddingNameTranslation = false
+      this.hasNameTranslation = true
+    }
+  }
+
+  @Emit('hasNameTranslation')
+  protected emitHasNameTranslation (): boolean {
+    return this.isValidNameTranslation
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+.translation-checkbox-label {
+  margin-top: 1px;
+  font-size: $px-14;
+  color: $gray9;
+}
+</style>
diff --git a/src/dialogs/NameRequestInvalidErrorDialog.vue b/src/dialogs/NameRequestInvalidErrorDialog.vue
index 9d18de31f..36d89fce8 100644
--- a/src/dialogs/NameRequestInvalidErrorDialog.vue
+++ b/src/dialogs/NameRequestInvalidErrorDialog.vue
@@ -38,7 +38,7 @@
 <script lang="ts">
 import Vue from 'vue'
 import { Component, Prop, Emit } from 'vue-property-decorator'
-import { NameRequestStates } from '@/enums/nameRequestStates'
+import { NameRequestStates } from '@/enums'
 
 @Component({})
 export default class NameRequestInvalidErrorDialog extends Vue {
diff --git a/src/enums/filingNames.ts b/src/enums/filingNames.ts
deleted file mode 100644
index 439f0c78b..000000000
--- a/src/enums/filingNames.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export enum FilingNames {
-  INCORPORATION_APPLICATION = 'Incorporation Application',
-  REGISTRATION = 'Registration',
-  RESTORATION_APPLICATION = 'Restoration Application',
-  VOLUNTARY_DISSOLUTION = 'Voluntary Dissolution',
-  DISSOLUTION_FIRM = 'Dissolution',
-}
-
-export enum FilingTypesSubTitle {
-  SOLE_PROP_SUB_TITLE = 'Confirm the following information,' +
-  ' select the dissolution date and certify your dissolution before filing.',
-}
diff --git a/src/enums/filingTypes.ts b/src/enums/filingTypes.ts
deleted file mode 100644
index 144926aa8..000000000
--- a/src/enums/filingTypes.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export enum FilingTypes {
-  INCORPORATION_APPLICATION = 'incorporationApplication',
-  REGISTRATION = 'registration',
-  RESTORATION = 'restoration',
-  VOLUNTARY_DISSOLUTION = 'dissolution',
-}
diff --git a/src/enums/index.ts b/src/enums/index.ts
index 2fbbcacc0..7c0149977 100644
--- a/src/enums/index.ts
+++ b/src/enums/index.ts
@@ -5,18 +5,13 @@ export * from './dissolutionTypes'
 export * from './effectOfOrders'
 export * from './entityState'
 export * from './entitySubtypes'
-export * from './filingNames'
 export * from './filingStatus'
-export * from './filingTypes'
 export * from './itemTypes'
 export * from './partyTypes'
 export * from './modes'
-export * from './nameRequestStates'
-export * from './nameRequestTypes'
+export * from './name-change-options'
 export * from './numWord'
 export * from './pdfPageSize'
-export * from './restorationTypes'
-export * from './roleTypes'
 export * from './routeNames'
 export * from './ruleIds'
 export * from './views'
@@ -27,6 +22,12 @@ export {
   EffectiveDateTypes,
   EntityStates,
   FilingCodes,
+  FilingNames,
+  FilingTypes,
+  NameRequestStates,
+  NameRequestTypes,
   RelationshipTypes,
+  RestorationTypes,
+  RoleTypes,
   StaffPaymentOptions
 } from '@bcrs-shared-components/enums'
diff --git a/src/enums/name-change-options.ts b/src/enums/name-change-options.ts
new file mode 100644
index 000000000..6afd1b653
--- /dev/null
+++ b/src/enums/name-change-options.ts
@@ -0,0 +1,5 @@
+export enum NameChangeOptions {
+  CORRECT_NAME = 'correct-name',
+  CORRECT_NAME_TO_NUMBER = 'correct-name-to-number',
+  CORRECT_NEW_NR = 'correct-new-nr'
+}
diff --git a/src/enums/nameRequestStates.ts b/src/enums/nameRequestStates.ts
deleted file mode 100644
index ec9fb1747..000000000
--- a/src/enums/nameRequestStates.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export enum NameRequestStates {
-    // API STATES
-    APPROVED = 'APPROVED',
-    CANCELLED = 'CANCELLED',
-    COMPLETED = 'COMPLETED',
-    CONDITIONAL = 'CONDITIONAL', // NR state
-    CONDITION = 'CONDITION', // NR name state
-    DRAFT = 'DRAFT',
-    EXPIRED = 'EXPIRED',
-    HISTORICAL = 'HISTORICAL',
-    HOLD = 'HOLD',
-    INPROGRESS = 'INPROGRESS',
-    REJECTED = 'REJECTED',
-    NRO_UPDATING = 'NRO_UPDATING',
-
-    // ADDITIONAL UI STATES FOR ERROR HANDLING
-    NOT_APPROVED = 'NOT_APPROVED',
-    CONSUMED = 'CONSUMED',
-    NOT_FOUND = 'NOT_FOUND',
-    NEED_CONSENT = 'NEED_CONSENT',
-    INVALID = 'INVALID',
-}
diff --git a/src/enums/nameRequestTypes.ts b/src/enums/nameRequestTypes.ts
deleted file mode 100644
index 8c6ad9953..000000000
--- a/src/enums/nameRequestTypes.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Enum to help map name request type codes. */
-export enum NameRequestTypes {
-  NEW = 'NEW',
-  CHANGE_OF_NAME = 'CHG',
-  CONVERSION = 'CNV'
-}
diff --git a/src/enums/restorationTypes.ts b/src/enums/restorationTypes.ts
deleted file mode 100644
index 1788ca03e..000000000
--- a/src/enums/restorationTypes.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export enum RestorationTypes {
-  FULL = 'fullRestoration',
-  LIMITED = 'limitedRestoration',
-  LTD_EXTEND = 'limitedRestorationExtension',
-  LTD_TO_FULL = 'limitedRestorationToFull'
-}
diff --git a/src/enums/roleTypes.ts b/src/enums/roleTypes.ts
deleted file mode 100644
index 526374ffd..000000000
--- a/src/enums/roleTypes.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export enum RoleTypes {
-  APPLICANT = 'Applicant',
-  COMPLETING_PARTY = 'Completing Party',
-  CUSTODIAN = 'Custodian',
-  DIRECTOR = 'Director',
-  INCORPORATOR = 'Incorporator',
-  LIQUIDATOR = 'Liquidator',
-  PARTNER = 'Partner',
-  PROPRIETOR = 'Proprietor'
-}
diff --git a/src/interfaces/common/correct-name-option-interface.ts b/src/interfaces/common/correct-name-option-interface.ts
new file mode 100644
index 000000000..946897d18
--- /dev/null
+++ b/src/interfaces/common/correct-name-option-interface.ts
@@ -0,0 +1,8 @@
+import { NameChangeOptions } from '@/enums/'
+
+export interface CorrectNameOptionIF {
+  id: NameChangeOptions,
+  title: string,
+  description?: string,
+  component: any
+}
diff --git a/src/interfaces/index.ts b/src/interfaces/index.ts
index ec23d48bf..6a63c1960 100644
--- a/src/interfaces/index.ts
+++ b/src/interfaces/index.ts
@@ -1,3 +1,7 @@
+// Common interfaces
+export * from './common/address-interface'
+export * from './common/correct-name-option-interface'
+
 // Filing interfaces
 export * from './filing-interfaces/filing-interfaces'
 export * from './filing-interfaces/filing-data-interface'
@@ -8,6 +12,9 @@ export * from './filing-interfaces/party-interface'
 // Payment interfaces
 export * from './payment-interfaces/fees-interface'
 
+// Registration interfaces
+export * from './Registration/business-address-interface'
+
 // Resource interfaces
 export * from './resource-interfaces/component-resource-interfaces/affidavit-resource-interface'
 export * from './resource-interfaces/component-resource-interfaces/agreement-types-interface'
@@ -66,12 +73,6 @@ export * from './utils-interfaces/pdf-info-interface'
 export * from './utils-interfaces/validation-detail-interface'
 export * from './utils-interfaces/validation-item-detail-interface'
 
-// Common interfaces
-export * from './common/address-interface'
-
-// Registration interfaces
-export * from './Registration/business-address-interface'
-
 // External interfaces
 // NB: importing EmptyAddress doesn't work in local components
 export {
diff --git a/src/interfaces/store-interfaces/state-interfaces/name-request-interface.ts b/src/interfaces/store-interfaces/state-interfaces/name-request-interface.ts
index 4dc8cbb28..24ad6ba74 100644
--- a/src/interfaces/store-interfaces/state-interfaces/name-request-interface.ts
+++ b/src/interfaces/store-interfaces/state-interfaces/name-request-interface.ts
@@ -33,7 +33,7 @@ export interface NameRequestNameIF {
  * Includes only the properties we care about.
  */
 export interface NameRequestIF {
-  applicants: NameRequestApplicantIF
+  applicants: NameRequestApplicantIF // object, not array
   consentFlag: string
   expirationDate: string // yyyy-mm-ddRhh:mm:ss+00:00
   legalType: CorpTypeCd
diff --git a/src/mixins/filing-template-mixin.ts b/src/mixins/filing-template-mixin.ts
index 29e931ff8..ca08ea46b 100644
--- a/src/mixins/filing-template-mixin.ts
+++ b/src/mixins/filing-template-mixin.ts
@@ -601,7 +601,7 @@ export default class FilingTemplateMixin extends DateMixin {
     // Build the main filing.
     const filing: DissolutionFilingIF = {
       header: {
-        name: FilingTypes.VOLUNTARY_DISSOLUTION,
+        name: FilingTypes.DISSOLUTION,
         certifiedBy: this.getCertifyState.certifiedBy,
         date: this.getCurrentDate,
         filingId: this.getFilingId,
diff --git a/src/mixins/name-request-mixin.ts b/src/mixins/name-request-mixin.ts
index 45713fb52..11c984e7f 100644
--- a/src/mixins/name-request-mixin.ts
+++ b/src/mixins/name-request-mixin.ts
@@ -63,4 +63,18 @@ export default class NameRequestMixin extends Vue {
     }
     return null // should never happen
   }
+
+  /**
+   * Map the request type to a display description.
+   * @param nrRequestType the name request type code
+   */
+  getNrRequestDesc (nrRequestType: NameRequestTypes): string {
+    switch (nrRequestType) {
+      case NameRequestTypes.NEW: return 'New Business'
+      case NameRequestTypes.CHANGE_NAME: return 'Change of Name'
+      case NameRequestTypes.CONVERSION: return 'Conversion'
+      case NameRequestTypes.RESTORATION: return 'Restoration'
+    }
+    return null // should never happen
+  }
 }
diff --git a/src/resources/BreadCrumbResource.ts b/src/resources/BreadCrumbResource.ts
index 27dfd7e5c..c170a4301 100644
--- a/src/resources/BreadCrumbResource.ts
+++ b/src/resources/BreadCrumbResource.ts
@@ -12,7 +12,7 @@ function getLegalName (): string {
   const getNameRequestApprovedName: string = store.getters.getNameRequestApprovedName
 
   switch (getFilingType) {
-    case FilingTypes.VOLUNTARY_DISSOLUTION: return getBusinessLegalName
+    case FilingTypes.DISSOLUTION: return getBusinessLegalName
     case FilingTypes.INCORPORATION_APPLICATION: return getNameRequestApprovedName
     case FilingTypes.REGISTRATION: return getNameRequestApprovedName
     case FilingTypes.RESTORATION: return getNameRequestApprovedName
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 43f056772..164b21b30 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -97,7 +97,7 @@ export const routes = [
     meta: {
       step: 1,
       requiresAuth: true,
-      filingType: FilingTypes.VOLUNTARY_DISSOLUTION
+      filingType: FilingTypes.DISSOLUTION
     }
   },
   {
@@ -107,7 +107,7 @@ export const routes = [
     meta: {
       step: 2,
       requiresAuth: true,
-      filingType: FilingTypes.VOLUNTARY_DISSOLUTION
+      filingType: FilingTypes.DISSOLUTION
     }
   },
   {
@@ -117,7 +117,7 @@ export const routes = [
     meta: {
       step: 3,
       requiresAuth: true,
-      filingType: FilingTypes.VOLUNTARY_DISSOLUTION
+      filingType: FilingTypes.DISSOLUTION
     }
   },
   {
@@ -127,7 +127,7 @@ export const routes = [
     meta: {
       step: 4,
       requiresAuth: true,
-      filingType: FilingTypes.VOLUNTARY_DISSOLUTION
+      filingType: FilingTypes.DISSOLUTION
     }
   },
   {
@@ -167,7 +167,7 @@ export const routes = [
     meta: {
       step: 1,
       requiresAuth: true,
-      filingType: FilingTypes.VOLUNTARY_DISSOLUTION,
+      filingType: FilingTypes.DISSOLUTION,
       noStepper: true // hide stepper for this route/filing type
     }
   },
diff --git a/src/store/getters/state-getters.ts b/src/store/getters/state-getters.ts
index 4b79cb09a..39a9afb34 100644
--- a/src/store/getters/state-getters.ts
+++ b/src/store/getters/state-getters.ts
@@ -1,6 +1,6 @@
 import Vuetify from 'vuetify'
 import { AccountTypes, CoopTypes, CorpTypeCd, DissolutionTypes, FilingNames, FilingTypes,
-  FilingTypesSubTitle, RestorationTypes } from '@/enums'
+  RestorationTypes } from '@/enums'
 import { AccountInformationIF, AddressIF, BusinessIF, CertifyIF, CompletingPartyIF, ContactPointIF,
   CourtOrderStepIF, CreateMemorandumIF, CreateResolutionIF, CreateRulesIF, DefineCompanyIF,
   DissolutionStatementIF, DissolutionStateIF, DocumentDeliveryIF, EffectiveDateTimeIF, FeesIF,
@@ -23,7 +23,7 @@ export const isIncorporationFiling = (state: StateIF): boolean => {
 
 /** Whether the current filing is a Dissolution. */
 export const isDissolutionFiling = (state: StateIF): boolean => {
-  return (getFilingType(state) === FilingTypes.VOLUNTARY_DISSOLUTION)
+  return (getFilingType(state) === FilingTypes.DISSOLUTION)
 }
 
 /** Whether the current filing is a Registration. */
@@ -57,7 +57,7 @@ export const getFilingName = (state: StateIF): FilingNames => {
     case FilingTypes.INCORPORATION_APPLICATION: return FilingNames.INCORPORATION_APPLICATION
     case FilingTypes.REGISTRATION: return FilingNames.REGISTRATION
     case FilingTypes.RESTORATION: return FilingNames.RESTORATION_APPLICATION
-    case FilingTypes.VOLUNTARY_DISSOLUTION:
+    case FilingTypes.DISSOLUTION:
       return isTypeFirm(state) ? FilingNames.DISSOLUTION_FIRM : FilingNames.VOLUNTARY_DISSOLUTION
     default: return null // should never happen
   }
@@ -208,7 +208,7 @@ export const getBusinessId = (state: StateIF): string => {
   return state.stateModel.business.businessId
 }
 
-/** The Business Identifier. */
+/** The Business Number (aka Tax ID). */
 export const getBusinessNumber = (state: StateIF): string => {
   return state.stateModel.business.taxId
 }
@@ -218,7 +218,7 @@ export const getEntityIdentifier = (state: StateIF): string => {
     case FilingTypes.INCORPORATION_APPLICATION: return getTempId(state)
     case FilingTypes.REGISTRATION: return getTempId(state)
     case FilingTypes.RESTORATION: return getBusinessId(state)
-    case FilingTypes.VOLUNTARY_DISSOLUTION: return getBusinessId(state)
+    case FilingTypes.DISSOLUTION: return getBusinessId(state)
   }
 }
 
@@ -660,23 +660,11 @@ export const isDissolutionDefineDissolutionValid = (state: StateIF): boolean =>
   return isCoopDefineDissolutionValid && isDissolutionCustodianValid(state)
 }
 
-//
-// Registration getters
-//
-
 /** The registration object. */
 export const getRegistration = (state: StateIF): RegistrationStateIF => {
   return state.stateModel.registration
 }
 
-/** The current filing subtitle. */
-export const getFilingSubtitle = (state: StateIF): string => {
-  if (isDissolutionFiling(state) && isTypeFirm(state)) {
-    return FilingTypesSubTitle.SOLE_PROP_SUB_TITLE
-  }
-  return null
-}
-
 /** The completing party data. */
 export const getCompletingParty = (state: StateIF): CompletingPartyIF => {
   return state.stateModel.completingParty
diff --git a/src/utils/feature-flag-utils.ts b/src/utils/feature-flag-utils.ts
index e60e1c0cf..71398d1bb 100644
--- a/src/utils/feature-flag-utils.ts
+++ b/src/utils/feature-flag-utils.ts
@@ -10,8 +10,8 @@ declare const window: any
  */
 const defaultFlagSet: LDFlagSet = {
   'supported-filings': [
+    FilingTypes.DISSOLUTION,
     FilingTypes.INCORPORATION_APPLICATION,
-    FilingTypes.VOLUNTARY_DISSOLUTION,
     FilingTypes.REGISTRATION
   ]
 }
diff --git a/src/views/Incorporation/IncorporationDefineCompany.vue b/src/views/Incorporation/IncorporationDefineCompany.vue
index b39cdc5fa..a81f1611c 100644
--- a/src/views/Incorporation/IncorporationDefineCompany.vue
+++ b/src/views/Incorporation/IncorporationDefineCompany.vue
@@ -338,10 +338,8 @@ h2::before {
   }
 }
 
-header {
-  p {
-    padding-top:0.5rem
-  }
+header p {
+  padding-top:0.5rem
 }
 
 // Coop Type Help section
diff --git a/src/views/Restoration/RestorationApplicantInformation.vue b/src/views/Restoration/RestorationApplicantInformation.vue
index ead066d4c..796beccf4 100644
--- a/src/views/Restoration/RestorationApplicantInformation.vue
+++ b/src/views/Restoration/RestorationApplicantInformation.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="restoration-applicant-information">
-    <section class="mt-10">
-      <header id="people-role-header">
+    <section id="add-applicant-info-section" class="mt-10">
+      <header>
         <h2>{{ getPeopleAndRolesResource.header }}</h2>
       </header>
 
@@ -42,7 +42,7 @@ export default class RestorationApplicantInformation extends Vue {
           peopleAndRoles: this.getAddPeopleAndRoleStep.valid
         },
         [
-          'people-and-roles'
+          'add-applicant-info-section'
         ]
       )
     }
diff --git a/src/views/Restoration/RestorationBusinessInformation.vue b/src/views/Restoration/RestorationBusinessInformation.vue
index afb6c4eb4..f7d16de59 100644
--- a/src/views/Restoration/RestorationBusinessInformation.vue
+++ b/src/views/Restoration/RestorationBusinessInformation.vue
@@ -234,10 +234,8 @@ h2::before {
   }
 }
 
-header {
-  p {
-    padding-top:0.5rem
-  }
+header p {
+  padding-top:0.5rem
 }
 
 // Coop Type Help section
diff --git a/src/views/Restoration/RestorationBusinessName.vue b/src/views/Restoration/RestorationBusinessName.vue
index cd28b076f..be870a3d4 100644
--- a/src/views/Restoration/RestorationBusinessName.vue
+++ b/src/views/Restoration/RestorationBusinessName.vue
@@ -1,138 +1,30 @@
 <template>
   <div id="restoration-business-name">
     <!-- Name -->
-    <section class="mt-10">
-      <header id="name-header">
+    <section id="name-section" class="mt-10">
+      <header>
         <h2>Name</h2>
+        <p>Add a Name Request that is reserved for this restoration application or restore
+          as a numbered company.</p>
       </header>
 
       <v-card flat class="mt-5">
-        <NameRequestInfo
+        <BusinessName
           @hasNameTranslation="onNameTranslation($event)"
         />
       </v-card>
     </section>
 
-    <!-- Cooperative Association Type -->
-    <section class="mt-10" v-show="isTypeCoop">
-      <header id="association-type-header">
-        <h2>Cooperative Association Type</h2>
-        <!-- Help Section -->
-        <div class="mt-4">
-          <span class="help-btn" @click="coopHelpToggle = !coopHelpToggle">
-            <v-icon color="primary" style="padding-right: 5px">mdi-help-circle-outline</v-icon>
-            <span v-if="!coopHelpToggle">Help with Cooperative Association Types</span>
-            <span v-else>Hide Help</span>
-          </span>
-          <section v-show="coopHelpToggle" class="coop-type-help">
-            <header id="coop-type-help-header">
-              <h2>Help with Cooperative Association Types</h2>
-            </header>
-
-            <p><strong>Community Service Cooperatives</strong> are a particular kind of cooperative
-              recognized under the Cooperative Association Act. Community Service Cooperatives have a
-              similar status to that of non-profit societies. This type of cooperative also requires the
-              inclusion of non-alterable clauses in their rules to ensure they operate on a non-profit
-              basis, and their purpose is charitable, or to provide health, social, educational, or other
-              community services. Community Service Cooperatives cannot be Housing Cooperatives and cannot
-              issue investment shares.
-            </p>
-            <p><strong>Housing Cooperatives</strong> are a specific type of cooperative incorporated under
-              the Cooperative Association Act that provides housing to its members. Members may purchase
-              shares to join the Housing Cooperative and elect directors who will govern the cooperative.
-              Housing Cooperatives cannot issue investment shares. The Cooperative Association Act details
-              special provisions for Housing Cooperatives that need to be considered when deciding to
-              incorporate.
-            </p>
-            <p>An <strong>Ordinary Cooperative</strong> is a cooperative that may have a wide range of
-              purposes and is neither a Housing nor a Community Service Cooperative. The cooperative may
-              operate as a for-profit association and may issue investment shares.
-            </p>
-            <u class="help-btn" @click="coopHelpToggle = !coopHelpToggle"><small>Hide Help</small></u>
-          </section>
-        </div>
+    <!-- Restoration Type -->
+    <section id="restoration-type-section" class="mt-10">
+      <header>
+        <h2>Restoration Type</h2>
+        <p>Determine the restoration and approval type.</p>
       </header>
-
-      <div :class="{ 'invalid-section': getShowErrors && !hasValidCooperativeType }">
-        <v-card flat class="step-container">
-          <CooperativeType
-            :showErrors="getShowErrors"
-            @hasCooperativeType="onCooperativeType($event)"
-          />
-        </v-card>
+      <div :class="{ 'invalid-section': getShowErrors && !getRestorationTypeValid }">
+        <RestorationType />
       </div>
     </section>
-
-      <!--Restoration Type is here-->
-      <section class="mt-10">
-        <header>
-          <h2>Restoration Type</h2>
-          <p>Determine the restoration and approval type.</p>
-        </header>
-        <div :class="{ 'invalid-section': getShowErrors && !getRestorationTypeValid }">
-          <RestorationType />
-        </div>
-      </section>
-
-    <!-- Registered Office Addresses -->
-    <section class="mt-10" v-show="isEntityType">
-      <header id="office-address-header">
-        <h2>Registered <span v-if="!isTypeCoop">and Records</span> Office
-          Addresses</h2>
-        <p>Enter the Registered Office <span v-if="!isTypeCoop">and Records Office
-          </span> Mailing and Delivery Addresses. All addresses must be located in BC.
-        </p>
-      </header>
-
-      <div :class="{ 'invalid-section': getShowErrors && !addressFormValid }">
-        <OfficeAddresses
-          :showErrors="getShowErrors"
-          :inputAddresses="addresses"
-          @update:addresses="setOfficeAddresses($event)"
-          @valid="onAddressFormValidityChange($event)"
-        />
-      </div>
-    </section>
-
-    <!-- Registered Office Contact Information -->
-    <section class="mt-10" v-show="isEntityType">
-      <header id="registered-office-contact-header">
-        <h2>Registered Office Contact Information</h2>
-        <p>Enter the contact information for the business. The Corporate Registry will use this to communicate with the
-          business in the future, including sending documents and notifications.
-        </p>
-      </header>
-
-      <v-card flat class="py-8 px-6"
-        :class="{ 'invalid-section': getShowErrors && !businessContactFormValid }"
-      >
-        <BusinessContactInfo
-          :initialValue="getBusinessContact"
-          :isEditing="true"
-          :showErrors="getShowErrors"
-          @update="setBusinessContact($event)"
-          @valid="onBusinessContactFormValidityChange($event)"
-        />
-      </v-card>
-    </section>
-
-    <!-- Folio / Reference Number -->
-    <section class="mt-10" v-if="isEntityType && isPremiumAccount">
-      <header id="folio-number-header">
-        <h2>Folio / Reference Number (Optional)</h2>
-        <p>Add an optional Folio or Reference Number about this business for your own tracking purposes.
-           This information is not used by the BC Business Registry.
-        </p>
-      </header>
-
-      <v-card flat class="step-container">
-        <FolioNumber
-          :initialValue="getFolioNumber"
-          :isEditing="true"
-          @update="setFolioNumber($event)"
-        />
-      </v-card>
-    </section>
   </div>
 </template>
 
@@ -140,28 +32,15 @@
 import Vue from 'vue'
 import { Component, Watch } from 'vue-property-decorator'
 import { Getter, Action } from 'vuex-class'
-import {
-  ActionBindingIF,
-  AddressIF,
-  ContactPointIF,
-  DefineCompanyIF,
-  RegisteredRecordsAddressesIF
-} from '@/interfaces'
+import { ActionBindingIF } from '@/interfaces'
 import { CommonMixin } from '@/mixins'
-import { CoopTypes, CorpTypeCd, RouteNames } from '@/enums'
-import BusinessContactInfo from '@/components/common/BusinessContactInfo.vue'
-import CooperativeType from '@/components/Dissolution/CooperativeType.vue'
-import FolioNumber from '@/components/common/FolioNumber.vue'
-import NameRequestInfo from '@/components/common/NameRequestInfo.vue'
-import OfficeAddresses from '@/components/common/OfficeAddresses.vue'
+import { CorpTypeCd, RouteNames } from '@/enums'
+import BusinessName from '@/components/Restoration/BusinessName.vue'
 import RestorationType from '@/components/Restoration/RestorationType.vue'
+
 @Component({
   components: {
-    BusinessContactInfo,
-    CooperativeType,
-    FolioNumber,
-    NameRequestInfo,
-    OfficeAddresses,
+    BusinessName,
     RestorationType
   },
   mixins: [
@@ -169,122 +48,47 @@ import RestorationType from '@/components/Restoration/RestorationType.vue'
   ]
 })
 export default class RestorationBusinessName extends Vue {
-  @Getter isEntityType!: boolean
-  @Getter isPremiumAccount!: boolean
-  @Getter isTypeBcomp!: boolean
-  @Getter isTypeCoop!: boolean
-  @Getter getDefineCompanyStep!: DefineCompanyIF
   @Getter getShowErrors!: boolean
-  @Getter getBusinessContact!: ContactPointIF
-  @Getter getFolioNumber!: string
-  @Getter getRestorationTypeValid!: boolean
 
-  @Action setBusinessContact!: ActionBindingIF
-  @Action setCooperativeType!: ActionBindingIF
-  @Action setFolioNumber!: ActionBindingIF
-  @Action setOfficeAddresses!: ActionBindingIF
   @Action setDefineCompanyStepValidity!: ActionBindingIF
   @Action setIgnoreChanges!: ActionBindingIF
 
-  protected businessContactFormValid = false
-  protected addressFormValid = false
   protected hasValidNameTranslation = true
-  protected hasValidCooperativeType = false
-  protected coopHelpToggle = false
+
   // Enum for template
   readonly CorpTypeCd = CorpTypeCd
-  get addresses (): RegisteredRecordsAddressesIF {
-    return this.getDefineCompanyStep.officeAddresses as RegisteredRecordsAddressesIF
-  }
+
   /** Called when component is created. */
   created (): void {
     // temporarily ignore data changes
     this.setIgnoreChanges(true)
-    // if no addresses were fetched, set default addresses
-    if (!this.addresses.registeredOffice && !this.addresses.recordsOffice) {
-      this.setDefaultAddresses()
-    }
+
     // watch data changes once page has loaded (in next tick)
     Vue.nextTick(() => {
       this.setIgnoreChanges(false)
     })
   }
-  /** Sets default addresses in filing. (Will get overwritten by a fetched draft filing if there is one.) */
-  private setDefaultAddresses (): void {
-    const defaultAddress: AddressIF = {
-      addressCity: '',
-      addressCountry: 'CA',
-      addressRegion: 'BC',
-      deliveryInstructions: '',
-      postalCode: '',
-      streetAddress: '',
-      streetAddressAdditional: ''
-    }
-    if (this.isTypeBcomp) {
-      this.setOfficeAddresses({
-        registeredOffice: {
-          mailingAddress: defaultAddress,
-          deliveryAddress: defaultAddress
-        },
-        recordsOffice: {
-          mailingAddress: defaultAddress,
-          deliveryAddress: defaultAddress
-        }
-      })
-    } else {
-      this.setOfficeAddresses({
-        registeredOffice: {
-          mailingAddress: defaultAddress,
-          deliveryAddress: defaultAddress
-        }
-      })
-    }
-  }
+
   private onNameTranslation (valid: boolean): void {
-    this.hasValidNameTranslation = valid
-    this.setDefineCompanyStepValidity(
-      this.businessContactFormValid &&
-      this.addressFormValid &&
-      this.hasValidNameTranslation
-    )
-  }
-  private onCooperativeType (cooperativeType: CoopTypes): void {
-    this.hasValidCooperativeType = !!cooperativeType
-    this.setCooperativeType(cooperativeType)
-  }
-  private onBusinessContactFormValidityChange (valid: boolean): void {
-    this.businessContactFormValid = valid
-    this.setDefineCompanyStepValidity(
-      this.businessContactFormValid &&
-      this.addressFormValid &&
-      this.hasValidNameTranslation
-    )
-  }
-  private onAddressFormValidityChange (valid: boolean): void {
-    this.addressFormValid = valid
-    this.setDefineCompanyStepValidity(
-      this.businessContactFormValid &&
-      this.addressFormValid &&
-      this.hasValidNameTranslation
-    )
+    // *** TODO: hook this up
+    // this.hasValidNameTranslation = valid
+    // this.setDefineCompanyStepValidity(
+    //   this.hasValidNameTranslation
+    // )
   }
   @Watch('$route')
   private async scrollToInvalidComponent (): Promise<void> {
-    if (this.getShowErrors && this.$route.name === RouteNames.INCORPORATION_DEFINE_COMPANY) {
+    if (this.getShowErrors && this.$route.name === RouteNames.RESTORATION_BUSINESS_NAME) {
       // scroll to invalid components
       await Vue.nextTick()
       await this.validateAndScroll(
         {
           hasValidNameTranslation: this.hasValidNameTranslation,
-          hasValidCooperativeType: this.isTypeCoop ? this.hasValidCooperativeType : true,
-          addressFormValid: this.addressFormValid,
-          businessContactFormValid: this.businessContactFormValid
+          hasValidRestorationType: this.getRestorationTypeValid
         },
         [
-          'name-header',
-          'association-type-header',
-          'office-address-header',
-          'registered-office-contact-header'
+          'name-section',
+          'restoration-type-section'
         ]
       )
     }
@@ -294,30 +98,37 @@ export default class RestorationBusinessName extends Vue {
 
 <style lang="scss" scoped>
 @import '@/assets/styles/theme.scss';
+
 #restoration-business-name {
   /* Set "header-counter" to 0 */
   counter-reset: header-counter;
 }
+
 h2::before {
   /* Increment "header-counter" by 1 */
   counter-increment: header-counter;
   content: counter(header-counter) '. ';
 }
+
 .value.name-request {
   width: 100%;
   min-width: 24rem;
 }
+
 .meta-container {
   display: flex;
   flex-flow: column nowrap;
   position: relative;
+
   > label:first-child {
     font-weight: bold;
   }
 }
+
 @media (min-width: 768px) {
   .meta-container {
     flex-flow: row nowrap;
+
     > label:first-child {
       flex: 0 0 auto;
       padding-right: 2rem;
@@ -325,41 +136,8 @@ h2::before {
     }
   }
 }
-#business-buttons-container {
-  .v-btn + .v-btn {
-    margin-left: 0.5rem;
-  }
-}
-header {
-  p {
-    padding-top:0.5rem
-  }
-}
-// Coop Type Help section
-.help-btn {
-  cursor: pointer;
-  color: $app-blue;
-  vertical-align: middle;
-}
-.coop-type-help {
-  margin: 2rem 0;
-  border-top: 1px dashed $gray6;
-  border-bottom: 1px dashed $gray6;
-  padding: 1rem 0;
-  #coop-type-help-header {
-    display: flex;
-    justify-content: center;
-  }
-  h2, h4 {
-    padding: 1rem 0;
-  }
-  u {
-    display: flex;
-    direction: rtl;
-  }
-}
-// Vuetify Overrides
-:deep(.v-select__selection--comma) {
-  overflow: inherit;
+
+header p {
+  padding-top:0.5rem
 }
 </style>
diff --git a/tests/unit/App.spec.ts b/tests/unit/App.spec.ts
index f8418a963..486266aef 100644
--- a/tests/unit/App.spec.ts
+++ b/tests/unit/App.spec.ts
@@ -636,7 +636,7 @@ describe('Incorporation - Define Company page for a BEN (named)', () => {
   })
 })
 
-describe('Dissolution - Define Dissolution page for a BEN', () => {
+describe('Voluntary Dissolution - Define Dissolution page for a BEN', () => {
   let wrapper: any
   const { assign } = window.location
 
@@ -894,8 +894,7 @@ describe('Dissolution - Define Dissolution page for a BEN', () => {
   })
 })
 
-// *** TODO: implement more tests!
-describe('Restoration - Restore Business Name page for a BEN', () => {
+describe('Restoration - App page', () => {
   let wrapper: any
   const { assign } = window.location
 
diff --git a/tests/unit/NameRequestInfo.spec.ts b/tests/unit/NameRequestInfo.spec.ts
index 231689fc2..114f1b41f 100644
--- a/tests/unit/NameRequestInfo.spec.ts
+++ b/tests/unit/NameRequestInfo.spec.ts
@@ -3,8 +3,7 @@ import Vuetify from 'vuetify'
 import { mount } from '@vue/test-utils'
 import { getVuexStore } from '@/store'
 import NameRequestInfo from '@/components/common/NameRequestInfo.vue'
-import AddNameTranslation from '@/components/common/AddNameTranslation.vue'
-import ListNameTranslations from '@/components/common/ListNameTranslations.vue'
+import NameTranslation from '@/components/common/NameTranslation.vue'
 
 Vue.use(Vuetify)
 
@@ -59,84 +58,65 @@ describe('Name Request Info with a NR', () => {
   })
 
   it('renders name request info labels', () => {
-    expect(wrapper.vm.$el.querySelector('#name-request-info').textContent)
+    expect(wrapper.vm.$el.querySelector('#name-request').textContent)
       .toContain('Name Request')
 
-    expect(wrapper.vm.$el.querySelector('#name-request-applicant-info').textContent)
+    expect(wrapper.vm.$el.querySelector('#name-request-applicant').textContent)
       .toContain('Name Request Applicant')
+
+    // verify that Name Translation component is rendered
+    expect(wrapper.findComponent(NameTranslation).exists()).toBe(true)
   })
 
   it('renders the Name Request information with no data', () => {
-    const nrListSelector = '#name-request-info ul li'
-    const itemCount = wrapper.vm.$el.querySelectorAll(nrListSelector).length
-
-    expect(itemCount).toEqual(5)
     expect(wrapper.find('#condition-consent').exists()).toBe(false)
 
-    const title = wrapper.vm.$el.querySelectorAll(nrListSelector)[0]
-    const entityType = wrapper.vm.$el.querySelectorAll(nrListSelector)[1]
-    const requestType = wrapper.vm.$el.querySelectorAll(nrListSelector)[2]
-    const expiryDate = wrapper.vm.$el.querySelectorAll(nrListSelector)[3]
-    const status = wrapper.vm.$el.querySelectorAll(nrListSelector)[4]
-
-    expect(title.textContent).toBeDefined()
-    expect(entityType.textContent).toContain('Entity Type:')
-    expect(requestType.textContent).toContain('Request Type:')
-    expect(expiryDate.textContent).toContain('Expiry Date:')
-    expect(status.textContent).toContain('Status:')
+    const listItems = wrapper.vm.$el.querySelectorAll('#name-request ul li')
+    expect(listItems.length).toEqual(5)
+
+    expect(listItems[0].textContent).toBeDefined()
+    expect(listItems[1].textContent).toContain('Entity Type:')
+    expect(listItems[2].textContent).toContain('Request Type:')
+    expect(listItems[3].textContent).toContain('Expiry Date:')
+    expect(listItems[4].textContent).toContain('Status:')
   })
 
   it('renders the Name Request information with data', async () => {
     await wrapper.vm.$store.commit('mutateNameRequest', { ...mockNrData })
     await wrapper.vm.$store.commit('mutateNameRequestApprovedName', mockNrData.names[0].name)
 
-    const nrListSelector = '#name-request-info ul li'
-    const itemCount = wrapper.vm.$el.querySelectorAll(nrListSelector).length
-    const title = wrapper.vm.$el.querySelectorAll(nrListSelector)[0]
-    const entityType = wrapper.vm.$el.querySelectorAll(nrListSelector)[1]
-    const requestType = wrapper.vm.$el.querySelectorAll(nrListSelector)[2]
-    const expiryDate = wrapper.vm.$el.querySelectorAll(nrListSelector)[3]
-    const status = wrapper.vm.$el.querySelectorAll(nrListSelector)[4]
-
-    expect(itemCount).toEqual(5)
     expect(wrapper.find('#condition-consent').exists()).toBe(false)
-    expect(title.textContent).toContain('NR 1234567 - MADRONA BREAD BASKET INC.')
-    expect(entityType.textContent).toContain('Entity Type: BC Benefit Company')
-    expect(requestType.textContent).toContain('Request Type: New Business')
-    expect(expiryDate.textContent).toContain('Expiry Date: Jun 24, 2020')
-    expect(status.textContent).toContain('Status: Approved')
+
+    const listItems = wrapper.vm.$el.querySelectorAll('#name-request ul li')
+    expect(listItems.length).toEqual(5)
+
+    expect(listItems[0].textContent).toContain('NR 1234567 - MADRONA BREAD BASKET INC.')
+    expect(listItems[1].textContent).toContain('Entity Type: BC Benefit Company')
+    expect(listItems[2].textContent).toContain('Request Type: New Business')
+    expect(listItems[3].textContent).toContain('Expiry Date: Jun 24, 2020')
+    expect(listItems[4].textContent).toContain('Status: Approved')
   })
 
   it('renders the Name Request applicant information with data', async () => {
     await wrapper.vm.$store.commit('mutateNameRequest', { ...mockNrData })
 
-    const nrListSelector = '#name-request-applicant-info ul li'
-    const itemCount = wrapper.vm.$el.querySelectorAll(nrListSelector).length
-    const name = wrapper.vm.$el.querySelectorAll(nrListSelector)[0]
-    const address = wrapper.vm.$el.querySelectorAll(nrListSelector)[1]
-    const email = wrapper.vm.$el.querySelectorAll(nrListSelector)[2]
-    const phone = wrapper.vm.$el.querySelectorAll(nrListSelector)[3]
-
-    expect(itemCount).toEqual(4)
-    expect(name.textContent).toContain('Name: John Joe Doe')
-    expect(address.textContent).toContain('Address: 45 Frasier Drive, Victoria, BC, V9E 2A1, Canada')
-    expect(email.textContent).toContain('Email: test@gov.bc.ca')
-    expect(phone.textContent).toContain('Phone: 250-356-9090')
+    const listItems = wrapper.vm.$el.querySelectorAll('#name-request-applicant ul li')
+    expect(listItems.length).toEqual(4)
+
+    expect(listItems[0].textContent).toContain('Name: John Joe Doe')
+    expect(listItems[1].textContent).toContain('Address: 45 Frasier Drive, Victoria, BC, V9E 2A1, Canada')
+    expect(listItems[2].textContent).toContain('Email: test@gov.bc.ca')
+    expect(listItems[3].textContent).toContain('Phone: 250-356-9090')
   })
 
   it('renders the Name Request applicant information with no data', () => {
-    const nrListSelector = '#name-request-applicant-info ul li'
-    const itemCount = wrapper.vm.$el.querySelectorAll(nrListSelector).length
-    expect(itemCount).toEqual(4)
-
-    const name = wrapper.vm.$el.querySelectorAll(nrListSelector)[0]
-    const address = wrapper.vm.$el.querySelectorAll(nrListSelector)[1]
-    const email = wrapper.vm.$el.querySelectorAll(nrListSelector)[2]
-    const phone = wrapper.vm.$el.querySelectorAll(nrListSelector)[3]
-    expect(name.textContent).toContain('Name:')
-    expect(address.textContent).toContain('Address:')
-    expect(email.textContent).toContain('Email:')
-    expect(phone.textContent).toContain('Phone:')
+    const listItems = wrapper.vm.$el.querySelectorAll('#name-request-applicant ul li')
+    expect(listItems.length).toEqual(4)
+
+    expect(listItems[0].textContent).toContain('Name:')
+    expect(listItems[1].textContent).toContain('Address:')
+    expect(listItems[2].textContent).toContain('Email:')
+    expect(listItems[3].textContent).toContain('Phone:')
   })
 
   it('renders the Name Request applicant information with multi address line data', async () => {
@@ -146,18 +126,13 @@ describe('Name Request Info with a NR', () => {
     store.state.stateModel.nameRequest.applicants.addrLine3 = 'line 3'
     await Vue.nextTick()
 
-    const nrListSelector = '#name-request-applicant-info ul li'
-    const itemCount = wrapper.vm.$el.querySelectorAll(nrListSelector).length
-    const name = wrapper.vm.$el.querySelectorAll(nrListSelector)[0]
-    const address = wrapper.vm.$el.querySelectorAll(nrListSelector)[1]
-    const email = wrapper.vm.$el.querySelectorAll(nrListSelector)[2]
-    const phone = wrapper.vm.$el.querySelectorAll(nrListSelector)[3]
-
-    expect(itemCount).toEqual(4)
-    expect(name.textContent).toContain('Name: John Joe Doe')
-    expect(address.textContent).toContain('Address: line 1, line 2, line 3, Victoria, BC, V9E 2A1, Canada')
-    expect(email.textContent).toContain('Email: test@gov.bc.ca')
-    expect(phone.textContent).toContain('Phone: 250-356-9090')
+    const listItems = wrapper.vm.$el.querySelectorAll('#name-request-applicant ul li')
+    expect(listItems.length).toEqual(4)
+
+    expect(listItems[0].textContent).toContain('Name: John Joe Doe')
+    expect(listItems[1].textContent).toContain('Address: line 1, line 2, line 3, Victoria, BC, V9E 2A1, Canada')
+    expect(listItems[2].textContent).toContain('Email: test@gov.bc.ca')
+    expect(listItems[3].textContent).toContain('Phone: 250-356-9090')
   })
 
   it('renders the Name Request information with consent not required', async () => {
@@ -167,22 +142,17 @@ describe('Name Request Info with a NR', () => {
     store.state.stateModel.nameRequestApprovedName = mockNrData.names[0].name
     await Vue.nextTick()
 
-    const nrListSelector = '#name-request-info ul li'
-    const itemCount = wrapper.vm.$el.querySelectorAll(nrListSelector).length
-    const title = wrapper.vm.$el.querySelectorAll(nrListSelector)[0]
-    const entityType = wrapper.vm.$el.querySelectorAll(nrListSelector)[1]
-    const requestType = wrapper.vm.$el.querySelectorAll(nrListSelector)[2]
-    const expiryDate = wrapper.vm.$el.querySelectorAll(nrListSelector)[3]
-    const status = wrapper.vm.$el.querySelectorAll(nrListSelector)[4]
-    const conditionConsent = wrapper.vm.$el.querySelectorAll(nrListSelector)[5]
-    expect(itemCount).toEqual(6)
     expect(wrapper.find('#condition-consent').exists()).toBe(true)
-    expect(title.textContent).toContain('NR 1234567 - MADRONA BREAD BASKET INC.')
-    expect(entityType.textContent).toContain('Entity Type: BC Benefit Company')
-    expect(requestType.textContent).toContain('Request Type: New Business')
-    expect(expiryDate.textContent).toContain('Expiry Date: Jun 24, 2020')
-    expect(status.textContent).toContain('Status: Conditional')
-    expect(conditionConsent.textContent).toContain('Condition/Consent: Not Required')
+
+    const listItems = wrapper.vm.$el.querySelectorAll('#name-request ul li')
+    expect(listItems.length).toEqual(6)
+
+    expect(listItems[0].textContent).toContain('NR 1234567 - MADRONA BREAD BASKET INC.')
+    expect(listItems[1].textContent).toContain('Entity Type: BC Benefit Company')
+    expect(listItems[2].textContent).toContain('Request Type: New Business')
+    expect(listItems[3].textContent).toContain('Expiry Date: Jun 24, 2020')
+    expect(listItems[4].textContent).toContain('Status: Conditional')
+    expect(listItems[5].textContent).toContain('Condition/Consent: Not Required')
   })
 
   it('renders the Name Request information with consent received', async () => {
@@ -192,22 +162,17 @@ describe('Name Request Info with a NR', () => {
     store.state.stateModel.nameRequestApprovedName = mockNrData.names[0].name
     await Vue.nextTick()
 
-    const nrListSelector = '#name-request-info ul li'
-    const itemCount = wrapper.vm.$el.querySelectorAll(nrListSelector).length
-    const title = wrapper.vm.$el.querySelectorAll(nrListSelector)[0]
-    const entityType = wrapper.vm.$el.querySelectorAll(nrListSelector)[1]
-    const requestType = wrapper.vm.$el.querySelectorAll(nrListSelector)[2]
-    const expiryDate = wrapper.vm.$el.querySelectorAll(nrListSelector)[3]
-    const status = wrapper.vm.$el.querySelectorAll(nrListSelector)[4]
-    const conditionConsent = wrapper.vm.$el.querySelectorAll(nrListSelector)[5]
-    expect(itemCount).toEqual(6)
     expect(wrapper.find('#condition-consent').exists()).toBe(true)
-    expect(title.textContent).toContain('NR 1234567 - MADRONA BREAD BASKET INC.')
-    expect(entityType.textContent).toContain('Entity Type: BC Benefit Company')
-    expect(requestType.textContent).toContain('Request Type: New Business')
-    expect(expiryDate.textContent).toContain('Expiry Date: Jun 24, 2020')
-    expect(status.textContent).toContain('Status: Conditional')
-    expect(conditionConsent.textContent).toContain('Condition/Consent: Received')
+
+    const listItems = wrapper.vm.$el.querySelectorAll('#name-request ul li')
+    expect(listItems.length).toEqual(6)
+
+    expect(listItems[0].textContent).toContain('NR 1234567 - MADRONA BREAD BASKET INC.')
+    expect(listItems[1].textContent).toContain('Entity Type: BC Benefit Company')
+    expect(listItems[2].textContent).toContain('Request Type: New Business')
+    expect(listItems[3].textContent).toContain('Expiry Date: Jun 24, 2020')
+    expect(listItems[4].textContent).toContain('Status: Conditional')
+    expect(listItems[5].textContent).toContain('Condition/Consent: Received')
   })
 
   it('renders the Name Request information with consent waived', async () => {
@@ -217,22 +182,17 @@ describe('Name Request Info with a NR', () => {
     store.state.stateModel.nameRequestApprovedName = mockNrData.names[0].name
     await Vue.nextTick()
 
-    const nrListSelector = '#name-request-info ul li'
-    const itemCount = wrapper.vm.$el.querySelectorAll(nrListSelector).length
-    const title = wrapper.vm.$el.querySelectorAll(nrListSelector)[0]
-    const entityType = wrapper.vm.$el.querySelectorAll(nrListSelector)[1]
-    const requestType = wrapper.vm.$el.querySelectorAll(nrListSelector)[2]
-    const expiryDate = wrapper.vm.$el.querySelectorAll(nrListSelector)[3]
-    const status = wrapper.vm.$el.querySelectorAll(nrListSelector)[4]
-    const conditionConsent = wrapper.vm.$el.querySelectorAll(nrListSelector)[5]
-    expect(itemCount).toEqual(6)
     expect(wrapper.find('#condition-consent').exists()).toBe(true)
-    expect(title.textContent).toContain('NR 1234567 - MADRONA BREAD BASKET INC.')
-    expect(entityType.textContent).toContain('Entity Type: BC Benefit Company')
-    expect(requestType.textContent).toContain('Request Type: New Business')
-    expect(expiryDate.textContent).toContain('Expiry Date: Jun 24, 2020')
-    expect(status.textContent).toContain('Status: Conditional')
-    expect(conditionConsent.textContent).toContain('Condition/Consent: Waived')
+
+    const listItems = wrapper.vm.$el.querySelectorAll('#name-request ul li')
+    expect(listItems.length).toEqual(6)
+
+    expect(listItems[0].textContent).toContain('NR 1234567 - MADRONA BREAD BASKET INC.')
+    expect(listItems[1].textContent).toContain('Entity Type: BC Benefit Company')
+    expect(listItems[2].textContent).toContain('Request Type: New Business')
+    expect(listItems[3].textContent).toContain('Expiry Date: Jun 24, 2020')
+    expect(listItems[4].textContent).toContain('Status: Conditional')
+    expect(listItems[5].textContent).toContain('Condition/Consent: Waived')
   })
 
   it('renders the Name Request information with consent required', async () => {
@@ -242,23 +202,17 @@ describe('Name Request Info with a NR', () => {
     store.state.stateModel.nameRequestApprovedName = mockNrData.names[0].name
     await Vue.nextTick()
 
-    const nrListSelector = '#name-request-info ul li'
-    const itemCount = wrapper.vm.$el.querySelectorAll(nrListSelector).length
-    const title = wrapper.vm.$el.querySelectorAll(nrListSelector)[0]
-    const entityType = wrapper.vm.$el.querySelectorAll(nrListSelector)[1]
-    const requestType = wrapper.vm.$el.querySelectorAll(nrListSelector)[2]
-    const expiryDate = wrapper.vm.$el.querySelectorAll(nrListSelector)[3]
-    const status = wrapper.vm.$el.querySelectorAll(nrListSelector)[4]
-    const conditionConsent = wrapper.vm.$el.querySelectorAll(nrListSelector)[5]
-
-    expect(itemCount).toEqual(6)
     expect(wrapper.find('#condition-consent').exists()).toBe(true)
-    expect(title.textContent).toContain('NR 1234567 - MADRONA BREAD BASKET INC.')
-    expect(entityType.textContent).toContain('Entity Type: BC Benefit Company')
-    expect(requestType.textContent).toContain('Request Type: New Business')
-    expect(expiryDate.textContent).toContain('Expiry Date: Jun 24, 2020')
-    expect(status.textContent).toContain('Status: Conditional')
-    expect(conditionConsent.textContent).toContain('Condition/Consent: Not Received')
+
+    const listItems = wrapper.vm.$el.querySelectorAll('#name-request ul li')
+    expect(listItems.length).toEqual(6)
+
+    expect(listItems[0].textContent).toContain('NR 1234567 - MADRONA BREAD BASKET INC.')
+    expect(listItems[1].textContent).toContain('Entity Type: BC Benefit Company')
+    expect(listItems[2].textContent).toContain('Request Type: New Business')
+    expect(listItems[3].textContent).toContain('Expiry Date: Jun 24, 2020')
+    expect(listItems[4].textContent).toContain('Status: Conditional')
+    expect(listItems[5].textContent).toContain('Condition/Consent: Not Received')
   })
 })
 
@@ -287,68 +241,13 @@ describe('Name Request Info component without a NR', () => {
 
   it('renders the numbered company content', () => {
     const listItems = wrapper.vm.$el.querySelectorAll('.numbered-company-list-items li')
-
-    const title = listItems[0]
-    const entityType = listItems[1]
-    const requestType = listItems[2]
-    const bulletOne = listItems[3]
-    const bulletTwo = listItems[4]
-    const bulletThree = listItems[5]
-
-    expect(title.textContent).toContain('[Incorporation Number] B.C. Ltd.')
-    expect(entityType.textContent).toContain('Entity Type: BC Benefit Company')
-    expect(requestType.textContent).toContain('Request Type: New Business')
-
-    expect(bulletOne.textContent).toContain('You will be filing this Incorporation Application')
-    expect(bulletTwo.textContent).toContain('Your Incorporation Number will be generated at the end')
-    expect(bulletThree.textContent).toContain('It is not possible to request a specific Incorporation Number')
-  })
-})
-
-describe('Name Request Info component - Name Translation section', () => {
-  let wrapper: any
-
-  beforeEach(() => {
-    // Entity type will always be set with or without an NR
-    store.state.stateModel.entityType = 'BEN'
-    // Temp Id will always be set with or without an NR
-    store.state.stateModel.tempId = 'T1234567'
-    store.state.stateModel.nameRequest.nrNum = null
-    wrapper = mount(NameRequestInfo, { vuetify, store })
-  })
-
-  afterEach(() => {
-    wrapper.destroy()
-  })
-
-  it('renders the option for name translation', async () => {
-    expect(wrapper.find('#name-translation-info').exists()).toBeTruthy()
-    expect(wrapper.vm.hasNameTranslation).toBe(false)
-
-    expect(wrapper.findComponent(AddNameTranslation).exists()).toBeFalsy()
-    expect(wrapper.findComponent(ListNameTranslations).exists()).toBeFalsy()
-  })
-
-  it('renders the Add Name Translation component', async () => {
-    expect(wrapper.find('#name-translation-info').exists()).toBeTruthy()
-    expect(wrapper.vm.hasNameTranslation).toBe(false)
-
-    await wrapper.find('#name-translation-checkbox').trigger('click')
-
-    expect(wrapper.findComponent(AddNameTranslation).exists()).toBeTruthy()
-    expect(wrapper.findComponent(ListNameTranslations).exists()).toBeFalsy()
-  })
-
-  it('renders the List Name Translation component', async () => {
-    await wrapper.vm.$store.commit('mutateNameTranslation', [
-      'Mock Name Translation',
-      'Another Mock Name Translation'
-    ])
-
-    expect(wrapper.find('#name-translation-info').exists()).toBeTruthy()
-    expect(wrapper.vm.hasNameTranslation).toBe(true)
-
-    expect(wrapper.findComponent(AddNameTranslation).exists()).toBeFalsy()
-    expect(wrapper.findComponent(ListNameTranslations).exists()).toBeTruthy()
+    expect(listItems.length).toEqual(6)
+
+    expect(listItems[0].textContent).toContain('[Incorporation Number] B.C. Ltd.')
+    expect(listItems[1].textContent).toContain('Entity Type: BC Benefit Company')
+    expect(listItems[2].textContent).toContain('Request Type: New Business')
+    expect(listItems[3].textContent).toContain('You will be filing this Incorporation Application')
+    expect(listItems[4].textContent).toContain('Your Incorporation Number will be generated at the end')
+    expect(listItems[5].textContent).toContain('It is not possible to request a specific Incorporation Number')
   })
 })
diff --git a/tests/unit/NameTranslation.spec.ts b/tests/unit/NameTranslation.spec.ts
new file mode 100644
index 000000000..e51bf87e5
--- /dev/null
+++ b/tests/unit/NameTranslation.spec.ts
@@ -0,0 +1,61 @@
+import Vue from 'vue'
+import Vuetify from 'vuetify'
+import { mount } from '@vue/test-utils'
+import { getVuexStore } from '@/store'
+import NameTranslation from '@/components/common/NameTranslation.vue'
+import AddNameTranslation from '@/components/common/AddNameTranslation.vue'
+import ListNameTranslations from '@/components/common/ListNameTranslations.vue'
+
+Vue.use(Vuetify)
+
+const vuetify = new Vuetify({})
+const store = getVuexStore()
+document.body.setAttribute('data-app', 'true')
+
+describe('Name Translation component', () => {
+  let wrapper: any
+
+  beforeEach(() => {
+    // Entity type will always be set with or without an NR
+    store.state.stateModel.entityType = 'BEN'
+    // Temp Id will always be set with or without an NR
+    store.state.stateModel.tempId = 'T1234567'
+    store.state.stateModel.nameRequest.nrNum = null
+    wrapper = mount(NameTranslation, { vuetify, store })
+  })
+
+  afterEach(() => {
+    wrapper.destroy()
+  })
+
+  it('renders the option for name translation', async () => {
+    expect(wrapper.find('.section-container').exists()).toBeTruthy()
+    expect(wrapper.vm.hasNameTranslation).toBe(false)
+
+    expect(wrapper.findComponent(AddNameTranslation).exists()).toBeFalsy()
+    expect(wrapper.findComponent(ListNameTranslations).exists()).toBeFalsy()
+  })
+
+  it('renders the Add Name Translation component', async () => {
+    expect(wrapper.find('.section-container').exists()).toBeTruthy()
+    expect(wrapper.vm.hasNameTranslation).toBe(false)
+
+    await wrapper.find('#name-translation-checkbox').trigger('click')
+
+    expect(wrapper.findComponent(AddNameTranslation).exists()).toBeTruthy()
+    expect(wrapper.findComponent(ListNameTranslations).exists()).toBeFalsy()
+  })
+
+  it('renders the List Name Translation component', async () => {
+    await wrapper.vm.$store.commit('mutateNameTranslation', [
+      'Mock Name Translation',
+      'Another Mock Name Translation'
+    ])
+
+    expect(wrapper.find('.section-container').exists()).toBeTruthy()
+    expect(wrapper.vm.hasNameTranslation).toBe(true)
+
+    expect(wrapper.findComponent(AddNameTranslation).exists()).toBeFalsy()
+    expect(wrapper.findComponent(ListNameTranslations).exists()).toBeTruthy()
+  })
+})
diff --git a/tests/unit/RestorationApplicantInformation.spec.ts b/tests/unit/RestorationApplicantInformation.spec.ts
index a4acee840..534857cf0 100644
--- a/tests/unit/RestorationApplicantInformation.spec.ts
+++ b/tests/unit/RestorationApplicantInformation.spec.ts
@@ -1,18 +1,50 @@
 import { shallowWrapperFactory } from '../jest-wrapper-factory'
 import { RestorationApplicantInformation } from '@/views'
 import { RestorationResources } from '@/resources/'
+import RegPeopleAndRoles from '@/components/common/RegPeopleAndRoles.vue'
 
-describe('Restoration Review Confirm view', () => {
-  it('renders the component properly', () => {
-    const wrapper = shallowWrapperFactory(
-      RestorationApplicantInformation,
-      null,
-      null,
-      null,
-      RestorationResources
-    )
+// Test Case Data
+const restorationBusinessInfo = [
+  {
+    entityType: 'BEN'
+  },
+  {
+    entityType: 'BC'
+  },
+  {
+    entityType: 'ULC'
+  },
+  {
+    entityType: 'CC'
+  }
+]
 
-    // verify page is rendered
-    expect(wrapper.find('#restoration-applicant-information').exists()).toBe(true)
+for (const test of restorationBusinessInfo) {
+  describe(`Restoration Applicant Information for a ${test.entityType}`, () => {
+    let wrapper: any
+
+    beforeAll(() => {
+      wrapper = shallowWrapperFactory(
+        RestorationApplicantInformation,
+        null,
+        { entityType: test.entityType },
+        null,
+        RestorationResources
+      )
+    })
+
+    afterAll(() => {
+      wrapper.destroy()
+    })
+
+    it('renders the page', () => {
+      expect(wrapper.find('#restoration-applicant-information').exists()).toBe(true)
+    })
+
+    it('displays Add Applicant Information section', () => {
+      const section = wrapper.find('#add-applicant-info-section')
+      expect(section.find('header h2').text()).toBe('Add Applicant Information')
+      expect(section.findComponent(RegPeopleAndRoles).exists()).toBe(true)
+    })
   })
-})
+}
diff --git a/tests/unit/RestorationBusinessInformation.spec.ts b/tests/unit/RestorationBusinessInformation.spec.ts
index 6f417a388..c793ead05 100644
--- a/tests/unit/RestorationBusinessInformation.spec.ts
+++ b/tests/unit/RestorationBusinessInformation.spec.ts
@@ -21,27 +21,34 @@ const restorationBusinessInfo = [
 ]
 
 for (const test of restorationBusinessInfo) {
-  describe(`Restoration business information for a ${test.entityType}`, () => {
+  describe(`Restoration Business Information for a ${test.entityType}`, () => {
     let wrapper: any
 
-    it('renders the component properly', () => {
-      const wrapper = shallowWrapperFactory(
+    beforeAll(() => {
+      wrapper = shallowWrapperFactory(
         RestorationBusinessInformation,
         null,
         { entityType: test.entityType },
         null,
         RestorationResources
       )
+    })
+
+    afterAll(() => {
+      wrapper.destroy()
+    })
 
-      // verify page is rendered
+    it('renders the page', () => {
       expect(wrapper.find('#restoration-business-information').exists()).toBe(true)
+    })
 
-      // verify headers
+    it('displays header', () => {
       expect(wrapper.findAll('h2').length).toBe(2)
       expect(wrapper.findAll('h2').at(0).text()).toContain('Registered and Records Office Addresses')
       expect(wrapper.findAll('h2').at(1).text()).toContain('Registered Office Contact Information')
+    })
 
-      // verify components on page are rendered
+    it('displays sub-components', () => {
       expect(wrapper.findComponent(OfficeAddresses).exists()).toBe(true)
       expect(wrapper.findComponent(BusinessContactInfo).exists()).toBe(true)
     })
diff --git a/tests/unit/RestorationBusinessName.spec.ts b/tests/unit/RestorationBusinessName.spec.ts
index d570ed3d0..412a685bf 100644
--- a/tests/unit/RestorationBusinessName.spec.ts
+++ b/tests/unit/RestorationBusinessName.spec.ts
@@ -1,18 +1,55 @@
 import { shallowWrapperFactory } from '../jest-wrapper-factory'
 import { RestorationBusinessName } from '@/views'
 import { RestorationResources } from '@/resources/'
+import BusinessName from '@/components/Restoration/BusinessName.vue'
 
-describe('Restoration Review Confirm view', () => {
-  it('renders the component properly', () => {
-    const wrapper = shallowWrapperFactory(
-      RestorationBusinessName,
-      null,
-      null,
-      null,
-      RestorationResources
-    )
+// Test Case Data
+const restorationBusinessInfo = [
+  {
+    entityType: 'BEN'
+  },
+  {
+    entityType: 'BC'
+  },
+  {
+    entityType: 'ULC'
+  },
+  {
+    entityType: 'CC'
+  }
+]
 
-    // verify page is rendered
-    expect(wrapper.find('#restoration-business-name').exists()).toBe(true)
+for (const test of restorationBusinessInfo) {
+  describe(`Restoration Business Name for a ${test.entityType}`, () => {
+    let wrapper: any
+
+    beforeAll(() => {
+      wrapper = shallowWrapperFactory(
+        RestorationBusinessName,
+        null,
+        { entityType: test.entityType },
+        null,
+        RestorationResources
+      )
+    })
+
+    afterAll(() => {
+      wrapper.destroy()
+    })
+
+    it('renders the page', () => {
+      expect(wrapper.find('#restoration-business-name').exists()).toBe(true)
+    })
+
+    it('displays Name section', () => {
+      const section = wrapper.find('#name-section')
+      expect(section.find('header h2').text()).toBe('Name')
+      expect(section.findComponent(BusinessName).exists()).toBe(true)
+    })
+
+    it('displays Restoration Type section', () => {
+      const section = wrapper.find('#restoration-type-section')
+      expect(section.find('header h2').text()).toBe('Restoration Type')
+    })
   })
-})
+}
diff --git a/tests/unit/RestorationReviewConfirm.spec.ts b/tests/unit/RestorationReviewConfirm.spec.ts
index 81f4b6b73..a6973df2d 100644
--- a/tests/unit/RestorationReviewConfirm.spec.ts
+++ b/tests/unit/RestorationReviewConfirm.spec.ts
@@ -1,18 +1,76 @@
 import { shallowWrapperFactory } from '../jest-wrapper-factory'
 import { RestorationReviewConfirm } from '@/views'
 import { RestorationResources } from '@/resources/'
+import ListPeopleAndRoles from '@/components/common/ListPeopleAndRoles.vue'
+import SummaryDefineCompany from '@/components/Incorporation/SummaryDefineCompany.vue'
+import { DocumentDelivery } from '@bcrs-shared-components/document-delivery'
+import Certify from '@/components/common/Certify.vue'
+import StaffPayment from '@/components/common/StaffPayment.vue'
 
-describe('Restoration Review Confirm view', () => {
-  it('renders the component properly', () => {
-    const wrapper = shallowWrapperFactory(
-      RestorationReviewConfirm,
-      null,
-      null,
-      null,
-      RestorationResources
-    )
-
-    // verify page is rendered
-    expect(wrapper.find('#restoration-review-confirm').exists()).toBe(true)
+// Test Case Data
+const restorationBusinessInfo = [
+  {
+    entityType: 'BEN'
+  },
+  {
+    entityType: 'BC'
+  },
+  {
+    entityType: 'ULC'
+  },
+  {
+    entityType: 'CC'
+  }
+]
+
+for (const test of restorationBusinessInfo) {
+  describe(`Restoration Review Confirm for a ${test.entityType}`, () => {
+    let wrapper: any
+
+    beforeAll(() => {
+      wrapper = shallowWrapperFactory(
+        RestorationReviewConfirm,
+        null,
+        {
+          entityType: test.entityType,
+          tombstone: { authRoles: ['staff'] }
+        },
+        null,
+        RestorationResources
+      )
+    })
+
+    afterAll(() => {
+      wrapper.destroy()
+    })
+
+    it('renders the page', () => {
+      expect(wrapper.find('#restoration-review-confirm').exists()).toBe(true)
+    })
+
+    it('displays Review and Confirm section', () => {
+      const section = wrapper.findAll('section').at(0)
+      expect(section.find('header h2').text()).toBe('Review and Confirm')
+      expect(section.findComponent(ListPeopleAndRoles).exists()).toBe(true)
+      expect(section.findComponent(SummaryDefineCompany).exists()).toBe(true)
+    })
+
+    it('displays Document Delivery section', () => {
+      const section = wrapper.findAll('section').at(1)
+      expect(section.find('header h2').text()).toBe('Document Delivery')
+      expect(section.findComponent(DocumentDelivery).exists()).toBe(true)
+    })
+
+    it('displays Certify section', () => {
+      const section = wrapper.findAll('section').at(2)
+      expect(section.find('header h2').text()).toBe('Certify')
+      expect(section.findComponent(Certify).exists()).toBe(true)
+    })
+
+    it('displays Staff Payment section', () => {
+      const section = wrapper.findAll('section').at(3)
+      expect(section.find('header h2').text()).toBe('Staff Payment')
+      expect(section.findComponent(StaffPayment).exists()).toBe(true)
+    })
   })
-})
+}