diff --git a/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml
index f64216c5..8c312a35 100644
--- a/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml
@@ -76,7 +76,7 @@ customService6:
 - skipDeployment: "false"
 
 customService7:
-- name: "(SNS) QuitDiagnosis - OUT"
+- name: "diagservice (SNS) QuitDiagnosis - OUT"
 - className: com.bmw.cc.ts.diagservice.bm.diagnosis.integration.sqs.boundary.DiagnosisEventNotificationESI
 - methodName: quitDiagnosis
 - methodArgs: com.bmw.cc.ts.diagservice.api.consumer.entity.QuitDiagnosisMessage","com.bmw.cc.ts.diagservice.bm.diagnosis.integration.sqs.boundary.model.DiagSnsMessageAttributes
diff --git a/BMW-Dynatrace-config/CD_VDLM_rsurservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_rsurservice/custom-service-java/custom-service-java.yaml
index 444d2431..63b8554d 100644
--- a/BMW-Dynatrace-config/CD_VDLM_rsurservice/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_rsurservice/custom-service-java/custom-service-java.yaml
@@ -12,7 +12,7 @@ customService1:
 - skipDeployment: "false"
 
 customService2:
-- name: "ifs-004 (SQS) QuitDiagnosisMessage - IN"
+- name: "rsurservice ifs-004 (SQS) QuitDiagnosisMessage - IN"
 - className:  com.bmw.cc.ts.rsurservice.api.consumer.external.diagservice.QuitDiagnosisSqsListener
 - methodName: processMessage
 - methodArgs: com.bmw.cd.logging.CdllLoggingContext","software.amazon.awssdk.services.sqs.model.Message
@@ -20,7 +20,7 @@ customService2:
 - skipDeployment: "false"
 
 customService3:
-- name: "(SNS) CallTopic - OUT"
+- name: "rsurservice (SNS) CallTopic - OUT"
 - className: com.bmw.cc.ts.rsurservice.api.consumer.external.callstorage.CallStorageSnsPublisher
 - methodName: createTicket
 - methodArgs: com.bmw.cc.ts.rsurservice.api.consumer.entity.CallStorageModel
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml
index 4d5b400a..6de3555e 100644
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml
@@ -39,21 +39,21 @@ customService3:
 - skipDeployment: "false"
 
 customService4:
-- name: "(Timer) timeout"
+- name: "rtchandler (Timer) timeout"
 - className: com.bmw.cc.ts.rtchandler.bm.common.timer.CallTimeoutTimerService
 - methodName: handleTimer
 - returnType: void
 - skipDeployment: "false"
 
 customService5:
-- name: "(Timer) deletion"
+- name: "rtchandler (Timer) deletion"
 - className: com.bmw.cc.ts.rtchandler.bm.common.control.cleanup.DbCleanUpBA
 - methodName: cleanUp
 - returnType: void
 - skipDeployment: "false"
 
 customService6:
-- name: "(SNS) CallTopic - OUT"
+- name: "rtchandler (SNS) CallTopic - OUT"
 - className: com.bmw.cc.ts.rtchandler.integration.callstorage.CallStorageNotificationESI
 - methodName: publishNotification
 - returnType: void
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/custom-service-java.yaml
index ce2ff237..b7576152 100644
--- a/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/custom-service-java.yaml
@@ -16,7 +16,7 @@ customService1:
 - skipDeployment: "false"
 
 customService2:
-- name: "ifs-004 (SQS) QuitDiagnosisMessage - IN"
+- name: "rtcservice ifs-004 (SQS) QuitDiagnosisMessage - IN"
 - className:  com.bmw.cc.ts.rtcservice.api.consumer.external.diagservice.QuitDiagnosisSqsListener
 - methodName: processMessage
 - methodArgs: com.bmw.cd.logging.CdllLoggingContext","software.amazon.awssdk.services.sqs.model.Message
@@ -24,7 +24,7 @@ customService2:
 - skipDeployment: "false"
 
 customService3:
-- name: "(SNS) CallTopic - OUT"
+- name: "rtcservice (SNS) CallTopic - OUT"
 - className: com.bmw.cc.ts.rtcservice.api.consumer.external.callstorage.CallStorageSnsPublisher
 - methodName: createTicket
 - methodArgs: com.bmw.cc.ts.rtcservice.api.consumer.entity.CallStorageModel
diff --git a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml
index 020d1a6c..be8e8214 100644
--- a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml
@@ -24,7 +24,7 @@ customService2:
 - skipDeployment: "false"
 
 customService3:
-- name: "(SNS) CallTopic - OUT"
+- name: "scallservice (SNS) CallTopic - OUT"
 - className: com.bmw.cc.ts.scallservice.api.consumer.external.callstorage.CallStorageSnsPublisher
 - methodName: createTicket
 - returnType: void
diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml
index 0c73013f..f9e69f66 100644
--- a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml
@@ -5,7 +5,7 @@ config:
 - customService4: template-1-1.json
 
 customService1:
-- name: "(Timer) deletion/timeout"
+- name: "ts-asc (Timer) deletion/timeout"
 - className1: com.bmw.cc.asc.bm.boundary.TimerBF
 - methodName1: executeDeletionJob
 - returnType1: void
@@ -27,7 +27,7 @@ customService2:
 - skipDeployment: "false"
 
 customService3:
-- name: "(MQS) CallTopic - OUT"
+- name: "ts-asc (MQS) CallTopic - OUT"
 - className: com.bmw.cc.asc.integration.jms.boundry.CallTopicJmsESI
 - methodName: send
 - returnType: void
@@ -35,7 +35,7 @@ customService3:
 - skipDeployment: "false"
 
 customService4:
-- name: "(SNS) CallTopic - OUT"
+- name: "ts-asc (SNS) CallTopic - OUT"
 - className: com.bmw.cc.asc.integration.sns.CallTopicSnsESI
 - methodName: send
 - returnType: void
diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-base-ffs/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-base-ffs/custom-service-java/custom-service-java.yaml
index a1ffc8af..620ee4bc 100644
--- a/BMW-Dynatrace-config/CD_VDLM_ts-base-ffs/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_ts-base-ffs/custom-service-java/custom-service-java.yaml
@@ -11,7 +11,7 @@ customService1:
 - skipDeployment: "false"
 
 customService2:
-- name: "(SQS) ServiceNotificationFeedback - OUT"
+- name: "ts-base-ffs (SQS) ServiceNotificationFeedback - OUT"
 - className: com.bmw.cc.tsbaseffs.integration.seam.boundary.SeamESI
 - methodName: sendSqsMessage
 - methodArgs: com.bmw.cc.tsbaseffs.integration.seam.entity.ServiceNotificationFeedbackPayload
diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-bcallhandler/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-bcallhandler/custom-service-java/custom-service-java.yaml
index ed7beae6..6073aabf 100644
--- a/BMW-Dynatrace-config/CD_VDLM_ts-bcallhandler/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_ts-bcallhandler/custom-service-java/custom-service-java.yaml
@@ -28,7 +28,7 @@ customService2:
 - skipDeployment: "false"
 
 customService3:
-- name: "(MQS) CallTopic - OUT"
+- name: "ts-bcallhandler (MQS) CallTopic - OUT"
 - className: com.bmw.cc.tsbcallhandler.integration.jms.boundary.CallTopicJmsESI
 - methodName: send
 - returnType: void
diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-pffs/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-pffs/custom-service-java/custom-service-java.yaml
index 407e0402..d72e7663 100644
--- a/BMW-Dynatrace-config/CD_VDLM_ts-pffs/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_ts-pffs/custom-service-java/custom-service-java.yaml
@@ -11,7 +11,7 @@ customService1:
 - skipDeployment: "false"
 
 customService2:
-- name: "(SQS) ServiceNotificationFeedback - OUT"
+- name: "ts-pffs (SQS) ServiceNotificationFeedback - OUT"
 - className: com.bmw.cc.tspffs.integration.seam.boundary.SeamESI
 - methodName: sendSqsMessage
 - methodArgs: com.bmw.cc.tspffs.integration.seam.entity.ServiceNotificationFeedbackPayload
diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-tyrewf/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-tyrewf/custom-service-java/custom-service-java.yaml
index 69dbec1d..7ab3dde7 100644
--- a/BMW-Dynatrace-config/CD_VDLM_ts-tyrewf/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_ts-tyrewf/custom-service-java/custom-service-java.yaml
@@ -20,7 +20,7 @@ customService2:
 - skipDeployment: "false"
 
 customService3:
-- name: "ifs (SQS) ServiceDemand - OUT"
+- name: "ts-tyrewf (SQS) ServiceDemand - OUT"
 - className:  com.bmw.cc.tstyrewf.integration.seam.boundary.SeamESI
 - methodName: sendMessage
 - methodArgs: com.bmw.cc.tstyrewf.integration.seam.entity.ServiceDemandEventPayload
diff --git a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
index 07468674..517f8d92 100644
--- a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
@@ -19,7 +19,7 @@ customService1:
 - skipDeployment: "false"
 
 customService2:
-- name: "(MQS) CallTopic - OUT"
+- name: "tsrd (MQS) CallTopic - OUT"
 - className: com.bmw.cc.ts.tsrd.bm.jms.calltopic.boundary.CallTopicJmsPublisherBA
 - methodName: publishCallToCallTopic
 - methodArgs: com.bmw.cc.ts.tsrd.bm.jms.calltopic.entity.CallStorageCallDO
@@ -33,7 +33,7 @@ customService3:
 - returnType: void
 
 customService4:
-- name: "(Timer) deletion/timeout"
+- name: "tsrd (Timer) deletion/timeout"
 - className1: com.bmw.cc.ts.tsrd.bm.timer.DatabaseCleanerTimerService
 - methodName1: timeout
 - methodArgs1: javax.ejb.Timer
@@ -45,7 +45,7 @@ customService4:
 - skipDeployment: "false"
 
 customService5:
-- name: "ifs-009 (SQS) QuitDiagnosisMessage - IN"
+- name: "tsrd ifs-009 (SQS) QuitDiagnosisMessage - IN"
 - className: com.bmw.cc.ts.tsrd.bm.remotediagnosis.boundary.DiagServiceSqsListener
 - methodName: processMessage
 - methodArgs: com.bmw.cd.logging.CdllLoggingContext","software.amazon.awssdk.services.sqs.model.Message
@@ -53,7 +53,7 @@ customService5:
 - skipDeployment: "false"
 
 customService6:
-- name: "(SNS) CallTopic - OUT"
+- name: "tsrd (SNS) CallTopic - OUT"
 - className: com.bmw.cc.ts.tsrd.integration.aws.calltopic.CallTopicNotificationESI
 - methodName: publishNotification
 - methodArgs: com.bmw.cc.ts.tsrd.integration.aws.calltopic.CallStorageCallDO