diff --git a/common.sh b/common.sh
index 69299f06c1..f539c1ee8f 100644
--- a/common.sh
+++ b/common.sh
@@ -397,6 +397,14 @@ CHROMEOS_TEST_IMAGE_NAME="chromiumos_test_image.bin"
 CHROMEOS_FACTORY_TEST_IMAGE_NAME="chromiumos_factory_image.bin"
 CHROMEOS_FACTORY_INSTALL_SHIM_NAME="factory_install_shim.bin"
 
+COREOS_BASE_IMAGE_NAME=${CHROMEOS_BASE_IMAGE_NAME}
+COREOS_IMAGE_NAME=${CHROMEOS_IMAGE_NAME}
+COREOS_DEVELOPER_IMAGE_NAME=${CHROMEOS_DEVELOPER_IMAGE_NAME}
+COREOS_RECOVERY_IMAGE_NAME=${CHROMEOS_RECOVERY_IMAGE_NAME}
+COREOS_TEST_IMAGE_NAME=${CHROMEOS_TEST_IMAGE_NAME}
+COREOS_FACTORY_TEST_IMAGE_NAME=${CHROMEOS_FACTORY_TEST_IMAGE_NAME}
+COREOS_FACTORY_INSTALL_SHIM_NAME=${CHROMEOS_FACTORY_INSTALL_SHIM_NAME}
+
 # Install make for portage ebuilds.  Used by build_image and gmergefs.
 # TODO: Is /usr/local/autotest-chrome still used by anyone?
 COMMON_INSTALL_MASK="
diff --git a/core_upload_update b/core_upload_update
index d189777ffe..8e870dfd87 100755
--- a/core_upload_update
+++ b/core_upload_update
@@ -7,7 +7,7 @@
 SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 
-DEFINE_string image "${SRC_ROOT}/build/images/amd64-generic/latest/chromiumos_image.bin" \
+DEFINE_string image "${SRC_ROOT}/build/images/amd64-generic/latest/${COREOS_BASE_IMAGE_NAME}" \
     "Path to the basic image (not qemu/xen/etc)"
 DEFINE_string version "${COREOS_VERSION_STRING}" \
     "Version number of this build."