diff --git a/README.md b/README.md
index e8061eacf..799e32212 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ This repository contains frontend modules for the OpenMRS SPA. These modules rel
 
 - [Active visits app](packages/esm-active-visits-app/)
 - [Appointments app](packages/esm-appointments-app/)
-- [Outpatient app](packages/esm-outpatient-app/README.md)
+- [Service queues](packages/esm-service-queues-app/README.md)
 - [Patient search](packages/esm-patient-search-app)
 - [Patient registration](packages/esm-patient-registration-app)
 - [Patient list](packages/esm-patient-list-app)
diff --git a/packages/esm-outpatient-app/README.md b/packages/esm-service-queues-app/README.md
similarity index 96%
rename from packages/esm-outpatient-app/README.md
rename to packages/esm-service-queues-app/README.md
index c9426366a..f4053bb63 100644
--- a/packages/esm-outpatient-app/README.md
+++ b/packages/esm-service-queues-app/README.md
@@ -9,7 +9,7 @@ The `Service Queues` app is a frontend module that enables users to track a pati
 The key component of the service queue app is the `Active Visits` table. It displays a tabular overview of the active visits ongoing in a facility and the wait time of patients. Users can add patients to the service queue by starting visits for them. They can also view information from the current active visits as well as the previous visit on each queue entry by clicking the table extension slot. Users can also change the priority and status of an entry in the queue from the UI, effectively moving a patient from one point in the queue to another. In order to indicate that a patient is currently attending service, click on the bell icon. In order to edit an entry, click the pencil icon. 
 
 Amend the following concepts in the configuration schema to get started using the module:
-- `priorityConceptSetUuid` - concept UUID for `prioritity`.
+- `priorityConceptSetUuid` - concept UUID for `priority`.
 - `defaultPriorityConceptUuid` - concept UUID for `not urgent`.
 - `serviceConceptSetUuid` - concept UUID for `service`.
 - `statusConceptSetUuid` - concept UUID for `status`.
diff --git a/packages/esm-outpatient-app/__mocks__/active-visits.mock.ts b/packages/esm-service-queues-app/__mocks__/active-visits.mock.ts
similarity index 100%
rename from packages/esm-outpatient-app/__mocks__/active-visits.mock.ts
rename to packages/esm-service-queues-app/__mocks__/active-visits.mock.ts
diff --git a/packages/esm-outpatient-app/__mocks__/appointments-data.mock.ts b/packages/esm-service-queues-app/__mocks__/appointments-data.mock.ts
similarity index 100%
rename from packages/esm-outpatient-app/__mocks__/appointments-data.mock.ts
rename to packages/esm-service-queues-app/__mocks__/appointments-data.mock.ts
diff --git a/packages/esm-outpatient-app/__mocks__/search.mock.ts b/packages/esm-service-queues-app/__mocks__/search.mock.ts
similarity index 100%
rename from packages/esm-outpatient-app/__mocks__/search.mock.ts
rename to packages/esm-service-queues-app/__mocks__/search.mock.ts
diff --git a/packages/esm-outpatient-app/__mocks__/visits.mock.ts b/packages/esm-service-queues-app/__mocks__/visits.mock.ts
similarity index 100%
rename from packages/esm-outpatient-app/__mocks__/visits.mock.ts
rename to packages/esm-service-queues-app/__mocks__/visits.mock.ts
diff --git a/packages/esm-outpatient-app/jest.config.js b/packages/esm-service-queues-app/jest.config.js
similarity index 100%
rename from packages/esm-outpatient-app/jest.config.js
rename to packages/esm-service-queues-app/jest.config.js
diff --git a/packages/esm-outpatient-app/package.json b/packages/esm-service-queues-app/package.json
similarity index 93%
rename from packages/esm-outpatient-app/package.json
rename to packages/esm-service-queues-app/package.json
index c45d2c611..411ba31a0 100644
--- a/packages/esm-outpatient-app/package.json
+++ b/packages/esm-service-queues-app/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "@openmrs/esm-outpatient-app",
+  "name": "@openmrs/esm-service-queues-app",
   "version": "5.0.0",
   "description": "Outpatient front-end module for the OpenMRS SPA",
-  "browser": "dist/openmrs-esm-outpatient-app.js",
+  "browser": "dist/openmrs-esm-service-queues-app.js",
   "main": "src/index.ts",
   "source": true,
   "license": "MPL-2.0",
diff --git a/packages/esm-outpatient-app/src/active-visits/active-visits-tab.component.tsx b/packages/esm-service-queues-app/src/active-visits/active-visits-tab.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/active-visits/active-visits-tab.component.tsx
rename to packages/esm-service-queues-app/src/active-visits/active-visits-tab.component.tsx
diff --git a/packages/esm-outpatient-app/src/active-visits/active-visits-tab.test.tsx b/packages/esm-service-queues-app/src/active-visits/active-visits-tab.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/active-visits/active-visits-tab.test.tsx
rename to packages/esm-service-queues-app/src/active-visits/active-visits-tab.test.tsx
diff --git a/packages/esm-outpatient-app/src/active-visits/active-visits-table.component.tsx b/packages/esm-service-queues-app/src/active-visits/active-visits-table.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/active-visits/active-visits-table.component.tsx
rename to packages/esm-service-queues-app/src/active-visits/active-visits-table.component.tsx
diff --git a/packages/esm-outpatient-app/src/active-visits/active-visits-table.resource.ts b/packages/esm-service-queues-app/src/active-visits/active-visits-table.resource.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/active-visits/active-visits-table.resource.ts
rename to packages/esm-service-queues-app/src/active-visits/active-visits-table.resource.ts
diff --git a/packages/esm-outpatient-app/src/active-visits/active-visits-table.scss b/packages/esm-service-queues-app/src/active-visits/active-visits-table.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/active-visits/active-visits-table.scss
rename to packages/esm-service-queues-app/src/active-visits/active-visits-table.scss
diff --git a/packages/esm-outpatient-app/src/active-visits/active-visits-table.test.tsx b/packages/esm-service-queues-app/src/active-visits/active-visits-table.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/active-visits/active-visits-table.test.tsx
rename to packages/esm-service-queues-app/src/active-visits/active-visits-table.test.tsx
diff --git a/packages/esm-outpatient-app/src/active-visits/change-status-dialog.component.tsx b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/active-visits/change-status-dialog.component.tsx
rename to packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
diff --git a/packages/esm-outpatient-app/src/active-visits/change-status-dialog.scss b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/active-visits/change-status-dialog.scss
rename to packages/esm-service-queues-app/src/active-visits/change-status-dialog.scss
diff --git a/packages/esm-outpatient-app/src/active-visits/change-status-dialog.test.tsx b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/active-visits/change-status-dialog.test.tsx
rename to packages/esm-service-queues-app/src/active-visits/change-status-dialog.test.tsx
diff --git a/packages/esm-outpatient-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx b/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx
rename to packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx
diff --git a/packages/esm-outpatient-app/src/add-patient-toqueue/add-patient-toqueue-dialog.scss b/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/add-patient-toqueue/add-patient-toqueue-dialog.scss
rename to packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.scss
diff --git a/packages/esm-outpatient-app/src/add-provider-queue-room/add-provider-queue-room.component.tsx b/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/add-provider-queue-room/add-provider-queue-room.component.tsx
rename to packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.component.tsx
diff --git a/packages/esm-outpatient-app/src/add-provider-queue-room/add-provider-queue-room.resource.tsx b/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.resource.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/add-provider-queue-room/add-provider-queue-room.resource.tsx
rename to packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.resource.tsx
diff --git a/packages/esm-outpatient-app/src/add-provider-queue-room/add-provider-queue-room.scss b/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/add-provider-queue-room/add-provider-queue-room.scss
rename to packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.scss
diff --git a/packages/esm-outpatient-app/src/add-provider-queue-room/add-provider-queue-room.test.tsx b/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/add-provider-queue-room/add-provider-queue-room.test.tsx
rename to packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.test.tsx
diff --git a/packages/esm-outpatient-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.component.tsx b/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.component.tsx
rename to packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.component.tsx
diff --git a/packages/esm-outpatient-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.resource.tsx b/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.resource.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.resource.tsx
rename to packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.resource.tsx
diff --git a/packages/esm-outpatient-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.scss b/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.scss
rename to packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.scss
diff --git a/packages/esm-outpatient-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.test.tsx b/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.test.tsx
rename to packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.test.tsx
diff --git a/packages/esm-outpatient-app/src/clear-queue-entries-dialog/clear-queue-entries.component.tsx b/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/clear-queue-entries-dialog/clear-queue-entries.component.tsx
rename to packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries.component.tsx
diff --git a/packages/esm-outpatient-app/src/config-schema.ts b/packages/esm-service-queues-app/src/config-schema.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/config-schema.ts
rename to packages/esm-service-queues-app/src/config-schema.ts
diff --git a/packages/esm-outpatient-app/src/constants.ts b/packages/esm-service-queues-app/src/constants.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/constants.ts
rename to packages/esm-service-queues-app/src/constants.ts
diff --git a/packages/esm-outpatient-app/src/createDashboardLink.tsx b/packages/esm-service-queues-app/src/createDashboardLink.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/createDashboardLink.tsx
rename to packages/esm-service-queues-app/src/createDashboardLink.tsx
diff --git a/packages/esm-outpatient-app/src/current-visit/current-visit-summary.component.tsx b/packages/esm-service-queues-app/src/current-visit/current-visit-summary.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/current-visit/current-visit-summary.component.tsx
rename to packages/esm-service-queues-app/src/current-visit/current-visit-summary.component.tsx
diff --git a/packages/esm-outpatient-app/src/current-visit/current-visit-summary.test.tsx b/packages/esm-service-queues-app/src/current-visit/current-visit-summary.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/current-visit/current-visit-summary.test.tsx
rename to packages/esm-service-queues-app/src/current-visit/current-visit-summary.test.tsx
diff --git a/packages/esm-outpatient-app/src/current-visit/current-visit.resource.ts b/packages/esm-service-queues-app/src/current-visit/current-visit.resource.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/current-visit/current-visit.resource.ts
rename to packages/esm-service-queues-app/src/current-visit/current-visit.resource.ts
diff --git a/packages/esm-outpatient-app/src/current-visit/current-visit.scss b/packages/esm-service-queues-app/src/current-visit/current-visit.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/current-visit/current-visit.scss
rename to packages/esm-service-queues-app/src/current-visit/current-visit.scss
diff --git a/packages/esm-outpatient-app/src/current-visit/hooks/useVitalsConceptMetadata.tsx b/packages/esm-service-queues-app/src/current-visit/hooks/useVitalsConceptMetadata.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/current-visit/hooks/useVitalsConceptMetadata.tsx
rename to packages/esm-service-queues-app/src/current-visit/hooks/useVitalsConceptMetadata.tsx
diff --git a/packages/esm-outpatient-app/src/current-visit/visit-details/biometrics-config-schema.ts b/packages/esm-service-queues-app/src/current-visit/visit-details/biometrics-config-schema.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/current-visit/visit-details/biometrics-config-schema.ts
rename to packages/esm-service-queues-app/src/current-visit/visit-details/biometrics-config-schema.ts
diff --git a/packages/esm-outpatient-app/src/current-visit/visit-details/current-visit-details.component.tsx b/packages/esm-service-queues-app/src/current-visit/visit-details/current-visit-details.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/current-visit/visit-details/current-visit-details.component.tsx
rename to packages/esm-service-queues-app/src/current-visit/visit-details/current-visit-details.component.tsx
diff --git a/packages/esm-outpatient-app/src/current-visit/visit-details/triage-note.component.tsx b/packages/esm-service-queues-app/src/current-visit/visit-details/triage-note.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/current-visit/visit-details/triage-note.component.tsx
rename to packages/esm-service-queues-app/src/current-visit/visit-details/triage-note.component.tsx
diff --git a/packages/esm-outpatient-app/src/current-visit/visit-details/triage-note.scss b/packages/esm-service-queues-app/src/current-visit/visit-details/triage-note.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/current-visit/visit-details/triage-note.scss
rename to packages/esm-service-queues-app/src/current-visit/visit-details/triage-note.scss
diff --git a/packages/esm-outpatient-app/src/current-visit/visit-details/vitals-config-schema.ts b/packages/esm-service-queues-app/src/current-visit/visit-details/vitals-config-schema.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/current-visit/visit-details/vitals-config-schema.ts
rename to packages/esm-service-queues-app/src/current-visit/visit-details/vitals-config-schema.ts
diff --git a/packages/esm-outpatient-app/src/current-visit/visit-details/vitals.component.tsx b/packages/esm-service-queues-app/src/current-visit/visit-details/vitals.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/current-visit/visit-details/vitals.component.tsx
rename to packages/esm-service-queues-app/src/current-visit/visit-details/vitals.component.tsx
diff --git a/packages/esm-outpatient-app/src/dashboard.meta.ts b/packages/esm-service-queues-app/src/dashboard.meta.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/dashboard.meta.ts
rename to packages/esm-service-queues-app/src/dashboard.meta.ts
diff --git a/packages/esm-outpatient-app/src/declarations.d.ts b/packages/esm-service-queues-app/src/declarations.d.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/declarations.d.ts
rename to packages/esm-service-queues-app/src/declarations.d.ts
diff --git a/packages/esm-outpatient-app/src/helpers/functions.ts b/packages/esm-service-queues-app/src/helpers/functions.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/helpers/functions.ts
rename to packages/esm-service-queues-app/src/helpers/functions.ts
diff --git a/packages/esm-outpatient-app/src/helpers/helpers.ts b/packages/esm-service-queues-app/src/helpers/helpers.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/helpers/helpers.ts
rename to packages/esm-service-queues-app/src/helpers/helpers.ts
diff --git a/packages/esm-outpatient-app/src/helpers/time-helpers.ts b/packages/esm-service-queues-app/src/helpers/time-helpers.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/helpers/time-helpers.ts
rename to packages/esm-service-queues-app/src/helpers/time-helpers.ts
diff --git a/packages/esm-outpatient-app/src/home.component.tsx b/packages/esm-service-queues-app/src/home.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/home.component.tsx
rename to packages/esm-service-queues-app/src/home.component.tsx
diff --git a/packages/esm-outpatient-app/src/home.test.tsx b/packages/esm-service-queues-app/src/home.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/home.test.tsx
rename to packages/esm-service-queues-app/src/home.test.tsx
diff --git a/packages/esm-outpatient-app/src/index.ts b/packages/esm-service-queues-app/src/index.ts
similarity index 98%
rename from packages/esm-outpatient-app/src/index.ts
rename to packages/esm-service-queues-app/src/index.ts
index ef367cd4c..9d46146d0 100644
--- a/packages/esm-outpatient-app/src/index.ts
+++ b/packages/esm-service-queues-app/src/index.ts
@@ -5,7 +5,7 @@ import { dashboardMeta } from './dashboard.meta';
 
 export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
 
-const moduleName = '@openmrs/esm-outpatient-app';
+const moduleName = '@openmrs/esm-service-queues-app';
 
 const options = {
   featureName: 'outpatient',
diff --git a/packages/esm-outpatient-app/src/overlay.component.tsx b/packages/esm-service-queues-app/src/overlay.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/overlay.component.tsx
rename to packages/esm-service-queues-app/src/overlay.component.tsx
diff --git a/packages/esm-outpatient-app/src/overlay.scss b/packages/esm-service-queues-app/src/overlay.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/overlay.scss
rename to packages/esm-service-queues-app/src/overlay.scss
diff --git a/packages/esm-outpatient-app/src/overlay.test.tsx b/packages/esm-service-queues-app/src/overlay.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/overlay.test.tsx
rename to packages/esm-service-queues-app/src/overlay.test.tsx
diff --git a/packages/esm-outpatient-app/src/past-visit/past-visit-details/encounter-list.component.tsx b/packages/esm-service-queues-app/src/past-visit/past-visit-details/encounter-list.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/past-visit/past-visit-details/encounter-list.component.tsx
rename to packages/esm-service-queues-app/src/past-visit/past-visit-details/encounter-list.component.tsx
diff --git a/packages/esm-outpatient-app/src/past-visit/past-visit-details/medications-list.component.tsx b/packages/esm-service-queues-app/src/past-visit/past-visit-details/medications-list.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/past-visit/past-visit-details/medications-list.component.tsx
rename to packages/esm-service-queues-app/src/past-visit/past-visit-details/medications-list.component.tsx
diff --git a/packages/esm-outpatient-app/src/past-visit/past-visit-details/notes-list.component.tsx b/packages/esm-service-queues-app/src/past-visit/past-visit-details/notes-list.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/past-visit/past-visit-details/notes-list.component.tsx
rename to packages/esm-service-queues-app/src/past-visit/past-visit-details/notes-list.component.tsx
diff --git a/packages/esm-outpatient-app/src/past-visit/past-visit-details/past-visit-summary.component.tsx b/packages/esm-service-queues-app/src/past-visit/past-visit-details/past-visit-summary.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/past-visit/past-visit-details/past-visit-summary.component.tsx
rename to packages/esm-service-queues-app/src/past-visit/past-visit-details/past-visit-summary.component.tsx
diff --git a/packages/esm-outpatient-app/src/past-visit/past-visit-details/past-visit-summary.scss b/packages/esm-service-queues-app/src/past-visit/past-visit-details/past-visit-summary.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/past-visit/past-visit-details/past-visit-summary.scss
rename to packages/esm-service-queues-app/src/past-visit/past-visit-details/past-visit-summary.scss
diff --git a/packages/esm-outpatient-app/src/past-visit/past-visit.component.tsx b/packages/esm-service-queues-app/src/past-visit/past-visit.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/past-visit/past-visit.component.tsx
rename to packages/esm-service-queues-app/src/past-visit/past-visit.component.tsx
diff --git a/packages/esm-outpatient-app/src/past-visit/past-visit.resource.ts b/packages/esm-service-queues-app/src/past-visit/past-visit.resource.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/past-visit/past-visit.resource.ts
rename to packages/esm-service-queues-app/src/past-visit/past-visit.resource.ts
diff --git a/packages/esm-outpatient-app/src/past-visit/past-visit.scss b/packages/esm-service-queues-app/src/past-visit/past-visit.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/past-visit/past-visit.scss
rename to packages/esm-service-queues-app/src/past-visit/past-visit.scss
diff --git a/packages/esm-outpatient-app/src/past-visit/past-visit.test.tsx b/packages/esm-service-queues-app/src/past-visit/past-visit.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/past-visit/past-visit.test.tsx
rename to packages/esm-service-queues-app/src/past-visit/past-visit.test.tsx
diff --git a/packages/esm-outpatient-app/src/patient-info/appointment-details.component.tsx b/packages/esm-service-queues-app/src/patient-info/appointment-details.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-info/appointment-details.component.tsx
rename to packages/esm-service-queues-app/src/patient-info/appointment-details.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-info/appointment-details.scss b/packages/esm-service-queues-app/src/patient-info/appointment-details.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-info/appointment-details.scss
rename to packages/esm-service-queues-app/src/patient-info/appointment-details.scss
diff --git a/packages/esm-outpatient-app/src/patient-info/appointment-details.test.tsx b/packages/esm-service-queues-app/src/patient-info/appointment-details.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-info/appointment-details.test.tsx
rename to packages/esm-service-queues-app/src/patient-info/appointment-details.test.tsx
diff --git a/packages/esm-outpatient-app/src/patient-info/appointments.resource.tsx b/packages/esm-service-queues-app/src/patient-info/appointments.resource.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-info/appointments.resource.tsx
rename to packages/esm-service-queues-app/src/patient-info/appointments.resource.tsx
diff --git a/packages/esm-outpatient-app/src/patient-info/contact-details.component.tsx b/packages/esm-service-queues-app/src/patient-info/contact-details.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-info/contact-details.component.tsx
rename to packages/esm-service-queues-app/src/patient-info/contact-details.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-info/contact-details.scss b/packages/esm-service-queues-app/src/patient-info/contact-details.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-info/contact-details.scss
rename to packages/esm-service-queues-app/src/patient-info/contact-details.scss
diff --git a/packages/esm-outpatient-app/src/patient-info/contact-details.test.tsx b/packages/esm-service-queues-app/src/patient-info/contact-details.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-info/contact-details.test.tsx
rename to packages/esm-service-queues-app/src/patient-info/contact-details.test.tsx
diff --git a/packages/esm-outpatient-app/src/patient-info/hooks/usePatientAttributes.tsx b/packages/esm-service-queues-app/src/patient-info/hooks/usePatientAttributes.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-info/hooks/usePatientAttributes.tsx
rename to packages/esm-service-queues-app/src/patient-info/hooks/usePatientAttributes.tsx
diff --git a/packages/esm-outpatient-app/src/patient-info/patient-info.component.tsx b/packages/esm-service-queues-app/src/patient-info/patient-info.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-info/patient-info.component.tsx
rename to packages/esm-service-queues-app/src/patient-info/patient-info.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-info/patient-info.scss b/packages/esm-service-queues-app/src/patient-info/patient-info.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-info/patient-info.scss
rename to packages/esm-service-queues-app/src/patient-info/patient-info.scss
diff --git a/packages/esm-outpatient-app/src/patient-info/patient-info.test.tsx b/packages/esm-service-queues-app/src/patient-info/patient-info.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-info/patient-info.test.tsx
rename to packages/esm-service-queues-app/src/patient-info/patient-info.test.tsx
diff --git a/packages/esm-outpatient-app/src/patient-queue-header/patient-queue-header.component.tsx b/packages/esm-service-queues-app/src/patient-queue-header/patient-queue-header.component.tsx
similarity index 97%
rename from packages/esm-outpatient-app/src/patient-queue-header/patient-queue-header.component.tsx
rename to packages/esm-service-queues-app/src/patient-queue-header/patient-queue-header.component.tsx
index 06576a3b3..93fa9931f 100644
--- a/packages/esm-outpatient-app/src/patient-queue-header/patient-queue-header.component.tsx
+++ b/packages/esm-service-queues-app/src/patient-queue-header/patient-queue-header.component.tsx
@@ -32,7 +32,7 @@ const PatientQueueHeader: React.FC<{ title?: string }> = ({ title }) => {
         <div className={styles['left-justified-items']}>
           <PatientQueueIllustration />
           <div className={styles['page-labels']}>
-            <p>{t('serviceQueue', 'Service queue')}</p>
+            <p>{t('serviceQueues', 'Service queues')}</p>
             <p className={styles['page-name']}>{title ?? t('home', 'Home')}</p>
           </div>
         </div>
diff --git a/packages/esm-outpatient-app/src/patient-queue-header/patient-queue-header.scss b/packages/esm-service-queues-app/src/patient-queue-header/patient-queue-header.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-queue-header/patient-queue-header.scss
rename to packages/esm-service-queues-app/src/patient-queue-header/patient-queue-header.scss
diff --git a/packages/esm-outpatient-app/src/patient-queue-header/patient-queue-illustration.component.tsx b/packages/esm-service-queues-app/src/patient-queue-header/patient-queue-illustration.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-queue-header/patient-queue-illustration.component.tsx
rename to packages/esm-service-queues-app/src/patient-queue-header/patient-queue-illustration.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-queue-metrics/clinic-metrics.component.tsx b/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-queue-metrics/clinic-metrics.component.tsx
rename to packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-queue-metrics/clinic-metrics.resource.tsx b/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.resource.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-queue-metrics/clinic-metrics.resource.tsx
rename to packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.resource.tsx
diff --git a/packages/esm-outpatient-app/src/patient-queue-metrics/clinic-metrics.scss b/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-queue-metrics/clinic-metrics.scss
rename to packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.scss
diff --git a/packages/esm-outpatient-app/src/patient-queue-metrics/clinic-metrics.test.tsx b/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-queue-metrics/clinic-metrics.test.tsx
rename to packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.test.tsx
diff --git a/packages/esm-outpatient-app/src/patient-queue-metrics/metrics-card.component.tsx b/packages/esm-service-queues-app/src/patient-queue-metrics/metrics-card.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-queue-metrics/metrics-card.component.tsx
rename to packages/esm-service-queues-app/src/patient-queue-metrics/metrics-card.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-queue-metrics/metrics-card.scss b/packages/esm-service-queues-app/src/patient-queue-metrics/metrics-card.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-queue-metrics/metrics-card.scss
rename to packages/esm-service-queues-app/src/patient-queue-metrics/metrics-card.scss
diff --git a/packages/esm-outpatient-app/src/patient-queue-metrics/metrics-header.component.tsx b/packages/esm-service-queues-app/src/patient-queue-metrics/metrics-header.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-queue-metrics/metrics-header.component.tsx
rename to packages/esm-service-queues-app/src/patient-queue-metrics/metrics-header.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-queue-metrics/metrics-header.scss b/packages/esm-service-queues-app/src/patient-queue-metrics/metrics-header.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-queue-metrics/metrics-header.scss
rename to packages/esm-service-queues-app/src/patient-queue-metrics/metrics-header.scss
diff --git a/packages/esm-outpatient-app/src/patient-queue-metrics/queue-metrics.resource.ts b/packages/esm-service-queues-app/src/patient-queue-metrics/queue-metrics.resource.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-queue-metrics/queue-metrics.resource.ts
rename to packages/esm-service-queues-app/src/patient-queue-metrics/queue-metrics.resource.ts
diff --git a/packages/esm-outpatient-app/src/patient-search/advanced-search.component.tsx b/packages/esm-service-queues-app/src/patient-search/advanced-search.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/advanced-search.component.tsx
rename to packages/esm-service-queues-app/src/patient-search/advanced-search.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/advanced-search.scss b/packages/esm-service-queues-app/src/patient-search/advanced-search.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/advanced-search.scss
rename to packages/esm-service-queues-app/src/patient-search/advanced-search.scss
diff --git a/packages/esm-outpatient-app/src/patient-search/advanced-search.test.tsx b/packages/esm-service-queues-app/src/patient-search/advanced-search.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/advanced-search.test.tsx
rename to packages/esm-service-queues-app/src/patient-search/advanced-search.test.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/basic-search.component.tsx b/packages/esm-service-queues-app/src/patient-search/basic-search.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/basic-search.component.tsx
rename to packages/esm-service-queues-app/src/patient-search/basic-search.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/basic-search.scss b/packages/esm-service-queues-app/src/patient-search/basic-search.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/basic-search.scss
rename to packages/esm-service-queues-app/src/patient-search/basic-search.scss
diff --git a/packages/esm-outpatient-app/src/patient-search/basic-search.test.tsx b/packages/esm-service-queues-app/src/patient-search/basic-search.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/basic-search.test.tsx
rename to packages/esm-service-queues-app/src/patient-search/basic-search.test.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/empty-data-illustration.component.tsx b/packages/esm-service-queues-app/src/patient-search/empty-data-illustration.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/empty-data-illustration.component.tsx
rename to packages/esm-service-queues-app/src/patient-search/empty-data-illustration.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/hooks/useActivePatientEnrollment.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/useActivePatientEnrollment.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/hooks/useActivePatientEnrollment.tsx
rename to packages/esm-service-queues-app/src/patient-search/hooks/useActivePatientEnrollment.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/hooks/useDefaultLocation.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/useDefaultLocation.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/hooks/useDefaultLocation.tsx
rename to packages/esm-service-queues-app/src/patient-search/hooks/useDefaultLocation.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/hooks/usePatients.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/usePatients.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/hooks/usePatients.tsx
rename to packages/esm-service-queues-app/src/patient-search/hooks/usePatients.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/hooks/useQueueLocations.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/useQueueLocations.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/hooks/useQueueLocations.tsx
rename to packages/esm-service-queues-app/src/patient-search/hooks/useQueueLocations.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/hooks/useRecommendedVisitTypes.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/useRecommendedVisitTypes.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/hooks/useRecommendedVisitTypes.tsx
rename to packages/esm-service-queues-app/src/patient-search/hooks/useRecommendedVisitTypes.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/hooks/useScheduledVisits.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/useScheduledVisits.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/hooks/useScheduledVisits.tsx
rename to packages/esm-service-queues-app/src/patient-search/hooks/useScheduledVisits.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/patient-scheduled-visits.component.tsx b/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/patient-scheduled-visits.component.tsx
rename to packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/patient-scheduled-visits.scss b/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/patient-scheduled-visits.scss
rename to packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.scss
diff --git a/packages/esm-outpatient-app/src/patient-search/patient-scheduled-visits.test.tsx b/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/patient-scheduled-visits.test.tsx
rename to packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.test.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/patient-search.component.tsx b/packages/esm-service-queues-app/src/patient-search/patient-search.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/patient-search.component.tsx
rename to packages/esm-service-queues-app/src/patient-search/patient-search.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/search-illustration.component.tsx b/packages/esm-service-queues-app/src/patient-search/search-illustration.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/search-illustration.component.tsx
rename to packages/esm-service-queues-app/src/patient-search/search-illustration.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/search-results.component.tsx b/packages/esm-service-queues-app/src/patient-search/search-results.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/search-results.component.tsx
rename to packages/esm-service-queues-app/src/patient-search/search-results.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/search-results.scss b/packages/esm-service-queues-app/src/patient-search/search-results.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/search-results.scss
rename to packages/esm-service-queues-app/src/patient-search/search-results.scss
diff --git a/packages/esm-outpatient-app/src/patient-search/search-results.test.tsx b/packages/esm-service-queues-app/src/patient-search/search-results.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/search-results.test.tsx
rename to packages/esm-service-queues-app/src/patient-search/search-results.test.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/search.resource.ts b/packages/esm-service-queues-app/src/patient-search/search.resource.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/search.resource.ts
rename to packages/esm-service-queues-app/src/patient-search/search.resource.ts
diff --git a/packages/esm-outpatient-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.component.tsx b/packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.component.tsx
rename to packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.scss b/packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.scss
rename to packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.scss
diff --git a/packages/esm-outpatient-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.test.tsx b/packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.test.tsx
rename to packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.test.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/visit-form/base-visit-type.component.tsx b/packages/esm-service-queues-app/src/patient-search/visit-form/base-visit-type.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/visit-form/base-visit-type.component.tsx
rename to packages/esm-service-queues-app/src/patient-search/visit-form/base-visit-type.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/visit-form/base-visit-type.scss b/packages/esm-service-queues-app/src/patient-search/visit-form/base-visit-type.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/visit-form/base-visit-type.scss
rename to packages/esm-service-queues-app/src/patient-search/visit-form/base-visit-type.scss
diff --git a/packages/esm-outpatient-app/src/patient-search/visit-form/base-visit-type.test.tsx b/packages/esm-service-queues-app/src/patient-search/visit-form/base-visit-type.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/visit-form/base-visit-type.test.tsx
rename to packages/esm-service-queues-app/src/patient-search/visit-form/base-visit-type.test.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/visit-form/queue.resource.ts b/packages/esm-service-queues-app/src/patient-search/visit-form/queue.resource.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/visit-form/queue.resource.ts
rename to packages/esm-service-queues-app/src/patient-search/visit-form/queue.resource.ts
diff --git a/packages/esm-outpatient-app/src/patient-search/visit-form/recommended-visit-type.component.tsx b/packages/esm-service-queues-app/src/patient-search/visit-form/recommended-visit-type.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/visit-form/recommended-visit-type.component.tsx
rename to packages/esm-service-queues-app/src/patient-search/visit-form/recommended-visit-type.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/visit-form/visit-form.component.tsx b/packages/esm-service-queues-app/src/patient-search/visit-form/visit-form.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/visit-form/visit-form.component.tsx
rename to packages/esm-service-queues-app/src/patient-search/visit-form/visit-form.component.tsx
diff --git a/packages/esm-outpatient-app/src/patient-search/visit-form/visit-form.scss b/packages/esm-service-queues-app/src/patient-search/visit-form/visit-form.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/patient-search/visit-form/visit-form.scss
rename to packages/esm-service-queues-app/src/patient-search/visit-form/visit-form.scss
diff --git a/packages/esm-outpatient-app/src/queue-entry-table-components/actions-menu.component.tsx b/packages/esm-service-queues-app/src/queue-entry-table-components/actions-menu.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-entry-table-components/actions-menu.component.tsx
rename to packages/esm-service-queues-app/src/queue-entry-table-components/actions-menu.component.tsx
diff --git a/packages/esm-outpatient-app/src/queue-entry-table-components/actions-menu.scss b/packages/esm-service-queues-app/src/queue-entry-table-components/actions-menu.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-entry-table-components/actions-menu.scss
rename to packages/esm-service-queues-app/src/queue-entry-table-components/actions-menu.scss
diff --git a/packages/esm-outpatient-app/src/queue-entry-table-components/edit-entry.component.tsx b/packages/esm-service-queues-app/src/queue-entry-table-components/edit-entry.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-entry-table-components/edit-entry.component.tsx
rename to packages/esm-service-queues-app/src/queue-entry-table-components/edit-entry.component.tsx
diff --git a/packages/esm-outpatient-app/src/queue-entry-table-components/edit-entry.scss b/packages/esm-service-queues-app/src/queue-entry-table-components/edit-entry.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-entry-table-components/edit-entry.scss
rename to packages/esm-service-queues-app/src/queue-entry-table-components/edit-entry.scss
diff --git a/packages/esm-outpatient-app/src/queue-entry-table-components/open-chart.component.tsx b/packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-entry-table-components/open-chart.component.tsx
rename to packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.component.tsx
diff --git a/packages/esm-outpatient-app/src/queue-entry-table-components/open-chart.resource.tsx b/packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.resource.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-entry-table-components/open-chart.resource.tsx
rename to packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.resource.tsx
diff --git a/packages/esm-outpatient-app/src/queue-entry-table-components/open-chart.scss b/packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-entry-table-components/open-chart.scss
rename to packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.scss
diff --git a/packages/esm-outpatient-app/src/queue-entry-table-components/status-icon.component.tsx b/packages/esm-service-queues-app/src/queue-entry-table-components/status-icon.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-entry-table-components/status-icon.component.tsx
rename to packages/esm-service-queues-app/src/queue-entry-table-components/status-icon.component.tsx
diff --git a/packages/esm-outpatient-app/src/queue-entry-table-components/transition-entry.component.tsx b/packages/esm-service-queues-app/src/queue-entry-table-components/transition-entry.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-entry-table-components/transition-entry.component.tsx
rename to packages/esm-service-queues-app/src/queue-entry-table-components/transition-entry.component.tsx
diff --git a/packages/esm-outpatient-app/src/queue-entry-table-components/transition-entry.scss b/packages/esm-service-queues-app/src/queue-entry-table-components/transition-entry.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-entry-table-components/transition-entry.scss
rename to packages/esm-service-queues-app/src/queue-entry-table-components/transition-entry.scss
diff --git a/packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist-base-table.component.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-base-table.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist-base-table.component.tsx
rename to packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-base-table.component.tsx
diff --git a/packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist-base-table.scss b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-base-table.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist-base-table.scss
rename to packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-base-table.scss
diff --git a/packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist-base-table.test.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-base-table.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist-base-table.test.tsx
rename to packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-base-table.test.tsx
diff --git a/packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist-filter.component.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-filter.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist-filter.component.tsx
rename to packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-filter.component.tsx
diff --git a/packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist-filter.scss b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-filter.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist-filter.scss
rename to packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-filter.scss
diff --git a/packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist-filter.test.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-filter.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist-filter.test.tsx
rename to packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-filter.test.tsx
diff --git a/packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist.component.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist.component.tsx
rename to packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist.component.tsx
diff --git a/packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist.resource.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist.resource.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist.resource.tsx
rename to packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist.resource.tsx
diff --git a/packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist.test.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-patient-linelists/queue-linelist.test.tsx
rename to packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist.test.tsx
diff --git a/packages/esm-outpatient-app/src/queue-patient-linelists/queue-services-table.component.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-services-table.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-patient-linelists/queue-services-table.component.tsx
rename to packages/esm-service-queues-app/src/queue-patient-linelists/queue-services-table.component.tsx
diff --git a/packages/esm-outpatient-app/src/queue-patient-linelists/scheduled-appointments-table.component.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/scheduled-appointments-table.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-patient-linelists/scheduled-appointments-table.component.tsx
rename to packages/esm-service-queues-app/src/queue-patient-linelists/scheduled-appointments-table.component.tsx
diff --git a/packages/esm-outpatient-app/src/queue-patient-linelists/scheduled-appointments-table.test.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/scheduled-appointments-table.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-patient-linelists/scheduled-appointments-table.test.tsx
rename to packages/esm-service-queues-app/src/queue-patient-linelists/scheduled-appointments-table.test.tsx
diff --git a/packages/esm-outpatient-app/src/queue-rooms/queue-room-form.component.tsx b/packages/esm-service-queues-app/src/queue-rooms/queue-room-form.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-rooms/queue-room-form.component.tsx
rename to packages/esm-service-queues-app/src/queue-rooms/queue-room-form.component.tsx
diff --git a/packages/esm-outpatient-app/src/queue-rooms/queue-room-form.test.tsx b/packages/esm-service-queues-app/src/queue-rooms/queue-room-form.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-rooms/queue-room-form.test.tsx
rename to packages/esm-service-queues-app/src/queue-rooms/queue-room-form.test.tsx
diff --git a/packages/esm-outpatient-app/src/queue-rooms/queue-room.resource.tsx b/packages/esm-service-queues-app/src/queue-rooms/queue-room.resource.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-rooms/queue-room.resource.tsx
rename to packages/esm-service-queues-app/src/queue-rooms/queue-room.resource.tsx
diff --git a/packages/esm-outpatient-app/src/queue-rooms/queue-room.scss b/packages/esm-service-queues-app/src/queue-rooms/queue-room.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-rooms/queue-room.scss
rename to packages/esm-service-queues-app/src/queue-rooms/queue-room.scss
diff --git a/packages/esm-outpatient-app/src/queue-screen/queue-screen.component.tsx b/packages/esm-service-queues-app/src/queue-screen/queue-screen.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-screen/queue-screen.component.tsx
rename to packages/esm-service-queues-app/src/queue-screen/queue-screen.component.tsx
diff --git a/packages/esm-outpatient-app/src/queue-screen/queue-screen.scss b/packages/esm-service-queues-app/src/queue-screen/queue-screen.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-screen/queue-screen.scss
rename to packages/esm-service-queues-app/src/queue-screen/queue-screen.scss
diff --git a/packages/esm-outpatient-app/src/queue-screen/queue-screen.test.tsx b/packages/esm-service-queues-app/src/queue-screen/queue-screen.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-screen/queue-screen.test.tsx
rename to packages/esm-service-queues-app/src/queue-screen/queue-screen.test.tsx
diff --git a/packages/esm-outpatient-app/src/queue-screen/useActiveTickets.tsx b/packages/esm-service-queues-app/src/queue-screen/useActiveTickets.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-screen/useActiveTickets.tsx
rename to packages/esm-service-queues-app/src/queue-screen/useActiveTickets.tsx
diff --git a/packages/esm-outpatient-app/src/queue-services/queue-service-form.component.tsx b/packages/esm-service-queues-app/src/queue-services/queue-service-form.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-services/queue-service-form.component.tsx
rename to packages/esm-service-queues-app/src/queue-services/queue-service-form.component.tsx
diff --git a/packages/esm-outpatient-app/src/queue-services/queue-service-form.test.tsx b/packages/esm-service-queues-app/src/queue-services/queue-service-form.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-services/queue-service-form.test.tsx
rename to packages/esm-service-queues-app/src/queue-services/queue-service-form.test.tsx
diff --git a/packages/esm-outpatient-app/src/queue-services/queue-service.resource.tsx b/packages/esm-service-queues-app/src/queue-services/queue-service.resource.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-services/queue-service.resource.tsx
rename to packages/esm-service-queues-app/src/queue-services/queue-service.resource.tsx
diff --git a/packages/esm-outpatient-app/src/queue-services/queue-service.scss b/packages/esm-service-queues-app/src/queue-services/queue-service.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/queue-services/queue-service.scss
rename to packages/esm-service-queues-app/src/queue-services/queue-service.scss
diff --git a/packages/esm-outpatient-app/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx b/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx
rename to packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx
diff --git a/packages/esm-outpatient-app/src/remove-queue-entry-dialog/remove-queue-entry.resource.tsx b/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.resource.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/remove-queue-entry-dialog/remove-queue-entry.resource.tsx
rename to packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.resource.tsx
diff --git a/packages/esm-outpatient-app/src/remove-queue-entry-dialog/remove-queue-entry.scss b/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/remove-queue-entry-dialog/remove-queue-entry.scss
rename to packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.scss
diff --git a/packages/esm-outpatient-app/src/remove-queue-entry-dialog/remove-queue-entry.test.tsx b/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/remove-queue-entry-dialog/remove-queue-entry.test.tsx
rename to packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.test.tsx
diff --git a/packages/esm-outpatient-app/src/root.component.tsx b/packages/esm-service-queues-app/src/root.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/root.component.tsx
rename to packages/esm-service-queues-app/src/root.component.tsx
diff --git a/packages/esm-outpatient-app/src/root.scss b/packages/esm-service-queues-app/src/root.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/root.scss
rename to packages/esm-service-queues-app/src/root.scss
diff --git a/packages/esm-outpatient-app/src/root.test.tsx b/packages/esm-service-queues-app/src/root.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/root.test.tsx
rename to packages/esm-service-queues-app/src/root.test.tsx
diff --git a/packages/esm-outpatient-app/src/routes.json b/packages/esm-service-queues-app/src/routes.json
similarity index 100%
rename from packages/esm-outpatient-app/src/routes.json
rename to packages/esm-service-queues-app/src/routes.json
diff --git a/packages/esm-outpatient-app/src/side-menu/nav-group/createNavGroup.tsx b/packages/esm-service-queues-app/src/side-menu/nav-group/createNavGroup.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/side-menu/nav-group/createNavGroup.tsx
rename to packages/esm-service-queues-app/src/side-menu/nav-group/createNavGroup.tsx
diff --git a/packages/esm-outpatient-app/src/side-menu/nav-group/nav-group.component.tsx b/packages/esm-service-queues-app/src/side-menu/nav-group/nav-group.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/side-menu/nav-group/nav-group.component.tsx
rename to packages/esm-service-queues-app/src/side-menu/nav-group/nav-group.component.tsx
diff --git a/packages/esm-outpatient-app/src/side-menu/nav-group/nav-group.test.tsx b/packages/esm-service-queues-app/src/side-menu/nav-group/nav-group.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/side-menu/nav-group/nav-group.test.tsx
rename to packages/esm-service-queues-app/src/side-menu/nav-group/nav-group.test.tsx
diff --git a/packages/esm-outpatient-app/src/side-menu/nav-group/nav-group.ts b/packages/esm-service-queues-app/src/side-menu/nav-group/nav-group.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/side-menu/nav-group/nav-group.ts
rename to packages/esm-service-queues-app/src/side-menu/nav-group/nav-group.ts
diff --git a/packages/esm-outpatient-app/src/side-menu/side-menu.component.tsx b/packages/esm-service-queues-app/src/side-menu/side-menu.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/side-menu/side-menu.component.tsx
rename to packages/esm-service-queues-app/src/side-menu/side-menu.component.tsx
diff --git a/packages/esm-outpatient-app/src/side-menu/side-menu.test.tsx b/packages/esm-service-queues-app/src/side-menu/side-menu.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/side-menu/side-menu.test.tsx
rename to packages/esm-service-queues-app/src/side-menu/side-menu.test.tsx
diff --git a/packages/esm-outpatient-app/src/transition-queue-entry/transition-queue-entry-dialog.component.tsx b/packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/transition-queue-entry/transition-queue-entry-dialog.component.tsx
rename to packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.component.tsx
diff --git a/packages/esm-outpatient-app/src/transition-queue-entry/transition-queue-entry-dialog.scss b/packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/transition-queue-entry/transition-queue-entry-dialog.scss
rename to packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.scss
diff --git a/packages/esm-outpatient-app/src/transition-queue-entry/transition-queue-entry-dialog.test.tsx b/packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.test.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/transition-queue-entry/transition-queue-entry-dialog.test.tsx
rename to packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.test.tsx
diff --git a/packages/esm-outpatient-app/src/transition-queue-entry/transition-queue-entry.resource.ts b/packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry.resource.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/transition-queue-entry/transition-queue-entry.resource.ts
rename to packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry.resource.ts
diff --git a/packages/esm-outpatient-app/src/types/index.ts b/packages/esm-service-queues-app/src/types/index.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/types/index.ts
rename to packages/esm-service-queues-app/src/types/index.ts
diff --git a/packages/esm-outpatient-app/src/visits-missing-inqueue/visits-missing-inqueue.component.tsx b/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.component.tsx
similarity index 100%
rename from packages/esm-outpatient-app/src/visits-missing-inqueue/visits-missing-inqueue.component.tsx
rename to packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.component.tsx
diff --git a/packages/esm-outpatient-app/src/visits-missing-inqueue/visits-missing-inqueue.resource.ts b/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.resource.ts
similarity index 100%
rename from packages/esm-outpatient-app/src/visits-missing-inqueue/visits-missing-inqueue.resource.ts
rename to packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.resource.ts
diff --git a/packages/esm-outpatient-app/src/visits-missing-inqueue/visits-missing-inqueue.scss b/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.scss
similarity index 100%
rename from packages/esm-outpatient-app/src/visits-missing-inqueue/visits-missing-inqueue.scss
rename to packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.scss
diff --git a/packages/esm-outpatient-app/translations/am.json b/packages/esm-service-queues-app/translations/am.json
similarity index 100%
rename from packages/esm-outpatient-app/translations/am.json
rename to packages/esm-service-queues-app/translations/am.json
diff --git a/packages/esm-outpatient-app/translations/en.json b/packages/esm-service-queues-app/translations/en.json
similarity index 100%
rename from packages/esm-outpatient-app/translations/en.json
rename to packages/esm-service-queues-app/translations/en.json
diff --git a/packages/esm-outpatient-app/translations/es.json b/packages/esm-service-queues-app/translations/es.json
similarity index 100%
rename from packages/esm-outpatient-app/translations/es.json
rename to packages/esm-service-queues-app/translations/es.json
diff --git a/packages/esm-outpatient-app/translations/fr.json b/packages/esm-service-queues-app/translations/fr.json
similarity index 100%
rename from packages/esm-outpatient-app/translations/fr.json
rename to packages/esm-service-queues-app/translations/fr.json
diff --git a/packages/esm-outpatient-app/translations/he.json b/packages/esm-service-queues-app/translations/he.json
similarity index 100%
rename from packages/esm-outpatient-app/translations/he.json
rename to packages/esm-service-queues-app/translations/he.json
diff --git a/packages/esm-outpatient-app/translations/km.json b/packages/esm-service-queues-app/translations/km.json
similarity index 100%
rename from packages/esm-outpatient-app/translations/km.json
rename to packages/esm-service-queues-app/translations/km.json
diff --git a/packages/esm-outpatient-app/tsconfig.json b/packages/esm-service-queues-app/tsconfig.json
similarity index 100%
rename from packages/esm-outpatient-app/tsconfig.json
rename to packages/esm-service-queues-app/tsconfig.json
diff --git a/packages/esm-outpatient-app/webpack.config.js b/packages/esm-service-queues-app/webpack.config.js
similarity index 100%
rename from packages/esm-outpatient-app/webpack.config.js
rename to packages/esm-service-queues-app/webpack.config.js
diff --git a/yarn.lock b/yarn.lock
index 2df23a3df..4d84fcfc5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3743,21 +3743,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@openmrs/esm-outpatient-app@workspace:packages/esm-outpatient-app":
-  version: 0.0.0-use.local
-  resolution: "@openmrs/esm-outpatient-app@workspace:packages/esm-outpatient-app"
-  dependencies:
-    "@carbon/react": ^1.12.0
-    lodash-es: ^4.17.15
-    webpack: ^5.74.0
-  peerDependencies:
-    "@openmrs/esm-framework": 5.x
-    react: ^18.1.0
-    react-i18next: 11.x
-    react-router-dom: 6.x
-  languageName: unknown
-  linkType: soft
-
 "@openmrs/esm-patient-list-app@workspace:packages/esm-patient-list-app":
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-patient-list-app@workspace:packages/esm-patient-list-app"
@@ -3894,6 +3879,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@openmrs/esm-service-queues-app@workspace:packages/esm-service-queues-app":
+  version: 0.0.0-use.local
+  resolution: "@openmrs/esm-service-queues-app@workspace:packages/esm-service-queues-app"
+  dependencies:
+    "@carbon/react": ^1.12.0
+    lodash-es: ^4.17.15
+    webpack: ^5.74.0
+  peerDependencies:
+    "@openmrs/esm-framework": 5.x
+    react: ^18.1.0
+    react-i18next: 11.x
+    react-router-dom: 6.x
+  languageName: unknown
+  linkType: soft
+
 "@openmrs/esm-state@npm:^5.1.1-pre.922":
   version: 5.1.1-pre.922
   resolution: "@openmrs/esm-state@npm:5.1.1-pre.922"