diff --git a/contrail/environment/modules/contrail/manifests/uninstall_collector.pp b/contrail/environment/modules/contrail/manifests/uninstall_collector.pp
index 02ba26ab..7a68c6ee 100644
--- a/contrail/environment/modules/contrail/manifests/uninstall_collector.pp
+++ b/contrail/environment/modules/contrail/manifests/uninstall_collector.pp
@@ -41,7 +41,7 @@
         state              => 'uninstall_collector_started',
         contrail_logoutput => $contrail_logoutput }
     ->
-    contrail::delete_role_collector { 'delete_role_collector':
+    class {'contrail::delete_role_collector':
             config_ip => $config_ip,
             hostname => $hostname,
             host_control_ip => $host_control_ip,
diff --git a/contrail/environment/modules/contrail/manifests/uninstall_control.pp b/contrail/environment/modules/contrail/manifests/uninstall_control.pp
index 7f2910f7..1f99c31e 100644
--- a/contrail/environment/modules/contrail/manifests/uninstall_control.pp
+++ b/contrail/environment/modules/contrail/manifests/uninstall_control.pp
@@ -65,7 +65,7 @@
         contrail_logoutput => $contrail_logoutput
     }
     ->
-    contrail::delete_vnc_control { 'delete_vnc_control':
+    class {'contrail::delete_vnc_control':
         config_ip => $config_ip,
         host_control_ip => $host_control_ip,
         router_asn => $router_asn,
diff --git a/contrail/environment/modules/contrail/manifests/uninstall_openstack.pp b/contrail/environment/modules/contrail/manifests/uninstall_openstack.pp
index 7e86c18d..a01bc433 100644
--- a/contrail/environment/modules/contrail/manifests/uninstall_openstack.pp
+++ b/contrail/environment/modules/contrail/manifests/uninstall_openstack.pp
@@ -29,7 +29,7 @@
     }
     ->
     class {'::contrail::delete_consoleauth':
-        consoleauth_idx -> $consoleauth_idx
+        consoleauth_idx => $consoleauth_idx
     }
     ->
     class {'::contrail::delete_scheduler':
@@ -50,7 +50,7 @@
         host_control_ip => $host_control_ip
     }
     ->
-    class {'::contrail::remove_mysql_flush_privileges'
+    class {'::contrail::remove_mysql_flush_privileges':
         mysql_root_password => $mysql_root_password
     }