diff --git a/docker-compose-perf.yml b/docker-compose-perf.yml
index 14bd612a..93f2a137 100644
--- a/docker-compose-perf.yml
+++ b/docker-compose-perf.yml
@@ -19,7 +19,7 @@ services:
     environment:
       - LOG_LEVEL=info
       - ALS_DISPLAY_ROUTES=false
-      - ALS_SWITCH_ENDPOINT=http://callback-handler-svc:3001/admin
+      - ALS_SWITCH_ENDPOINT=http://callback-handler-svc-cl-sim:3001/admin
       - WAIT4_CONFIG=./wait4.config.perf-als.js
       - EVENT_SDK_TRACEID_PER_VENDOR=false
     networks:
diff --git a/docker/ml-testing-toolkit/test-cases/environments/default-env.json b/docker/ml-testing-toolkit/test-cases/environments/default-env.json
index 315fb0c3..cd22b5bb 100644
--- a/docker/ml-testing-toolkit/test-cases/environments/default-env.json
+++ b/docker/ml-testing-toolkit/test-cases/environments/default-env.json
@@ -50,8 +50,8 @@
     "PERF_FSP2_ID": "perffsp2",
     "PERF_FSP1_MSISDN": "19012345001",
     "PERF_FSP2_MSISDN": "19012345002",
-    "PERF_FSP1_CALLBACK_ENDPOINT_BASE_URL": "http://callback-handler-svc:3001/fspiop",
-    "PERF_FSP2_CALLBACK_ENDPOINT_BASE_URL": "http://mojaloop-testing-toolkit:4040",
-    "PERF_ORACLE_ENDPOINT_BASE_URL": "http://callback-handler-svc:3001/oracle"
+    "PERF_FSP1_CALLBACK_ENDPOINT_BASE_URL": "http://callback-handler-svc-payer-sim:3001/fspiop",
+    "PERF_FSP2_CALLBACK_ENDPOINT_BASE_URL": "http://callback-handler-svc-payee-sim:3001/fspiop",
+    "PERF_ORACLE_ENDPOINT_BASE_URL": "http://callback-handler-svc-oracle-sim:3001/oracle"
   }
 }
\ No newline at end of file
diff --git a/docker/wait4/wait4.config.perf-als.js b/docker/wait4/wait4.config.perf-als.js
index c8dc7757..e057af45 100644
--- a/docker/wait4/wait4.config.perf-als.js
+++ b/docker/wait4/wait4.config.perf-als.js
@@ -57,8 +57,8 @@ module.exports = {
       name: 'account-lookup-service',
       wait4: [
         {
-          description: 'callback-handler api server',
-          uri: 'callback-handler-svc:3001',
+          description: 'callback-handler central ledger admin simulator',
+          uri: 'callback-handler-svc-cl-sim:3001',
           method: 'ncat',
 
           // we have to wait much longer for central-ledger
diff --git a/packages/callback-handler-svc/handlers/admin.js b/packages/callback-handler-svc/handlers/admin.js
index 41eea5a0..7d8f4685 100644
--- a/packages/callback-handler-svc/handlers/admin.js
+++ b/packages/callback-handler-svc/handlers/admin.js
@@ -58,39 +58,39 @@ const init = (config, logger, options = undefined) => {
     res.status(200).json(
       [
         {
-           "type":"ADMIN_FSPIOP_CALLBACK_URL_PARTICIPANT_PUT",
+           "type":"FSPIOP_CALLBACK_URL_PARTICIPANT_PUT",
            "value":`${ADMIN_FSPIOP_CALLBACK_URL}/participants/{{partyIdType}}/{{partyIdentifier}}`
         },
         {
-           "type":"ADMIN_FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR",
+           "type":"FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR",
            "value":`${ADMIN_FSPIOP_CALLBACK_URL}/participants/{{partyIdType}}/{{partyIdentifier}}/error`
         },
         {
-           "type":"ADMIN_FSPIOP_CALLBACK_URL_PARTIES_GET",
+           "type":"FSPIOP_CALLBACK_URL_PARTIES_GET",
            "value":`${ADMIN_FSPIOP_CALLBACK_URL}/parties/{{partyIdType}}/{{partyIdentifier}}`
         },
         {
-           "type":"ADMIN_FSPIOP_CALLBACK_URL_PARTIES_PUT",
+           "type":"FSPIOP_CALLBACK_URL_PARTIES_PUT",
            "value":`${ADMIN_FSPIOP_CALLBACK_URL}/parties/{{partyIdType}}/{{partyIdentifier}}`
         },
         {
-           "type":"ADMIN_FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT",
+           "type":"FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT",
            "value":`${ADMIN_FSPIOP_CALLBACK_URL}/participants/{{partyIdType}}/{{partyIdentifier}}/{{partySubIdOrType}}`
         },
         {
-           "type":"ADMIN_FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR",
+           "type":"FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR",
            "value":`${ADMIN_FSPIOP_CALLBACK_URL}/participants/{{partyIdType}}/{{partyIdentifier}}/{{partySubIdOrType}}/error`
         },
         {
-           "type":"ADMIN_FSPIOP_CALLBACK_URL_PARTIES_SUB_ID_GET",
+           "type":"FSPIOP_CALLBACK_URL_PARTIES_SUB_ID_GET",
            "value":`${ADMIN_FSPIOP_CALLBACK_URL}/parties/{{partyIdType}}/{{partyIdentifier}}/{{partySubIdOrType}}`
         },
         {
-           "type":"ADMIN_FSPIOP_CALLBACK_URL_PARTIES_SUB_ID_PUT",
+           "type":"FSPIOP_CALLBACK_URL_PARTIES_SUB_ID_PUT",
            "value":`${ADMIN_FSPIOP_CALLBACK_URL}/parties/{{partyIdType}}/{{partyIdentifier}}/{{partySubIdOrType}}`
         },
         {
-           "type":"ADMIN_FSPIOP_CALLBACK_URL_PARTIES_SUB_ID_PUT_ERROR",
+           "type":"FSPIOP_CALLBACK_URL_PARTIES_SUB_ID_PUT_ERROR",
            "value":`${ADMIN_FSPIOP_CALLBACK_URL}/parties/{{partyIdType}}/{{partyIdentifier}}/{{partySubIdOrType}}/error`
         },
         {
@@ -106,15 +106,15 @@ const init = (config, logger, options = undefined) => {
            "value":"test@test.test"
         },
         {
-           "type":"ADMIN_FSPIOP_CALLBACK_URL_PARTICIPANT_BATCH_PUT",
+           "type":"FSPIOP_CALLBACK_URL_PARTICIPANT_BATCH_PUT",
            "value":`${ADMIN_FSPIOP_CALLBACK_URL}/participants/{{requestId}}`
         },
         {
-           "type":"ADMIN_FSPIOP_CALLBACK_URL_PARTICIPANT_BATCH_PUT_ERROR",
+           "type":"FSPIOP_CALLBACK_URL_PARTICIPANT_BATCH_PUT_ERROR",
            "value":`${ADMIN_FSPIOP_CALLBACK_URL}/participants/{{requestId}}/error`
         },
         {
-           "type":"ADMIN_FSPIOP_CALLBACK_URL_PARTIES_PUT_ERROR",
+           "type":"FSPIOP_CALLBACK_URL_PARTIES_PUT_ERROR",
            "value":`${ADMIN_FSPIOP_CALLBACK_URL}/parties/{{partyIdType}}/{{partyIdentifier}}/error`
         }
      ]