diff --git a/roles/test-subscriber-config/templates/test-subscriber.yaml.j2 b/roles/test-subscriber-config/templates/test-subscriber.yaml.j2
index 1f326f7..b955ac8 100644
--- a/roles/test-subscriber-config/templates/test-subscriber.yaml.j2
+++ b/roles/test-subscriber-config/templates/test-subscriber.yaml.j2
@@ -21,14 +21,14 @@
 description: Creates a CORD test subscriber, created by platform-install
 
 imports:
-  - custom_types/cordsubscriberroot.yaml
+  - custom_types/oltdevice.yaml
   - custom_types/ponport.yaml
+  - custom_types/rcordsubscriber.yaml
+  - custom_types/serviceinstancelink.yaml
   - custom_types/site.yaml
   - custom_types/slice.yaml
   - custom_types/user.yaml
   - custom_types/voltservice.yaml
-  - custom_types/oltdevice.yaml
-  - custom_types/serviceinstancelink.yaml
 
 topology_template:
   node_templates:
@@ -79,7 +79,7 @@
 
     # A subscriber
     my_house:
-      type: tosca.nodes.CordSubscriberRoot
+      type: tosca.nodes.RCORDSubscriber
       properties:
         name: My House
         service_specific_id: "123"
@@ -91,6 +91,7 @@
         olt_device: volt-1
         olt_port: volt-port-1
 
+
     # TODO needs to be moved to a new model (now they are JSON encoded)
     # Mom's PC:
     #   type: tosca.nodes.CORDUser