From 4b50d3765d4d94d622ca0e2e544d3c97dc01fac4 Mon Sep 17 00:00:00 2001
From: Severin Beauvais <severin.beauvais@gmail.com>
Date: Thu, 6 Jul 2023 08:46:54 -0700
Subject: [PATCH 1/2] - updated browserslist config - app version = 5.0.3 -
 added corp-type-module dependency - mapped EntityType to CorpTypeCd

---
 .browserslistrc          |  2 +-
 package-lock.json        |  5 +++--
 package.json             |  3 ++-
 src/enums/entity-type.ts | 34 ++++++++++++++++++----------------
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/.browserslistrc b/.browserslistrc
index 8f9604394..214388fe4 100644
--- a/.browserslistrc
+++ b/.browserslistrc
@@ -1,3 +1,3 @@
 > 1%
 last 2 versions
-not ie <= 10
+not dead
diff --git a/package-lock.json b/package-lock.json
index b72f5137b..846caf740 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,14 +1,15 @@
 {
   "name": "name-request",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "name-request",
-      "version": "5.0.2",
+      "version": "5.0.3",
       "dependencies": {
         "@babel/compat-data": "^7.12.13",
+        "@bcrs-shared-components/corp-type-module": "1.0.12",
         "@bcrs-shared-components/enums": "1.0.40",
         "@bcrs-shared-components/genesys-web-message": "1.0.0",
         "@bcrs-shared-components/interfaces": "1.0.22",
diff --git a/package.json b/package.json
index 08e36d50d..3ecaa6eeb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-request",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "private": true,
   "appName": "Name Request UI",
   "sbcName": "SBC Common Components",
@@ -14,6 +14,7 @@
   },
   "dependencies": {
     "@babel/compat-data": "^7.12.13",
+    "@bcrs-shared-components/corp-type-module": "1.0.12",
     "@bcrs-shared-components/enums": "1.0.40",
     "@bcrs-shared-components/genesys-web-message": "1.0.0",
     "@bcrs-shared-components/interfaces": "1.0.22",
diff --git a/src/enums/entity-type.ts b/src/enums/entity-type.ts
index 8cb29fb32..50fc1e686 100644
--- a/src/enums/entity-type.ts
+++ b/src/enums/entity-type.ts
@@ -1,29 +1,31 @@
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
+
 /** Enum for Entity Type codes. */
 export enum EntityType {
   // BC Entity Types:
-  BC = 'BC',
-  CC = 'CC',
-  CP = 'CP',
-  CR = 'CR',
-  DBA = 'DBA',
-  FI = 'FI',
-  FR = 'FR',
-  GP = 'GP',
-  LL = 'LL',
-  LP = 'LP',
-  PA = 'PA',
-  PAR = 'PAR',
+  BC = CorpTypeCd.BC_COMPANY,
+  CC = CorpTypeCd.BC_CCC,
+  CP = CorpTypeCd.COOP,
+  CR = CorpTypeCd.BC_CORPORATION,
+  DBA = CorpTypeCd.DOING_BUSINESS_AS,
+  FI = CorpTypeCd.FINANCIAL,
+  FR = CorpTypeCd.NR_SOLE_PROP,
+  GP = CorpTypeCd.PARTNERSHIP,
+  LL = CorpTypeCd.LL_PARTNERSHIP,
+  LP = CorpTypeCd.LIM_PARTNERSHIP,
+  PA = CorpTypeCd.PRIVATE_ACT,
+  PAR = CorpTypeCd.PARISHES,
   SO = 'SO',
-  SP = 'SP',
-  UL = 'UL',
+  SP = CorpTypeCd.SOLE_PROP,
+  UL = CorpTypeCd.BC_UNLIMITED,
 
   // XPRO Entity Types:
-  XCR = 'XCR',
+  XCR = CorpTypeCd.XPRO_CORPORATION,
   XUL = 'XUL',
   RLC = 'RLC',
   XLP = 'XLP',
   XLL = 'XLL',
-  XCP = 'XCP',
+  XCP = CorpTypeCd.XPRO_COOP,
   XSO = 'XSO',
 
   INFO = 'INFO', // special value for sub-menu

From 0a77aba255a57df98b104221d798c5a215098996 Mon Sep 17 00:00:00 2001
From: Severin Beauvais <severin.beauvais@gmail.com>
Date: Thu, 6 Jul 2023 12:23:43 -0700
Subject: [PATCH 2/2] - renamed xxx.services -> xxx-services - changed some
 strings to EntityType - worked around EntityType type issue - sorted items in
 entityTypeCdToText()

---
 src/App.vue                                   |  2 +-
 .../advanced-search-retrieve.vue              |  2 +-
 src/components/common/applicant-info-1.vue    |  2 +-
 src/components/dialogs/advanced-search.vue    |  2 +-
 src/components/dialogs/cancel.vue             |  2 +-
 src/components/dialogs/payment-complete.vue   |  2 +-
 src/components/dialogs/refund.vue             |  2 +-
 src/components/dialogs/resubmit.vue           |  2 +-
 .../existing-request-display.vue              |  2 +-
 src/components/new-request/stats.vue          |  2 +-
 .../entity-cannot-be-auto-analyzed.vue        |  2 +-
 .../submit-request/reserve-submit.vue         |  2 +-
 src/enums/entity-type.ts                      | 26 ++++++++++++++-----
 src/interfaces/mapping.ts                     |  6 +++--
 src/interfaces/models.ts                      |  2 +-
 src/interfaces/new-request-interface.ts       |  2 +-
 src/mixins/common-mixin.ts                    | 23 +++++++++-------
 src/mixins/displayed-component-mixin.ts       |  2 +-
 src/mixins/nr-affiliation-mixin.ts            |  4 +--
 src/mixins/payment-mixin.ts                   |  2 +-
 src/mixins/update-user-mixin.ts               |  2 +-
 .../{auth.services.ts => auth-services.ts}    |  0
 ...iness.services.ts => business-services.ts} |  0
 .../{namex.services.ts => namex-services.ts}  |  0
 src/store/actions.ts                          |  2 +-
 src/store/getters.ts                          |  2 +-
 src/views/landing.vue                         |  2 +-
 27 files changed, 58 insertions(+), 41 deletions(-)
 rename src/services/{auth.services.ts => auth-services.ts} (100%)
 rename src/services/{business.services.ts => business-services.ts} (100%)
 rename src/services/{namex.services.ts => namex-services.ts} (100%)

diff --git a/src/App.vue b/src/App.vue
index 86f3140da..92e3d020b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -105,7 +105,7 @@ import SbcFooter from 'sbc-common-components/src/components/SbcFooter.vue'
 
 // Interfaces / Enums
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import NamexServices from './services/namex.services'
+import NamexServices from './services/namex-services'
 import { PAYMENT_REQUIRED } from 'http-status-codes'
 
 @Component({
diff --git a/src/components/advanced-search/advanced-search-retrieve.vue b/src/components/advanced-search/advanced-search-retrieve.vue
index 3960b698d..588ca0db5 100644
--- a/src/components/advanced-search/advanced-search-retrieve.vue
+++ b/src/components/advanced-search/advanced-search-retrieve.vue
@@ -51,7 +51,7 @@ import AdvancedSearchDates from '@/components/advanced-search/advanced-search-da
 import { FormType, NameRequestI } from '@/interfaces'
 import { Action, Getter } from 'vuex-class'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import NamexServices from '@/services/namex.services'
+import NamexServices from '@/services/namex-services'
 
 @Component({
   components: {
diff --git a/src/components/common/applicant-info-1.vue b/src/components/common/applicant-info-1.vue
index f34bb3c3a..084a15cc7 100644
--- a/src/components/common/applicant-info-1.vue
+++ b/src/components/common/applicant-info-1.vue
@@ -405,7 +405,7 @@ import { ActionBindingIF } from '@/interfaces/store-interfaces'
 import { EmptyApplicant, NameRequestI } from '@/interfaces'
 import { removeExcessSpaces } from '@/plugins/utilities'
 import { CanJurisdictions, IntlJurisdictions } from '@/list-data'
-import AuthServices from '@/services/auth.services'
+import AuthServices from '@/services/auth-services'
 
 @Component({
   components: {
diff --git a/src/components/dialogs/advanced-search.vue b/src/components/dialogs/advanced-search.vue
index e0d51084f..12b1edc63 100644
--- a/src/components/dialogs/advanced-search.vue
+++ b/src/components/dialogs/advanced-search.vue
@@ -135,7 +135,7 @@
 
 <script lang='ts'>
 import { Component, Emit, Prop, Watch, Vue } from 'vue-property-decorator'
-import NamexServices from '@/services/namex.services'
+import NamexServices from '@/services/namex-services'
 import { Getter } from 'vuex-class'
 import { AdvancedSearchForm, AdvancedSearchRetrieve, AdvancedSearchTable } from '@/components/advanced-search'
 
diff --git a/src/components/dialogs/cancel.vue b/src/components/dialogs/cancel.vue
index 6df330291..6c6874cc9 100644
--- a/src/components/dialogs/cancel.vue
+++ b/src/components/dialogs/cancel.vue
@@ -45,7 +45,7 @@ import { Sleep } from '@/plugins'
 import { NrAction } from '@/enums'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
 import { CANCEL_MODAL_IS_VISIBLE } from '@/modules/payment/store/types'
-import NamexServices from '@/services/namex.services'
+import NamexServices from '@/services/namex-services'
 
 @Component({})
 export default class CancelDialog extends Mixins(PaymentMixin) {
diff --git a/src/components/dialogs/payment-complete.vue b/src/components/dialogs/payment-complete.vue
index be3c31729..cee232ee7 100644
--- a/src/components/dialogs/payment-complete.vue
+++ b/src/components/dialogs/payment-complete.vue
@@ -42,7 +42,7 @@ import { CommonMixin, PaymentMixin, PaymentSessionMixin } from '@/mixins'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
 import { NameChoicesIF } from '@/interfaces'
 import { PAYMENT_COMPLETE_MODAL_IS_VISIBLE } from '@/modules/payment/store/types'
-import NamexServices from '@/services/namex.services'
+import NamexServices from '@/services/namex-services'
 
 /**
  * Makes debugging the receipt easier.
diff --git a/src/components/dialogs/refund.vue b/src/components/dialogs/refund.vue
index 8490313d2..1dd96f8ae 100644
--- a/src/components/dialogs/refund.vue
+++ b/src/components/dialogs/refund.vue
@@ -90,7 +90,7 @@ import { REFUND_MODAL_IS_VISIBLE } from '@/modules/payment/store/types'
 import { NrAction } from '@/enums'
 import { PaymentMixin, PaymentSessionMixin } from '@/mixins'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import NamexServices from '@/services/namex.services'
+import NamexServices from '@/services/namex-services'
 
 @Component({
   components: {
diff --git a/src/components/dialogs/resubmit.vue b/src/components/dialogs/resubmit.vue
index b3d133252..717350c7a 100644
--- a/src/components/dialogs/resubmit.vue
+++ b/src/components/dialogs/resubmit.vue
@@ -107,7 +107,7 @@ import { Jurisdictions, NrAction, PaymentAction } from '@/enums'
 import { PaymentMixin, PaymentSessionMixin, DisplayedComponentMixin } from '@/mixins'
 import { getBaseUrl } from '@/components/payment/payment-utils'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import NamexServices from '@/services/namex.services'
+import NamexServices from '@/services/namex-services'
 import { PaymentRequiredError } from '@/errors'
 import { GetFeatureFlag, Navigate } from '@/plugins'
 
diff --git a/src/components/existing-request/existing-request-display.vue b/src/components/existing-request/existing-request-display.vue
index 46745bdb6..254320f0d 100644
--- a/src/components/existing-request/existing-request-display.vue
+++ b/src/components/existing-request/existing-request-display.vue
@@ -229,7 +229,7 @@ import NrNotApprovedGrayBox from './nr-not-approved-gray-box.vue'
 import { NameState, NrAction, NrState, PaymentStatus, SbcPaymentStatus, PaymentAction, Furnished,
   NrRequestActionCodes } from '@/enums'
 import { Sleep, GetFeatureFlag, Navigate } from '@/plugins'
-import NamexServices from '@/services/namex.services'
+import NamexServices from '@/services/namex-services'
 import ContactInfo from '@/components/common/contact-info.vue'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
 
diff --git a/src/components/new-request/stats.vue b/src/components/new-request/stats.vue
index 857758ade..be038a5ca 100644
--- a/src/components/new-request/stats.vue
+++ b/src/components/new-request/stats.vue
@@ -62,7 +62,7 @@ import { Action, Getter } from 'vuex-class'
 import { StatsI } from '@/interfaces'
 import { GetFeatureFlag } from '@/plugins'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import NamexServices from '@/services/namex.services'
+import NamexServices from '@/services/namex-services'
 
 @Component({})
 export default class Stats extends Vue {
diff --git a/src/components/new-request/submit-request/entity-cannot-be-auto-analyzed.vue b/src/components/new-request/submit-request/entity-cannot-be-auto-analyzed.vue
index 20808a3a3..d24445bd6 100644
--- a/src/components/new-request/submit-request/entity-cannot-be-auto-analyzed.vue
+++ b/src/components/new-request/submit-request/entity-cannot-be-auto-analyzed.vue
@@ -52,7 +52,7 @@ export default class EntityCannotBeAutoAnalyzed extends Vue {
 
   // Global getters
   @Getter getNameAnalysisTimeout!: boolean
-  @Getter getDoNotAnalyzeEntities!: string[]
+  @Getter getDoNotAnalyzeEntities!: EntityType[]
   @Getter getEntityTextFromValue!: string
   @Getter getEntityTypeCd!: EntityType
   @Getter getIsPersonsName!: boolean
diff --git a/src/components/new-request/submit-request/reserve-submit.vue b/src/components/new-request/submit-request/reserve-submit.vue
index 20fe212a3..2be9f81cc 100644
--- a/src/components/new-request/submit-request/reserve-submit.vue
+++ b/src/components/new-request/submit-request/reserve-submit.vue
@@ -19,7 +19,7 @@ import { Component, Vue, Prop } from 'vue-property-decorator'
 import { Action, Getter } from 'vuex-class'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
 import { ConditionalReqI, DraftReqI, IssueI, NameRequestI, ReservedReqI } from '@/interfaces'
-import NamexServices from '@/services/namex.services'
+import NamexServices from '@/services/namex-services'
 import { Location, NrRequestActionCodes, NrType } from '@/enums'
 
 @Component({})
diff --git a/src/enums/entity-type.ts b/src/enums/entity-type.ts
index 50fc1e686..57b19acb6 100644
--- a/src/enums/entity-type.ts
+++ b/src/enums/entity-type.ts
@@ -1,5 +1,17 @@
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
+// Namerequest-only entity types
+// FUTURE: declare these in CorpTypeCd instead
+enum Other {
+  SO = 'SO',
+  XUL = 'XUL',
+  RLC = 'RLC',
+  XLP = 'XLP',
+  XLL = 'XLL',
+  XSO = 'XSO',
+  INFO = 'INFO'
+}
+
 /** Enum for Entity Type codes. */
 export enum EntityType {
   // BC Entity Types:
@@ -15,18 +27,18 @@ export enum EntityType {
   LP = CorpTypeCd.LIM_PARTNERSHIP,
   PA = CorpTypeCd.PRIVATE_ACT,
   PAR = CorpTypeCd.PARISHES,
-  SO = 'SO',
+  SO = Other.SO,
   SP = CorpTypeCd.SOLE_PROP,
   UL = CorpTypeCd.BC_UNLIMITED,
 
   // XPRO Entity Types:
   XCR = CorpTypeCd.XPRO_CORPORATION,
-  XUL = 'XUL',
-  RLC = 'RLC',
-  XLP = 'XLP',
-  XLL = 'XLL',
+  XUL = Other.XUL,
+  RLC = Other.RLC,
+  XLP = Other.XLP,
+  XLL = Other.XLL,
   XCP = CorpTypeCd.XPRO_COOP,
-  XSO = 'XSO',
+  XSO = Other.XSO,
 
-  INFO = 'INFO', // special value for sub-menu
+  INFO = Other.INFO, // special value for sub-menu
 }
diff --git a/src/interfaces/mapping.ts b/src/interfaces/mapping.ts
index 758e7aa61..61b5f92c0 100644
--- a/src/interfaces/mapping.ts
+++ b/src/interfaces/mapping.ts
@@ -1,4 +1,6 @@
+import { EntityType } from '@/enums'
+
 export interface MappingI {
-  ASSUMED: string[]
-  [propName: string]: string[] // misc properties that are arrays of strings
+  ASSUMED: EntityType[]
+  [propName: string]: EntityType[] // misc properties that are arrays of entity types
 }
diff --git a/src/interfaces/models.ts b/src/interfaces/models.ts
index 4c66589b9..8a4dcb56b 100644
--- a/src/interfaces/models.ts
+++ b/src/interfaces/models.ts
@@ -197,7 +197,7 @@ export interface QuillOpsI {
 }
 
 export interface RequestActionMappingI {
-  [propName: string]: string[] // misc properties that are arrays of strings
+  [propName: string]: EntityType[] // misc properties that are arrays of entity types
 }
 
 export interface RequestActionsI {
diff --git a/src/interfaces/new-request-interface.ts b/src/interfaces/new-request-interface.ts
index ba8e1766f..a65201f53 100644
--- a/src/interfaces/new-request-interface.ts
+++ b/src/interfaces/new-request-interface.ts
@@ -25,7 +25,7 @@ export interface NewRequestIF {
   corpSearch: string
   designationIssueTypes: string[]
   displayedComponent: string
-  doNotAnalyzeEntities: string[]
+  doNotAnalyzeEntities: EntityType[]
   editMode: boolean
   entity_type_cd: EntityType
   entityTypeAddToSelect: SelectOptionsI
diff --git a/src/mixins/common-mixin.ts b/src/mixins/common-mixin.ts
index f5e7eb443..f29755538 100644
--- a/src/mixins/common-mixin.ts
+++ b/src/mixins/common-mixin.ts
@@ -18,23 +18,25 @@ export class CommonMixin extends Vue {
   }
 
   /** Returns entity type text for the the specified code. */
+  // FUTURE: use GetCorpFullDescription() instead
   entityTypeCdToText (cd: EntityType): string {
     switch (cd) {
       // BC Entity Types:
-      case EntityType.FR: return 'BC Sole Proprietorship'
-      case EntityType.DBA: return 'BC "Doing Business As" name (DBA)'
+      case EntityType.BC: return 'BC Benefit Company'
+      case EntityType.CC: return 'BC Community Contribution Company'
+      case EntityType.CP: return 'BC Cooperative Association'
       case EntityType.CR: return 'BC Limited Company'
-      case EntityType.UL: return 'BC Unlimited Liability Company'
+      case EntityType.DBA: return 'BC "Doing Business As" name (DBA)'
+      case EntityType.FI: return 'BC Credit Union'
+      case EntityType.FR: return 'BC Sole Proprietorship'
       case EntityType.GP: return 'BC General Partnership'
-      case EntityType.LP: return 'BC Limited Partnership'
       case EntityType.LL: return 'BC Limited Liability Partnership'
-      case EntityType.CP: return 'BC Cooperative Association'
-      case EntityType.BC: return 'BC Benefit Company'
-      case EntityType.CC: return 'BC Community Contribution Company'
-      case EntityType.SO: return 'BC Social Enterprise'
+      case EntityType.LP: return 'BC Limited Partnership'
       case EntityType.PA: return 'BC Private Act'
-      case EntityType.FI: return 'BC Credit Union'
       case EntityType.PAR: return 'BC Parish'
+      case EntityType.SO: return 'BC Social Enterprise'
+      case EntityType.SP: return 'BC Sole Proprietorship'
+      case EntityType.UL: return 'BC Unlimited Liability Company'
 
       // XPRO Entity Types:
       case EntityType.XCR: return 'Extraprovincial Limited Company'
@@ -45,7 +47,7 @@ export class CommonMixin extends Vue {
       case EntityType.XCP: return 'Extraprovincial Cooperative Association'
       case EntityType.XSO: return 'Extraprovincial Social Enterprise'
 
-      default: return cd
+      default: return (cd as unknown as string)
     }
   }
 
@@ -87,6 +89,7 @@ export class CommonMixin extends Vue {
   isFirm (nr: any): boolean {
     return (
       nr?.legalType === EntityType.SP ||
+      nr?.legalType === EntityType.DBA ||
       nr?.legalType === EntityType.GP)
   }
 
diff --git a/src/mixins/displayed-component-mixin.ts b/src/mixins/displayed-component-mixin.ts
index 4662d96fa..fc220a6c0 100644
--- a/src/mixins/displayed-component-mixin.ts
+++ b/src/mixins/displayed-component-mixin.ts
@@ -1,7 +1,7 @@
 import { Component, Vue } from 'vue-property-decorator'
 import { Action, Getter } from 'vuex-class'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import NamexServices from '@/services/namex.services'
+import NamexServices from '@/services/namex-services'
 import { NrState } from '@/enums'
 
 @Component({})
diff --git a/src/mixins/nr-affiliation-mixin.ts b/src/mixins/nr-affiliation-mixin.ts
index e0d8c3dd3..86a52d6fd 100644
--- a/src/mixins/nr-affiliation-mixin.ts
+++ b/src/mixins/nr-affiliation-mixin.ts
@@ -1,7 +1,7 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import { Action } from 'vuex-class'
-import AuthServices from '@/services/auth.services'
-import BusinessServices from '@/services/business.services'
+import AuthServices from '@/services/auth-services'
+import BusinessServices from '@/services/business-services'
 import { BusinessRequest, NameRequestI } from '@/interfaces'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
 import { Navigate } from '@/plugins'
diff --git a/src/mixins/payment-mixin.ts b/src/mixins/payment-mixin.ts
index 13a4602e0..8652f4ede 100644
--- a/src/mixins/payment-mixin.ts
+++ b/src/mixins/payment-mixin.ts
@@ -12,7 +12,7 @@ import errorModule from '@/modules/error'
 import { ErrorI } from '@/modules/error/store/actions'
 import { StaffPaymentIF, RefundParamsIF, NameRequestI } from '@/interfaces'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import NamexServices from '@/services/namex.services'
+import NamexServices from '@/services/namex-services'
 import { PaymentRequiredError } from '@/errors'
 import { Navigate } from '@/plugins'
 import { appBaseURL } from '../router/router'
diff --git a/src/mixins/update-user-mixin.ts b/src/mixins/update-user-mixin.ts
index f74606441..8bbb99318 100644
--- a/src/mixins/update-user-mixin.ts
+++ b/src/mixins/update-user-mixin.ts
@@ -1,6 +1,6 @@
 import { Component, Vue } from 'vue-property-decorator'
 import { UpdateLdUser } from '@/plugins'
-import AuthServices from '@/services/auth.services'
+import AuthServices from '@/services/auth-services'
 
 @Component({})
 export class UpdateUserMixin extends Vue {
diff --git a/src/services/auth.services.ts b/src/services/auth-services.ts
similarity index 100%
rename from src/services/auth.services.ts
rename to src/services/auth-services.ts
diff --git a/src/services/business.services.ts b/src/services/business-services.ts
similarity index 100%
rename from src/services/business.services.ts
rename to src/services/business-services.ts
diff --git a/src/services/namex.services.ts b/src/services/namex-services.ts
similarity index 100%
rename from src/services/namex.services.ts
rename to src/services/namex-services.ts
diff --git a/src/store/actions.ts b/src/store/actions.ts
index 6ff2007b8..18e4719ae 100644
--- a/src/store/actions.ts
+++ b/src/store/actions.ts
@@ -17,7 +17,7 @@ import {
 import { BAD_REQUEST, NOT_FOUND, OK, SERVICE_UNAVAILABLE } from 'http-status-codes'
 import removeAccents from 'remove-accents'
 import { GetFeatureFlag, Sleep, sanitizeName } from '@/plugins'
-import NamexServices from '@/services/namex.services'
+import NamexServices from '@/services/namex-services'
 import { MRAS_MIN_LENGTH, MRAS_MAX_LENGTH } from '@/components/new-request/constants'
 
 // List Data
diff --git a/src/store/getters.ts b/src/store/getters.ts
index 13bc79e01..49d0900cc 100644
--- a/src/store/getters.ts
+++ b/src/store/getters.ts
@@ -221,7 +221,7 @@ export const getIsPersonsName = (state: StateIF): boolean => {
   return state.stateModel.newRequestModel.isPersonsName
 }
 
-export const getDoNotAnalyzeEntities = (state: StateIF): string[] => {
+export const getDoNotAnalyzeEntities = (state: StateIF): EntityType[] => {
   return state.stateModel.newRequestModel.doNotAnalyzeEntities
 }
 
diff --git a/src/views/landing.vue b/src/views/landing.vue
index 8dd70f931..ca72c5f54 100644
--- a/src/views/landing.vue
+++ b/src/views/landing.vue
@@ -42,7 +42,7 @@ import SubmissionTabs from '@/components/new-request/submit-request/submission-t
 import Success from '@/components/common/success.vue'
 import Tabs from '@/components/tabs.vue'
 
-import NamexServices from '@/services/namex.services'
+import NamexServices from '@/services/namex-services'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
 
 @Component({