diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml
index e533928..e73c7b3 100644
--- a/kubernetes/aai/templates/sparky-be-deployment.yaml
+++ b/kubernetes/aai/templates/sparky-be-deployment.yaml
@@ -2,8 +2,8 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: sparky-be
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-sparky-be
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.sparkyReplicas }}
   selector:
@@ -13,7 +13,7 @@
     metadata:
       labels:
         app: sparky-be
-      name: sparky-be
+      name: aai-sparky-be
     spec:
       containers:
       - name: sparky-be
@@ -83,16 +83,16 @@
           path: /etc/localtime
       - name: aai-sparky-be-config
         configMap:
-          name: sparky-be-configmap
+          name: aai-sparky-be-configmap
       - name: aai-sparky-be-model-config
         configMap:
-          name: sparky-be-model-configmap
+          name: aai-sparky-be-model-configmap
       - name: aai-sparky-be-portal-config
         configMap:
-          name: sparky-be-portal-configmap
+          name: aai-sparky-be-portal-configmap
       - name: aai-sparky-be-auth-config
         secret:
-          secretName: sparky-be-secret
+          secretName: aai-sparky-be-secret
       - name: filebeat-conf
         configMap:
           name: aai-filebeat-configmap