diff --git a/build_library/disk_layout.json b/build_library/disk_layout.json
index b2a9aa49c9..c30e9619a8 100644
--- a/build_library/disk_layout.json
+++ b/build_library/disk_layout.json
@@ -80,7 +80,7 @@
         "blocks":"33587200"
       }
     },
-    "teeth":{
+    "onmetal":{
       "7":{
         "label":"config-2",
         "type":"data",
diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 9e17fc3574..a40b67d5e6 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -13,8 +13,8 @@ VALID_IMG_TYPES=(
     qemu
     qemu_no_kexec
     rackspace
+    rackspace_onmetal
     rackspace_vhd
-    teeth
     vagrant
     vagrant_vmware_fusion
     virtualbox
@@ -158,10 +158,10 @@ IMG_rackspace_vhd_BOOT_KERNEL=0
 IMG_rackspace_vhd_DISK_FORMAT=vhd
 IMG_rackspace_vhd_OEM_PACKAGE=oem-rackspace
 
-## teeth
-IMG_teeth_DISK_FORMAT=qcow2
-IMG_teeth_DISK_LAYOUT=teeth
-IMG_teeth_OEM_PACKAGE=oem-rackspace-teeth
+## rackspace onmetal
+IMG_rackspace_onmetal_DISK_FORMAT=qcow2
+IMG_rackspace_onmetal_DISK_LAYOUT=onmetal
+IMG_rackspace_onmetal_OEM_PACKAGE=oem-rackspace-onmetal
 
 ###########################################################