diff --git a/kubernetes/acls/csp1_consumer.yaml b/kubernetes/acls/csp1_consumer.yaml
index 9df3ff2..1b8ebcd 100644
--- a/kubernetes/acls/csp1_consumer.yaml
+++ b/kubernetes/acls/csp1_consumer.yaml
@@ -18,7 +18,7 @@ spec:
         host: "*"
       - resource:
           type: topic
-          name: csp1.transactions
+          name: csp1-transactions
           patternType: literal
         operations:
           - Read
@@ -72,7 +72,7 @@ spec:
       volumes:
         - name: user-certs
           secret:
-            secretName: csp1.consumer
+            secretName: csp-consumer
         - name: cluster-certs
           secret:
             secretName: kafka-cluster-ca-cert
@@ -87,7 +87,7 @@ metadata:
 data:
   app.properties: |
     bootstrap.servers=kafka-kafka-bootstrap:9093
-    topic=csp1.transactions
+    topic=csp-transactions
     group.id=csp1_consumer
     app.log.infos=true
     client.id=csp1_consumer
diff --git a/kubernetes/acls/csp1_producer.yaml b/kubernetes/acls/csp1_producer.yaml
index 52336f2..6e21f5d 100644
--- a/kubernetes/acls/csp1_producer.yaml
+++ b/kubernetes/acls/csp1_producer.yaml
@@ -1,7 +1,7 @@
 apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaUser
 metadata:
-  name: csp1.producer
+  name: csp-producer
   labels:
     strimzi.io/cluster: kafka
 spec:
@@ -12,7 +12,7 @@ spec:
     acls:
       - resource:
           type: topic
-          name: csp1.transactions
+          name: csp-transactions
           patternType: literal
         operations:
           - Write
@@ -58,7 +58,7 @@ spec:
             - name: KAFKA_SSL_KEYSTORE_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: csp1.producer
+                  name: csp-producer
                   key: user.password
             - name: KAFKA_SSL_TRUSTSTORE_PASSWORD
               valueFrom:
@@ -68,7 +68,7 @@ spec:
       volumes:
         - name: user-certs
           secret:
-            secretName: csp1.producer
+            secretName: csp-producer
         - name: cluster-certs
           secret:
             secretName: kafka-cluster-ca-cert
@@ -83,7 +83,7 @@ metadata:
 data:
   app.properties: |
     bootstrap.servers=kafka-kafka-bootstrap:9093
-    topic=csp1.transactions
+    topic=csp-transactions
     producer.msgs.per.sec=1
     app.log.infos=true
     client.id=csp1_producer
diff --git a/kubernetes/acls/csp1_transformer.yaml b/kubernetes/acls/csp1_transformer.yaml
index 009643d..8858bf6 100644
--- a/kubernetes/acls/csp1_transformer.yaml
+++ b/kubernetes/acls/csp1_transformer.yaml
@@ -1,7 +1,7 @@
 apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaUser
 metadata:
-  name: csp1.transformer
+  name: csp-transformer
   labels:
     strimzi.io/cluster: kafka
 spec:
@@ -12,13 +12,13 @@ spec:
     acls:
       - resource:
           type: group
-          name: csp1.transformer
+          name: csp-transformer
           patternType: literal
         operation: Read
         host: "*"
       - resource:
           type: topic
-          name: csp1.transactions
+          name: csp-transactions
           patternType: literal
         operations:
           - Read
@@ -76,7 +76,7 @@ spec:
             - name: KAFKA_SSL_KEYSTORE_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: csp1.producer
+                  name: csp-producer
                   key: user.password
             - name: KAFKA_SSL_TRUSTSTORE_PASSWORD
               valueFrom:
@@ -86,7 +86,7 @@ spec:
       volumes:
         - name: user-certs
           secret:
-            secretName: csp1.producer
+            secretName: csp-producer
         - name: cluster-certs
           secret:
             secretName: kafka-cluster-ca-cert
@@ -101,7 +101,7 @@ metadata:
 data:
   app.properties: |
     bootstrap.servers=kafka-kafka-bootstrap:9093
-    csp1.topic=csp1.transactions
+    csp1.topic=csp1-transactions
     output.topic=transactions
     group.id=csp1_transformer
     transactional.id=transactions-transformer-app
diff --git a/kubernetes/acls/csp2_producer.yaml b/kubernetes/acls/csp2_producer.yaml
index d9baefe..f7eb6db 100644
--- a/kubernetes/acls/csp2_producer.yaml
+++ b/kubernetes/acls/csp2_producer.yaml
@@ -1,7 +1,7 @@
 apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaUser
 metadata:
-  name: csp2.producer
+  name: csp-producer
   labels:
     strimzi.io/cluster: kafka
 spec:
@@ -12,7 +12,7 @@ spec:
     acls:
       - resource:
           type: topic
-          name: csp2.transactions
+          name: csp-transactions
           patternType: literal
         operations:
           - Write
@@ -56,7 +56,7 @@ spec:
             - name: KAFKA_SSL_KEYSTORE_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: csp2.producer
+                  name: csp-producer
                   key: user.password
             - name: KAFKA_SSL_TRUSTSTORE_PASSWORD
               valueFrom:
@@ -66,7 +66,7 @@ spec:
       volumes:
         - name: user-certs
           secret:
-            secretName: csp2.producer
+            secretName: csp-producer
         - name: cluster-certs
           secret:
             secretName: kafka-cluster-ca-cert
@@ -81,7 +81,7 @@ metadata:
 data:
   app.properties: |
     bootstrap.servers=kafka-kafka-bootstrap:9093
-    topic=csp2.transactions
+    topic=csp-transactions
     producer.batch_interval.s=10
     producer.msgs_per_batch=100
     app.log.infos=true
diff --git a/kubernetes/acls/csp2_transformer.yaml b/kubernetes/acls/csp2_transformer.yaml
index 64bf292..39f869e 100644
--- a/kubernetes/acls/csp2_transformer.yaml
+++ b/kubernetes/acls/csp2_transformer.yaml
@@ -1,7 +1,7 @@
 apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaUser
 metadata:
-  name: csp2.transformer
+  name: csp-transformer
   labels:
     strimzi.io/cluster: kafka
 spec:
@@ -12,7 +12,7 @@ spec:
     acls:
       - resource:
           type: group
-          name: csp2.transformer
+          name: csp-transformer
           patternType: literal
         operation: Read
         host: "*"
@@ -69,7 +69,7 @@ spec:
             - name: KAFKA_SSL_KEYSTORE_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: csp2.transformer
+                  name: csp-transformer
                   key: user.password
             - name: KAFKA_SSL_TRUSTSTORE_PASSWORD
               valueFrom:
@@ -79,7 +79,7 @@ spec:
       volumes:
         - name: user-certs
           secret:
-            secretName: csp2.transformer
+            secretName: csp-transformer
         - name: cluster-certs
           secret:
             secretName: kafka-cluster-ca-cert
@@ -95,9 +95,9 @@ data:
   app.properties: |
     bootstrap.servers=kafka-kafka-bootstrap:9093
     application.id=csp2-transformer2
-    csp2.transactions.topic=csp2.transactions
-    csp2.customer_id_mapping.topic=csp2.customer.id.mapping
-    csp2.chargingstation_id_mapping.topic=csp2.chargingstation.id.mapping
+    csp2.transactions.topic=csp-transactions
+    csp2.customer_id_mapping.topic=csp-customer.id.mapping
+    csp2.chargingstation_id_mapping.topic=csp-chargingstation.id.mapping
     output.topic=transactions
     processing.time.ms=100
     app.log.infos=true