diff --git a/labs/config/scripts.compute b/labs/config/scripts.compute
index f0679730..2b10f257 100644
--- a/labs/config/scripts.compute
+++ b/labs/config/scripts.compute
@@ -7,5 +7,5 @@ cmd queue setup_nova_compute.sh
 cmd snapshot_cycle "nova-compute_installed"
 cmd queue setup_neutron_compute.sh
 cmd queue setup_cinder_volumes.sh
-cmd snapshot_cycle "pre-installed"
+cmd snapshot_cycle "compute_node_installed"
 cmd boot
diff --git a/labs/config/scripts.controller b/labs/config/scripts.controller
index 92f283da..f568d909 100644
--- a/labs/config/scripts.controller
+++ b/labs/config/scripts.controller
@@ -21,5 +21,5 @@ cmd snapshot_cycle "horizon_installed"
 cmd queue config_external_network.sh
 cmd queue config_demo_user.sh
 cmd queue config_tenant_network.sh
-cmd snapshot_cycle "openstack-controller_installed"
+cmd snapshot_cycle "controller_node_installed"
 cmd boot
diff --git a/labs/config/scripts.network b/labs/config/scripts.network
index 5af68a8d..87e1af2c 100644
--- a/labs/config/scripts.network
+++ b/labs/config/scripts.network
@@ -4,5 +4,5 @@ cmd queue etc_hosts.sh
 cmd queue osbash/enable_vagrant_ssh_keys.sh
 cmd snapshot_cycle "network_configured"
 cmd queue setup_neutron_network.sh
-cmd snapshot_cycle "openstack-network_installed"
+cmd snapshot_cycle "network_node_installed"
 cmd boot