diff --git a/bin/cros_image_to_target.py b/bin/cros_image_to_target.py
index 3d9af64a30..5792dbbe4f 100755
--- a/bin/cros_image_to_target.py
+++ b/bin/cros_image_to_target.py
@@ -35,8 +35,8 @@ from dev import autoupdate_lib
 
 
 # This is the default filename within the image directory to load updates from
-DEFAULT_IMAGE_NAME = 'chromiumos_image.bin'
-DEFAULT_IMAGE_NAME_TEST = 'chromiumos_test_image.bin'
+DEFAULT_IMAGE_NAME = 'coreos_image.bin'
+DEFAULT_IMAGE_NAME_TEST = 'coreos_test_image.bin'
 
 # The filenames we provide to clients to pull updates
 UPDATE_FILENAME = 'update.gz'
diff --git a/bin/cros_make_image_bootable b/bin/cros_make_image_bootable
index d8500d1a6e..196055cd81 100755
--- a/bin/cros_make_image_bootable
+++ b/bin/cros_make_image_bootable
@@ -79,8 +79,8 @@ DEFINE_string image_type "base" \
   "Type of image we're building for (base/factory_install)."
 DEFINE_string output_dir "/tmp" \
   "Directory to place output in."
-DEFINE_string image "chromiumos_base.img" \
-  "Full path to the chromiumos image to make bootable."
+DEFINE_string image "coreos_base.img" \
+  "Full path to the coreos image to make bootable."
 DEFINE_string arch "x86" \
   "Architecture to make bootable for: arm, x86, or amd64"
 DEFINE_boolean cleanup_dirs ${FLAGS_TRUE} \
diff --git a/bin/cros_resign_image.sh b/bin/cros_resign_image.sh
index 8f957894df..b58c000d55 100755
--- a/bin/cros_resign_image.sh
+++ b/bin/cros_resign_image.sh
@@ -36,7 +36,7 @@ assert_inside_chroot
 
 locate_gpt
 
-DEFINE_string from "chromiumos_image.bin" \
+DEFINE_string from "coreos_image.bin" \
   "Input file name of Chrome OS image to re-sign."
 DEFINE_string datakey "" \
   "Private Kernel Data Key (.vbprivk) to use for re-signing."
diff --git a/build_image b/build_image
index f76e0791b5..1f7432d917 100755
--- a/build_image
+++ b/build_image
@@ -5,7 +5,7 @@
 # found in the LICENSE file.
 
 # Script to build a bootable keyfob-based chromeos system image from within
-# a chromiumos setup. This assumes that all needed packages have been built into
+# a coreos setup. This assumes that all needed packages have been built into
 # the given target's root with binary packages turned on. This script will
 # build the Chrome OS image using only pre-built binary packages.
 
diff --git a/build_library/disk_layout_util.sh b/build_library/disk_layout_util.sh
index d19d1c0a5d..1e60196463 100644
--- a/build_library/disk_layout_util.sh
+++ b/build_library/disk_layout_util.sh
@@ -153,7 +153,7 @@ emit_gpt_scripts() {
 TARGET=\${1:-}
 if [[ -z \${TARGET} ]]; then
   echo "Usage: \$0 <image>" 1>&2
-  echo "Example: \$0 chromiumos_image.bin" 1>&2
+  echo "Example: \$0 coreos_image.bin" 1>&2
   exit 1
 fi
 set -x
diff --git a/common.sh b/common.sh
index 1a6230b2cd..b3b400e330 100644
--- a/common.sh
+++ b/common.sh
@@ -399,11 +399,11 @@ DEFAULT_FAST=${FLAGS_TRUE}
 BUILD_DIR=
 
 # Standard filenames
-CHROMEOS_BASE_IMAGE_NAME="chromiumos_base_image.bin"
-CHROMEOS_IMAGE_NAME="chromiumos_image.bin"
-CHROMEOS_DEVELOPER_IMAGE_NAME="chromiumos_image.bin"
+CHROMEOS_BASE_IMAGE_NAME="coreos_base_image.bin"
+CHROMEOS_IMAGE_NAME="coreos_image.bin"
+CHROMEOS_DEVELOPER_IMAGE_NAME="coreos_image.bin"
 CHROMEOS_RECOVERY_IMAGE_NAME="recovery_image.bin"
-CHROMEOS_TEST_IMAGE_NAME="chromiumos_test_image.bin"
+CHROMEOS_TEST_IMAGE_NAME="coreos_test_image.bin"
 
 COREOS_BASE_IMAGE_NAME=${CHROMEOS_BASE_IMAGE_NAME}
 COREOS_IMAGE_NAME=${CHROMEOS_IMAGE_NAME}
diff --git a/core_upload_update b/core_upload_update
index 47d24c2dad..dcddc4b326 100755
--- a/core_upload_update
+++ b/core_upload_update
@@ -32,7 +32,7 @@ Setting everything up for use\n
 1) Run 'gsutil config' and use project id coreos.com:core-update-storage\n
 2) Ensure core-admin is installed, it is a recent addition\n
 
-NOTE: Use the chromiumos_image.bin not a qemu/xen/etc image for generating the
+NOTE: Use the coreos_image.bin not a qemu/xen/etc image for generating the
 update.
 "
 
diff --git a/lib/cros_vm_constants.sh b/lib/cros_vm_constants.sh
index 4a4bdb26a5..a0fb7ba4b1 100644
--- a/lib/cros_vm_constants.sh
+++ b/lib/cros_vm_constants.sh
@@ -7,9 +7,9 @@
 # Default values for creating VM's.
 DEFAULT_MEM="1024"
 DEFAULT_VMDK="ide.vmdk"
-DEFAULT_VMX="chromiumos.vmx"
+DEFAULT_VMX="coreos.vmx"
 DEFAULT_VBOX_DISK="os.vdi"
-DEFAULT_QEMU_IMAGE="chromiumos_qemu_image.bin"
+DEFAULT_QEMU_IMAGE="coreos_qemu_image.bin"
 
 # Minimum sizes for full size vm images -- needed for update.
 MIN_VDISK_SIZE_FULL=9216
diff --git a/mount_gpt_image.sh b/mount_gpt_image.sh
index 3b932ce99e..f3f9a897ba 100755
--- a/mount_gpt_image.sh
+++ b/mount_gpt_image.sh
@@ -32,7 +32,7 @@ DEFINE_boolean unmount $FLAGS_FALSE \
   "Unmount previously mounted dir." u
 DEFINE_string from "/dev/sdc" \
   "Directory, image, or device with image on it" f
-DEFINE_string image "chromiumos_image.bin"\
+DEFINE_string image "coreos_image.bin"\
   "Name of the bin file if a directory is specified in the from flag" i
 DEFINE_string "rootfs_mountpt" "/tmp/m" "Mount point for rootfs" "r"
 DEFINE_string "stateful_mountpt" "/tmp/s" \
@@ -56,7 +56,7 @@ fi
 # Check for conflicting args.
 # If --from is a block device, --image can't also be specified.
 if [ -b "${FLAGS_from}" ]; then
-  if [ "${FLAGS_image}" != "chromiumos_image.bin" ]; then
+  if [ "${FLAGS_image}" != "coreos_image.bin" ]; then
     die_notrace "-i ${FLAGS_image} can't be used with block device ${FLAGS_from}"
   fi
 fi
@@ -64,7 +64,7 @@ fi
 # Allow --from /foo/file.bin
 if [ -f "${FLAGS_from}" ]; then
   # If --from is specified as a file, --image cannot be also specified.
-  if [ "${FLAGS_image}" != "chromiumos_image.bin" ]; then
+  if [ "${FLAGS_image}" != "coreos_image.bin" ]; then
     die_notrace "-i ${FLAGS_image} can't be used with --from file ${FLAGS_from}"
   fi
   pathname=$(dirname "${FLAGS_from}")
diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index 80088b9d67..4632d5184c 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -237,7 +237,7 @@ init_setup () {
    # Add chromite/bin and depot_tools into the path globally; note that the
    # chromite wrapper itself might also be found in depot_tools.
    # We rely on 'env-update' getting called below.
-   target="${FLAGS_chroot}/etc/env.d/99chromiumos"
+   target="${FLAGS_chroot}/etc/env.d/99coreos"
    cat <<EOF > "${target}"
 PATH=${CHROOT_TRUNK_DIR}/chromite/bin:${DEPOT_TOOLS_DIR}
 CROS_WORKON_SRCROOT="${CHROOT_TRUNK_DIR}"
@@ -265,7 +265,7 @@ EOF
 
    target="${FLAGS_chroot}/etc/profile.d"
    mkdir -p "${target}"
-   cat << EOF > "${target}/chromiumos-niceties.sh"
+   cat << EOF > "${target}/coreos-niceties.sh"
 # Niceties for interactive logins. (cr) denotes this is a chroot, the
 # __git_branch_ps1 prints current git branch in ./ . The $r behavior is to
 # make sure we don't reset the previous $? value which later formats in
diff --git a/update_chroot b/update_chroot
index c6c69160eb..4ebe716ee6 100755
--- a/update_chroot
+++ b/update_chroot
@@ -70,7 +70,7 @@ if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
   fi
 
   # Only update toolchain when binpkgs are available. Toolchain rollout
-  # process only takes place when the chromiumos sdk builder finishes
+  # process only takes place when the coreos sdk builder finishes
   # a successful build.
   EMERGE_FLAGS+=" --useoldpkg-atoms=sys-devel/binutils"
   EMERGE_FLAGS+=" --useoldpkg-atoms=sys-devel/gcc"