diff --git a/build_image b/build_image
index a1fd4c2ee4..9d3c672590 100755
--- a/build_image
+++ b/build_image
@@ -87,7 +87,7 @@ OVERLAY_CHROMEOS_DIR="${SRC_ROOT}/third_party/chromiumos-overlay/chromeos"
 
 parse_build_image_args
 
-for overlay in $(cros_overlay_list --board "$BOARD"); do
+for overlay in $(cros_list_overlays --board "$BOARD"); do
   setup_sh="${overlay}/scripts/board_specific_setup.sh"
   if [[ -e ${setup_sh} ]]; then
     source "${setup_sh}"
diff --git a/build_library/disk_layout_util.sh b/build_library/disk_layout_util.sh
index 3630e41c2d..a48fa6eda9 100644
--- a/build_library/disk_layout_util.sh
+++ b/build_library/disk_layout_util.sh
@@ -8,7 +8,7 @@ PARTITION_SCRIPT_PATH="usr/sbin/write_gpt.sh"
 get_disk_layout_path() {
   DISK_LAYOUT_PATH="${BUILD_LIBRARY_DIR}/legacy_disk_layout.json"
   local partition_script_path=$(tempfile)
-  for overlay in $(cros_overlay_list --board "$BOARD"); do
+  for overlay in $(cros_list_overlays --board "$BOARD"); do
     local disk_layout="${overlay}/scripts/disk_layout.json"
     if [[ -e ${disk_layout} ]]; then
       DISK_LAYOUT_PATH=${disk_layout}
diff --git a/setup_board b/setup_board
index fe86d72abe..c3e9db6e89 100755
--- a/setup_board
+++ b/setup_board
@@ -437,10 +437,9 @@ BOARD_PROFILE="${BOARD_ETC}/portage/profile"
 #
 # Construct board overlay list.
 #
-BOARD_OVERLAY_LIST=$(cros_overlay_list \
-  --board "$BOARD" \
-  --board_overlay "$FLAGS_board_overlay" \
-  --variant "$VARIANT")
+BOARD_OVERLAY_LIST=$(cros_list_overlays \
+  --board "$BOARD_VARIANT" \
+  --board_overlay "$FLAGS_board_overlay")
 
 eval $(portageq envvar -v CHOST PKGDIR)