diff --git a/xos/tosca/resources/ceilometerservice.py b/xos/tosca/resources/ceilometerservice.py
index e77fa55..40c394f 100644
--- a/xos/tosca/resources/ceilometerservice.py
+++ b/xos/tosca/resources/ceilometerservice.py
@@ -6,14 +6,14 @@
 from translator.toscalib.tosca_template import ToscaTemplate
 
 from core.models import ServiceAttribute
-from services.ceilometer.models import CeilometerService
+from services.monitoring.models import CeilometerService
 
 from service import XOSService
 
 class XOSCeilometerService(XOSService):
     provides = "tosca.nodes.CeilometerService"
     xos_model = CeilometerService
-    copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "versionNumber", "ceilometer_pub_sub_url"]
+    copyin_props = ["view_url", "icon_url", "enabled", "published", "private_key_fn", "public_key", "versionNumber", "ceilometer_pub_sub_url"]
 
     def set_service_attr(self, obj, prop_name, value):
         value = self.try_intrinsic_function(value)
diff --git a/xos/tosca/resources/ceilometertenant.py b/xos/tosca/resources/ceilometertenant.py
index cb3a623..3a5914c 100644
--- a/xos/tosca/resources/ceilometertenant.py
+++ b/xos/tosca/resources/ceilometertenant.py
@@ -6,7 +6,7 @@
 from translator.toscalib.tosca_template import ToscaTemplate
 import pdb
 
-from services.ceilometer.models import MonitoringChannel, CeilometerService
+from services.monitoring.models import MonitoringChannel, CeilometerService
 
 from xosresource import XOSResource
 
diff --git a/xos/tosca/resources/sflowservice.py b/xos/tosca/resources/sflowservice.py
index 272518e..3f3a98f 100644
--- a/xos/tosca/resources/sflowservice.py
+++ b/xos/tosca/resources/sflowservice.py
@@ -6,7 +6,7 @@
 from translator.toscalib.tosca_template import ToscaTemplate
 
 from core.models import ServiceAttribute
-from services.ceilometer.models import SFlowService
+from services.monitoring.models import SFlowService
 
 from service import XOSService