diff --git a/bin/cros_image_to_target.py b/bin/cros_image_to_target.py
index 5792dbbe4f..5651491b28 100755
--- a/bin/cros_image_to_target.py
+++ b/bin/cros_image_to_target.py
@@ -600,7 +600,7 @@ def main(argv):
     rel = cros_env.GetRemoteRelease()
     if not rel:
       cros_env.Fatal('Could not retrieve remote lsb-release')
-    board = rel.get('CHROMEOS_RELEASE_BOARD', '(None)')
+    board = rel.get('COREOS_RELEASE_BOARD', '(None)')
     if not options.board:
       options.board = board
     elif board != options.board and not options.force_mismatch:
diff --git a/build_library/set_lsb_release b/build_library/set_lsb_release
index a7c0a3fc2c..794591c08f 100755
--- a/build_library/set_lsb_release
+++ b/build_library/set_lsb_release
@@ -66,11 +66,4 @@ COREOS_RELEASE_TRACK=$COREOS_VERSION_TRACK
 COREOS_RELEASE_VERSION=$COREOS_VERSION_STRING
 COREOS_AUSERVER=$COREOS_VERSION_AUSERVER
 COREOS_DEVSERVER=$COREOS_VERSION_DEVSERVER
-CHROMEOS_RELEASE_BOARD=$FLAGS_board
-CHROMEOS_RELEASE_DESCRIPTION=$COREOS_VERSION_DESCRIPTION
-CHROMEOS_RELEASE_NAME=$COREOS_VERSION_NAME
-CHROMEOS_RELEASE_TRACK=$COREOS_VERSION_TRACK
-CHROMEOS_RELEASE_VERSION=$COREOS_VERSION_STRING
-CHROMEOS_AUSERVER=$COREOS_VERSION_AUSERVER
-CHROMEOS_DEVSERVER=$COREOS_VERSION_DEVSERVER
 EOF
diff --git a/mod_for_test_scripts/002changeUpdateChannel b/mod_for_test_scripts/002changeUpdateChannel
index b07422e6ee..70c3757ae8 100755
--- a/mod_for_test_scripts/002changeUpdateChannel
+++ b/mod_for_test_scripts/002changeUpdateChannel
@@ -9,4 +9,4 @@
 
 echo "Modifying Release Track for Test (testimage-channel)."
 FILE="${ROOT_FS_DIR}/etc/lsb-release"
-sed -i 's/^\(CHROMEOS_RELEASE_TRACK=\).*/\1testimage-channel/' $FILE
+sed -i 's/^\(COREOS_RELEASE_TRACK=\).*/\1testimage-channel/' $FILE
diff --git a/remote_access.sh b/remote_access.sh
index 3e0c6e9358..87568de117 100644
--- a/remote_access.sh
+++ b/remote_access.sh
@@ -128,7 +128,7 @@ set_up_remote_access() {
 # Ask the target what board it is
 learn_board() {
   [ -n "${FLAGS_board}" ] && return
-  remote_sh -n grep CHROMEOS_RELEASE_BOARD /etc/lsb-release
+  remote_sh -n grep COREOS_RELEASE_BOARD /etc/lsb-release
   FLAGS_board=$(echo "${REMOTE_OUT}" | cut -d '=' -f 2)
   if [ -z "${FLAGS_board}" ]; then
     error "Board required"