diff --git a/cord-pod/Makefile b/cord-pod/Makefile
index b982e6a..cea341e 100644
--- a/cord-pod/Makefile
+++ b/cord-pod/Makefile
@@ -107,18 +107,18 @@
 	bash ../common/wait_for_onboarding_ready.sh 81 xos
 	bash ../common/wait_for_xos_port.sh 80
 
-cord-ceilometer: ceilometer_custom_images cord onboard-ceilometer
-	$(RUN_TOSCA) ceilometer.yaml
+cord-monitoringservice: ceilometer_custom_images cord onboard-monitoringservice
+	$(RUN_TOSCA) monitoringservice.yaml
 
-onboard-ceilometer: download-ceilometer
-	sudo cp id_rsa key_import/monitoring_channel_rsa
-	sudo cp id_rsa.pub key_import/monitoring_channel_rsa.pub
-	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/monitoring/xos/ceilometer-onboard.yaml
-	bash ../common/wait_for_onboarding_ready.sh 81 services/ceilometer
+onboard-monitoringservice: download-monitoringservice
+	sudo cp id_rsa key_import/monitoringservice_rsa
+	sudo cp id_rsa.pub key_import/monitoringservice_rsa.pub
+	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/monitoring/xos/monitoring-onboard.yaml
+	bash ../common/wait_for_onboarding_ready.sh 81 services/monitoring
 	bash ../common/wait_for_onboarding_ready.sh 81 xos
 	bash ../common/wait_for_xos_port.sh 80
 
-download-ceilometer:
+download-monitoringservice:
 	make -f ../common/Makefile.services monitoring_services
 
 nodes.yaml:
diff --git a/cord-pod/ceilometer.yaml b/cord-pod/monitoringservice.yaml
similarity index 95%
rename from cord-pod/ceilometer.yaml
rename to cord-pod/monitoringservice.yaml
index 07b163e..da9c01d 100644
--- a/cord-pod/ceilometer.yaml
+++ b/cord-pod/monitoringservice.yaml
@@ -120,19 +120,19 @@
       type: tosca.nodes.CeilometerService
       requirements:
       properties:
-          view_url: /admin/ceilometer/ceilometerservice/$id$/
+          view_url: /admin/monitoring/ceilometerservice/$id$/
           kind: ceilometer
           ceilometer_pub_sub_url: http://10.11.10.1:4455/
           public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }
-          private_key_fn: /opt/xos/synchronizers/monitoring_channel/monitoring_channel_private_key
+          private_key_fn: /opt/xos/services/monitoring/keys/monitoringservice_rsa
       artifacts:
-          pubkey: /opt/xos/synchronizers/monitoring_channel/monitoring_channel_public_key
+          pubkey: /opt/xos/services/monitoring/keys/monitoringservice_rsa.pub
 
 #    service_sflow:
 #      type: tosca.nodes.SFlowService
 #      requirements:
 #      properties:
-#          view_url: /admin/ceilometer/sflowservice/$id$/
+#          view_url: /admin/monitoring/sflowservice/$id$/
 #          kind: sflow
 #          sflow_port: 6343
 #          sflow_api_port: 33333
diff --git a/cord-pod/xos.yaml b/cord-pod/xos.yaml
index 33374c0..91327f2 100644
--- a/cord-pod/xos.yaml
+++ b/cord-pod/xos.yaml
@@ -75,12 +75,12 @@
 #             node: xos
 #             relationship: tosca.relationships.UsedByXOS
 
-    /opt/xos/synchronizers/monitoring_channel/monitoring_channel_public_key:
-      type: tosca.nodes.XOSVolume
-      properties:
-          host_path: { path_join: [ SELF, CONFIG_DIR, id_rsa.pub, ENV_VAR ] }                                                      
-          read_only: true
-      requirements:
-          - xos:
-             node: xos
-             relationship: tosca.relationships.UsedByXOS
+#    /opt/xos/synchronizers/monitoring_channel/monitoring_channel_public_key:
+#      type: tosca.nodes.XOSVolume
+#      properties:
+#          host_path: { path_join: [ SELF, CONFIG_DIR, id_rsa.pub, ENV_VAR ] }
+#          read_only: true
+#      requirements:
+#          - xos:
+#             node: xos
+#             relationship: tosca.relationships.UsedByXOS