diff --git a/kubernetes/dmaap/components/dbc/.helmignore b/kubernetes/dmaap/components/dmaap-bc/.helmignore
similarity index 100%
rename from kubernetes/dmaap/components/dbc/.helmignore
rename to kubernetes/dmaap/components/dmaap-bc/.helmignore
diff --git a/kubernetes/dmaap/components/dbc/Chart.yaml b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
similarity index 97%
rename from kubernetes/dmaap/components/dbc/Chart.yaml
rename to kubernetes/dmaap/components/dmaap-bc/Chart.yaml
index bd07b7a..37862dc 100644
--- a/kubernetes/dmaap/components/dbc/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
@@ -15,5 +15,5 @@
 
 apiVersion: v1
 description: a Helm chart to deploy ONAP DMaaP Bus Controller (aka dmaap-bc) in Kubernetes
-name: dbc
+name: dmaap-bc
 version: 4.0.0
diff --git a/kubernetes/dmaap/components/dbc/README.md b/kubernetes/dmaap/components/dmaap-bc/README.md
similarity index 100%
rename from kubernetes/dmaap/components/dbc/README.md
rename to kubernetes/dmaap/components/dmaap-bc/README.md
diff --git a/kubernetes/dmaap/components/dbc/requirements.yaml b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dbc/requirements.yaml
rename to kubernetes/dmaap/components/dmaap-bc/requirements.yaml
diff --git a/kubernetes/dmaap/components/dbc/resources/config/buscontroller.env b/kubernetes/dmaap/components/dmaap-bc/resources/config/buscontroller.env
similarity index 100%
rename from kubernetes/dmaap/components/dbc/resources/config/buscontroller.env
rename to kubernetes/dmaap/components/dmaap-bc/resources/config/buscontroller.env
diff --git a/kubernetes/dmaap/components/dbc/resources/config/dmaapbc.properties b/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
similarity index 100%
rename from kubernetes/dmaap/components/dbc/resources/config/dmaapbc.properties
rename to kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
diff --git a/kubernetes/dmaap/components/dbc/resources/dcaeLocations/san-francisco.json b/kubernetes/dmaap/components/dmaap-bc/resources/dcaeLocations/san-francisco.json
similarity index 100%
rename from kubernetes/dmaap/components/dbc/resources/dcaeLocations/san-francisco.json
rename to kubernetes/dmaap/components/dmaap-bc/resources/dcaeLocations/san-francisco.json
diff --git a/kubernetes/dmaap/components/dbc/resources/dmaap/onap.json b/kubernetes/dmaap/components/dmaap-bc/resources/dmaap/onap.json
similarity index 100%
rename from kubernetes/dmaap/components/dbc/resources/dmaap/onap.json
rename to kubernetes/dmaap/components/dmaap-bc/resources/dmaap/onap.json
diff --git a/kubernetes/dmaap/components/dbc/resources/mr_clusters/san-francisco.json b/kubernetes/dmaap/components/dmaap-bc/resources/mr_clusters/san-francisco.json
similarity index 100%
rename from kubernetes/dmaap/components/dbc/resources/mr_clusters/san-francisco.json
rename to kubernetes/dmaap/components/dmaap-bc/resources/mr_clusters/san-francisco.json
diff --git a/kubernetes/dmaap/components/dbc/templates/NOTES.txt b/kubernetes/dmaap/components/dmaap-bc/templates/NOTES.txt
similarity index 100%
rename from kubernetes/dmaap/components/dbc/templates/NOTES.txt
rename to kubernetes/dmaap/components/dmaap-bc/templates/NOTES.txt
diff --git a/kubernetes/dmaap/components/dbc/templates/configmap.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dbc/templates/configmap.yaml
rename to kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml
diff --git a/kubernetes/dmaap/components/dbc/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dbc/templates/deployment.yaml
rename to kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
diff --git a/kubernetes/dmaap/components/dbc/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml
similarity index 97%
rename from kubernetes/dmaap/components/dbc/templates/post-install-job.yaml
rename to kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml
index 1272c53..02ad199 100644
--- a/kubernetes/dmaap/components/dbc/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml
@@ -15,7 +15,7 @@
 spec:
   template:
     metadata:
-      name: "{{.Release.Name}}"
+      name: {{ include "common.fullname" . }}
       labels:
         app.kubernetes.io/managed-by: {{.Release.Service | quote }}
         app.kubernetes.io/instance: {{.Release.Name | quote }}
diff --git a/kubernetes/dmaap/components/dbc/templates/service.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/service.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dbc/templates/service.yaml
rename to kubernetes/dmaap/components/dmaap-bc/templates/service.yaml
diff --git a/kubernetes/dmaap/components/dbc/values.yaml b/kubernetes/dmaap/components/dmaap-bc/values.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dbc/values.yaml
rename to kubernetes/dmaap/components/dmaap-bc/values.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
index c6fa76c..79c47a1 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
@@ -15,7 +15,7 @@
 spec:
   template:
     metadata:
-      name: "{{.Release.Name}}"
+      name: {{ include "common.fullname" . }}
       labels:
         app.kubernetes.io/managed-by: {{.Release.Service | quote }}
         app.kubernetes.io/instance: {{.Release.Name | quote }}
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
index 1f7214f..ceb9a04 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
@@ -15,7 +15,7 @@
 spec:
   template:
     metadata:
-      name: "{{.Release.Name}}"
+      name: {{ include "common.fullname" . }}
       labels:
         app.kubernetes.io/managed-by: {{.Release.Service | quote }}
         app.kubernetes.io/instance: {{.Release.Name | quote }}
@@ -59,9 +59,6 @@
         - name: localtime
           hostPath:
             path: /etc/localtime
-#        - name: {{ include "common.name" . }}-config
-#          configMap:
-#            name: {{ include "common.fullname" . }}-config
         - name: {{ include "common.fullname" . }}-dbc-feeds
           configMap:
             name: {{ include "common.fullname" . }}-dbc-feeds
diff --git a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
index df840ce..5637812 100644
--- a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
@@ -15,7 +15,7 @@
 spec:
   template:
     metadata:
-      name: "{{.Release.Name}}"
+      name: {{ include "common.fullname" . }}
       labels:
         app.kubernetes.io/managed-by: {{.Release.Service | quote }}
         app.kubernetes.io/instance: {{.Release.Name | quote }}