diff --git a/labs/config/scripts.fedora b/labs/config/scripts.fedora_base
similarity index 100%
rename from labs/config/scripts.fedora
rename to labs/config/scripts.fedora_base
diff --git a/labs/config/scripts.ubuntu b/labs/config/scripts.ubuntu_base
similarity index 100%
rename from labs/config/scripts.ubuntu
rename to labs/config/scripts.ubuntu_base
diff --git a/labs/lib/osbash/lib.fedora-20-x86_64 b/labs/lib/osbash/lib.fedora-20-x86_64
index ba45f169..653f1bac 100644
--- a/labs/lib/osbash/lib.fedora-20-x86_64
+++ b/labs/lib/osbash/lib.fedora-20-x86_64
@@ -1,7 +1,7 @@
 # Fedora 20 x86_64
 
 # Default scripts for all Fedora base disks
-: ${BASE_INSTALL_SCRIPTS:=scripts.fedora}
+: ${BASE_INSTALL_SCRIPTS:=scripts.fedora_base}
 
 # Give Fedora 20 installer sufficient RAM
 VM_BASE_MEM=1024
diff --git a/labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64 b/labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64
index 6d2cba6d..27543481 100644
--- a/labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64
+++ b/labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64
@@ -1,7 +1,7 @@
 # Ubuntu 12.04.4 LTS amd64 server
 
 # Default scripts for all Ubuntu installs
-: ${BASE_INSTALL_SCRIPTS:=scripts.ubuntu}
+: ${BASE_INSTALL_SCRIPTS:=scripts.ubuntu_base}
 
 #-------------------------------------------------------------------------------
 # Booting the operating system installer
diff --git a/labs/lib/osbash/lib.ubuntu-14.04-server-amd64 b/labs/lib/osbash/lib.ubuntu-14.04-server-amd64
index 266e9a0e..28014235 100644
--- a/labs/lib/osbash/lib.ubuntu-14.04-server-amd64
+++ b/labs/lib/osbash/lib.ubuntu-14.04-server-amd64
@@ -1,7 +1,7 @@
 # Ubuntu 14.04 LTS amd64 server
 
 # Default scripts for all Ubuntu installs
-: ${BASE_INSTALL_SCRIPTS:=scripts.ubuntu}
+: ${BASE_INSTALL_SCRIPTS:=scripts.ubuntu_base}
 
 #-------------------------------------------------------------------------------
 # Booting the operating system installer
diff --git a/labs/lib/osbash/virtualbox.install_base b/labs/lib/osbash/virtualbox.install_base
index ddcf1831..0710d349 100644
--- a/labs/lib/osbash/virtualbox.install_base
+++ b/labs/lib/osbash/virtualbox.install_base
@@ -94,7 +94,7 @@ function vm_install_base {
 
     autostart osbash/base_fixups.sh
 
-    # By default, set by lib/osbash/lib.* to something like scripts.ubuntu
+    # By default, set by lib/osbash/lib.* to something like scripts.ubuntu_base
     autostart_from_config "$BASE_INSTALL_SCRIPTS"
 
     autostart zero_empty.sh shutdown.sh