diff --git a/xos-profiles/comac/templates/_tosca.tpl b/xos-profiles/comac/templates/_tosca.tpl
index 68b97d8..9169540 100644
--- a/xos-profiles/comac/templates/_tosca.tpl
+++ b/xos-profiles/comac/templates/_tosca.tpl
@@ -36,7 +36,7 @@
           rest_hostname: {{ .onosRestService | quote }}
           rest_port: 8181
 
-{{- if $.wired_service.enabled }}
+{{- if $.resdentialService.enabled }}
     onos_app#openflow-base:
       type: tosca.nodes.ONOSApp
       properties:
@@ -258,7 +258,7 @@
   - custom_types/mcordsubscriberservice.yaml
   - custom_types/onosservice.yaml
   - custom_types/vrouterservice.yaml
-{{- if .Values.wired_service.enabled }}
+{{- if .Values.resdentialService.enabled }}
   - custom_types/rcordservice.yaml
   - custom_types/voltservice.yaml
   - custom_types/fabriccrossconnectservice.yaml
@@ -294,7 +294,7 @@
         name: mcord
         must-exist: true
 
-{{- if .Values.wired_service.enabled }}
+{{- if .Values.resdentialService.enabled }}
     service#rcord:
       type: tosca.nodes.RCORDService
       properties:
@@ -358,7 +358,7 @@
             node: service#fabric
             relationship: tosca.relationships.BelongsToOne
 
-{{- if .Values.wired_service.enabled }}
+{{- if .Values.resdentialService.enabled }}
     service_dependency#rcord_volt:
       type: tosca.nodes.ServiceDependency
       properties:
diff --git a/xos-profiles/comac/templates/tosca-configmap.yaml b/xos-profiles/comac/templates/tosca-configmap.yaml
index 90ab9fc..f04a688 100644
--- a/xos-profiles/comac/templates/tosca-configmap.yaml
+++ b/xos-profiles/comac/templates/tosca-configmap.yaml
@@ -18,7 +18,7 @@
 metadata:
   name: comac-tosca
 data:
-{{- if .Values.wired_service.enabled }}
+{{- if .Values.resdentialService.enabled }}
   010-rcord-subscriber-service.yaml: |
 {{ include "rcord.serviceTosca" .Values.rcord | indent 4 }}
   020-volt-service.yaml: |
@@ -32,7 +32,7 @@
   050-fabric-service.yaml: |
 {{ include "fabric.serviceTosca" .Values.fabric | indent 4 }}
 {{- end }}
-{{- if .Values.wired_service.enabled }}
+{{- if .Values.resdentialService.enabled }}
   060-fixtures.yaml: |
 {{ include "comac.basicFixturesTosca" . | indent 4 }}
 {{- end }}
diff --git a/xos-profiles/comac/templates/tosca-job.yaml b/xos-profiles/comac/templates/tosca-job.yaml
index 3471695..63caaaa 100644
--- a/xos-profiles/comac/templates/tosca-job.yaml
+++ b/xos-profiles/comac/templates/tosca-job.yaml
@@ -35,8 +35,8 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.global.registry }}{{ .Values.images.tosca_loader.repository }}:{{ tpl .Values.images.tosca_loader.tag . }}
-          imagePullPolicy: {{ .Values.images.tosca_loader.pullPolicy }}
+          image: {{ .Values.global.registry }}{{ .Values.images.toscaLoader.repository }}:{{ tpl .Values.images.toscaLoader.tag . }}
+          imagePullPolicy: {{ .Values.images.toscaLoader.pullPolicy }}
           env:
             - name: XOS_USER
               value: {{ .Values.xosAdminUser }}