diff --git a/central/values.yaml b/central/values.yaml
index 9b33d2808..f27a1c954 100644
--- a/central/values.yaml
+++ b/central/values.yaml
@@ -3341,15 +3341,15 @@ centralsettlement:
           // Description: This script calculates the interchange fees between DFSPs where the account type is "Wallet"
           // ********************************************************
 
-             ## Globals:
+          // ## Globals:
           // payload: The contents of the message from the Kafka topic.
           // transfer: The transfer object.
 
           // # Functions:
-             ## Data retrieval functions:
+          // ## Data retrieval functions:
           // getTransfer(transferId): Retrieves a mojaloop transfer from the central-ledger API.
 
-             ## Helper functions:
+          // ## Helper functions:
           // getExtensionValue(list, key): Gets a value from an extension list
           // log(message): allows the script to log to standard out for debugging purposes
 
diff --git a/centralledger/chart-handler-admin-transfer/templates/NOTES.txt b/centralledger/chart-handler-admin-transfer/templates/NOTES.txt
index 32805b2b5..9c64c0707 100644
--- a/centralledger/chart-handler-admin-transfer/templates/NOTES.txt
+++ b/centralledger/chart-handler-admin-transfer/templates/NOTES.txt
@@ -9,7 +9,7 @@
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "centralledger-transfer-prepare.fullname" . }}'
+           You can watch the status of by running 'kubectl get svc -w {{ template "centralledger-handler-admin-transfer.fullname" . }}'
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "centralledger-handler-admin-transfer.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
 {{- else if contains "ClusterIP" .Values.service.type }}
diff --git a/centralledger/chart-handler-timeout/templates/NOTES.txt b/centralledger/chart-handler-timeout/templates/NOTES.txt
index 207678970..46a80f4c6 100644
--- a/centralledger/chart-handler-timeout/templates/NOTES.txt
+++ b/centralledger/chart-handler-timeout/templates/NOTES.txt
@@ -4,16 +4,16 @@
   http://{{ . }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "centralledger-transfer-get.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "centralledger-handler-timeout.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "centralledger-transfer-get.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "centralledger-transfer-get.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get svc -w {{ template "centralledger-handler-timeout.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "centralledger-handler-timeout.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "centralledger-transfer-get.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "centralledger-handler-timeout.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }}
 {{- end }}
diff --git a/centralledger/chart-handler-transfer-fulfil/templates/NOTES.txt b/centralledger/chart-handler-transfer-fulfil/templates/NOTES.txt
index 4977252d2..43f44bd4d 100644
--- a/centralledger/chart-handler-transfer-fulfil/templates/NOTES.txt
+++ b/centralledger/chart-handler-transfer-fulfil/templates/NOTES.txt
@@ -4,16 +4,16 @@
   http://{{ . }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "centralledger-transfer-fulfil.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "centralledger-handler-transfer-fulfil.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "centralledger-transfer-fulfil.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "centralledger-transfer-fulfil.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get svc -w {{ template "centralledger-handler-transfer-fulfil.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "centralledger-handler-transfer-fulfil.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "centralledger-transfer-fulfil.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "centralledger-handler-transfer-fulfil.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }}
 {{- end }}
diff --git a/centralledger/chart-handler-transfer-get/templates/NOTES.txt b/centralledger/chart-handler-transfer-get/templates/NOTES.txt
index 207678970..6dd5d75f3 100644
--- a/centralledger/chart-handler-transfer-get/templates/NOTES.txt
+++ b/centralledger/chart-handler-transfer-get/templates/NOTES.txt
@@ -4,16 +4,16 @@
   http://{{ . }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "centralledger-transfer-get.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "centralledger-handler-transfer-get.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "centralledger-transfer-get.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "centralledger-transfer-get.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get svc -w {{ template "centralledger-handler-transfer-get.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "centralledger-handler-transfer-get.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "centralledger-transfer-get.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "centralledger-handler-transfer-get.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }}
 {{- end }}
diff --git a/centralledger/chart-handler-transfer-position/templates/NOTES.txt b/centralledger/chart-handler-transfer-position/templates/NOTES.txt
index a006a9252..bf014fb6c 100644
--- a/centralledger/chart-handler-transfer-position/templates/NOTES.txt
+++ b/centralledger/chart-handler-transfer-position/templates/NOTES.txt
@@ -4,16 +4,16 @@
   http://{{ . }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "centralledger-transfer-position.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "centralledger-handler-transfer-position.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "centralledger-transfer-position.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "centralledger-transfer-position.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get svc -w {{ template "centralledger-handler-transfer-position.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "centralledger-handler-transfer-position.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "centralledger-transfer-position.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "centralledger-handler-transfer-position.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }}
 {{- end }}
diff --git a/centralledger/chart-handler-transfer-prepare/templates/NOTES.txt b/centralledger/chart-handler-transfer-prepare/templates/NOTES.txt
index 99e1495d8..d558edacb 100644
--- a/centralledger/chart-handler-transfer-prepare/templates/NOTES.txt
+++ b/centralledger/chart-handler-transfer-prepare/templates/NOTES.txt
@@ -4,16 +4,16 @@
   http://{{ . }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "centralledger-transfer-prepare.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "centralledger-handler-transfer-prepare.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "centralledger-transfer-prepare.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "centralledger-transfer-prepare.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get svc -w {{ template "centralledger-handler-transfer-prepare.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "centralledger-handler-transfer-prepare.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "centralledger-transfer-prepare.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "centralledger-handler-transfer-prepare.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }}
 {{- end }}
diff --git a/centralsettlement/values.yaml b/centralsettlement/values.yaml
index a8a30705a..58f4b61fb 100644
--- a/centralsettlement/values.yaml
+++ b/centralsettlement/values.yaml
@@ -1243,15 +1243,15 @@ centralsettlement-handler-rules:
         // Description: This script calculates the interchange fees between DFSPs where the account type is "Wallet"
         // ********************************************************
 
-           ## Globals:
+        // ## Globals:
         // payload: The contents of the message from the Kafka topic.
         // transfer: The transfer object.
 
         // # Functions:
-           ## Data retrieval functions:
+        // ## Data retrieval functions:
         // getTransfer(transferId): Retrieves a mojaloop transfer from the central-ledger API.
 
-           ## Helper functions:
+        // ## Helper functions:
         // getExtensionValue(list, key): Gets a value from an extension list
         // log(message): allows the script to log to standard out for debugging purposes
 
diff --git a/ml-api-adapter/chart-handler-notification/templates/NOTES.txt b/ml-api-adapter/chart-handler-notification/templates/NOTES.txt
index 054f6e483..9e88e9c7d 100644
--- a/ml-api-adapter/chart-handler-notification/templates/NOTES.txt
+++ b/ml-api-adapter/chart-handler-notification/templates/NOTES.txt
@@ -4,16 +4,16 @@
   http://{{ . }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "ml-api-adapter.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "ml-api-adapter-handler-notification.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "ml-api-adapter.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "ml-api-adapter.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get svc -w {{ template "ml-api-adapter-handler-notification.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "ml-api-adapter-handler-notification.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "ml-api-adapter.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "ml-api-adapter-handler-notification.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }}
 {{- end }}
diff --git a/ml-api-adapter/chart-service/templates/NOTES.txt b/ml-api-adapter/chart-service/templates/NOTES.txt
index 054f6e483..37dc296ea 100644
--- a/ml-api-adapter/chart-service/templates/NOTES.txt
+++ b/ml-api-adapter/chart-service/templates/NOTES.txt
@@ -4,16 +4,16 @@
   http://{{ . }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "ml-api-adapter.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "ml-api-adapter-service.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "ml-api-adapter.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "ml-api-adapter.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get svc -w {{ template "ml-api-adapter-service.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "ml-api-adapter-service.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "ml-api-adapter.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "ml-api-adapter-service.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }}
 {{- end }}
diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml
index a9097314f..2a936de27 100644
--- a/mojaloop/values.yaml
+++ b/mojaloop/values.yaml
@@ -3247,15 +3247,15 @@ central:
             // Description: This script calculates the interchange fees between DFSPs where the account type is "Wallet"
             // ********************************************************
 
-               ## Globals:
+            // ## Globals:
             // payload: The contents of the message from the Kafka topic.
             // transfer: The transfer object.
 
             // # Functions:
-               ## Data retrieval functions:
+            // ## Data retrieval functions:
             // getTransfer(transferId): Retrieves a mojaloop transfer from the central-ledger API.
 
-               ## Helper functions:
+            // ## Helper functions:
             // getExtensionValue(list, key): Gets a value from an extension list
             // log(message): allows the script to log to standard out for debugging purposes