diff --git a/labs/config/scripts.compute b/labs/config/scripts.compute
index 1988ea30..519fcfc3 100644
--- a/labs/config/scripts.compute
+++ b/labs/config/scripts.compute
@@ -2,7 +2,7 @@
 cmd init_node
 cmd queue etc_hosts.sh
 cmd queue osbash/enable_vagrant_ssh_keys.sh
-cmd snapshot_cycle network_configured
+cmd snapshot_cycle compute_node_init
 cmd queue setup_nova_compute.sh
 cmd snapshot_cycle nova-compute_installed
 cmd queue setup_neutron_compute.sh
@@ -12,5 +12,5 @@ cmd snapshot_cycle compute_node_installed
 cmd queue shutdown_controller.sh
 cmd boot
 cmd wait_for_shutdown -n controller
-cmd snapshot -n controller compute_node_installed
+cmd snapshot -n controller controller_-_compute_node_installed
 cmd boot -n controller
diff --git a/labs/config/scripts.controller b/labs/config/scripts.controller
index 4919492c..6fde1d22 100644
--- a/labs/config/scripts.controller
+++ b/labs/config/scripts.controller
@@ -2,7 +2,7 @@
 cmd init_node
 cmd queue etc_hosts.sh
 cmd queue osbash/enable_vagrant_ssh_keys.sh
-cmd snapshot_cycle network_configured
+cmd snapshot_cycle controller_node_init
 cmd queue apt_install_mysql.sh
 cmd queue install_rabbitmq.sh
 cmd snapshot_cycle pre-openstack_installed
diff --git a/labs/config/scripts.network b/labs/config/scripts.network
index e4c73ce4..1bdbdc52 100644
--- a/labs/config/scripts.network
+++ b/labs/config/scripts.network
@@ -2,12 +2,12 @@
 cmd init_node
 cmd queue etc_hosts.sh
 cmd queue osbash/enable_vagrant_ssh_keys.sh
-cmd snapshot_cycle network_configured
+cmd snapshot_cycle network_node_init
 cmd queue setup_neutron_network.sh
 cmd snapshot_cycle network_node_installed
 # Take snapshot of changes on controller VM, too
 cmd queue shutdown_controller.sh
 cmd boot
 cmd wait_for_shutdown -n controller
-cmd snapshot -n controller network_node_installed
+cmd snapshot -n controller controller_-_network_node_installed
 cmd boot -n controller