diff --git a/contrib/variant/add_variant_to_yaml.sh b/contrib/variant/add_variant_to_yaml.sh
index ea8c771..3b57631 100755
--- a/contrib/variant/add_variant_to_yaml.sh
+++ b/contrib/variant/add_variant_to_yaml.sh
@@ -3,7 +3,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-VERSION="1.6.0"
+VERSION="2.0.0"
 SCRIPT=$(basename -- "${0}")
 set -e
 
@@ -50,7 +50,7 @@
 
 YAML=model.yaml
 
-cd "${HOME}/trunk/src/overlays/overlay-${BASE}/chromeos-base/chromeos-config-bsp-${BASE}/files"
+cd "${HOME}/trunk/src/overlays/overlay-${BASE}/chromeos-base/chromeos-config-bsp/files"
 
 if [[ ! -e "${YAML}" ]]; then
   echo "${YAML} does not exist."
@@ -77,7 +77,7 @@
 cleanup() {
   # If there is an error after the `repo start`, then restore modified files
   # to clean up and `repo abandon` the new branch.
-  cd "${HOME}/trunk/src/overlays/overlay-${BASE}/chromeos-base/chromeos-config-bsp-${BASE}"
+  cd "${HOME}/trunk/src/overlays/overlay-${BASE}/chromeos-base/chromeos-config-bsp"
   git restore --staged "*.ebuild"
   git restore "*.ebuild"
   if [[ ! -z "${NEWEBUILD}" ]] ; then
@@ -122,7 +122,7 @@
 (Auto-Generated by ${SCRIPT} version ${VERSION}).
 
 BUG=${BUG}
-TEST=emerge-${BASE} chromeos-config-bsp-${BASE}
-chromeos-config-bsp-${BASE}-private chromeos-config-bsp chromeos-config
+TEST=emerge-${BASE} chromeos-config-bsp-hatch
+chromeos-config-bsp-private chromeos-config-bsp chromeos-config
  Check /build/${BASE}/usr/share/chromeos-config for '${VARIANT}' in
  config.json, yaml/config.c, and yaml/*.yaml"
diff --git a/contrib/variant/brya0.py b/contrib/variant/brya0.py
index 2b49ce3..b5fc959 100644
--- a/contrib/variant/brya0.py
+++ b/contrib/variant/brya0.py
@@ -50,8 +50,8 @@
 
 # Directory for fitimage; append '~/trunk/src/'' in chroot, '~/chromiumos/src'
 # outside
-fitimage_dir = 'private-overlays/baseboard-brya-private/sys-boot/'\
-    'coreboot-private-files-baseboard-brya'
+fitimage_dir = ('private-overlays/baseboard-brya-private/sys-boot/'
+                'coreboot-private-files-baseboard-brya')
 
 # Brya fitimages use csme-${VARIANT}.bin, not fitimage-${VARIANT}.bin
 fitimage_bin = 'csme-%s.bin'
@@ -74,7 +74,7 @@
 # List of packages to cros_workon
 workon_pkgs = [
     'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
-    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-brya-private']
+    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-private']
 
 # The emerge command
 emerge_cmd = 'emerge-brya'
@@ -82,15 +82,14 @@
 # List of packages to emerge
 emerge_pkgs = [
     'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
-    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-brya-private',
-    'chromeos-config', 'chromeos-config-bsp', 'coreboot-private-files',
-    'chromeos-bootimage']
+    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-private',
+    'chromeos-config', 'coreboot-private-files', 'chromeos-bootimage']
 
 # List of packages to cros_workon to build the project config
-config_workon_pkgs = ['chromeos-config-bsp-brya-private']
+config_workon_pkgs = ['chromeos-config-bsp-private']
 
 # List of packages to emerge to build the project config
-config_emerge_pkgs = ['chromeos-config-bsp-brya-private']
+config_emerge_pkgs = ['chromeos-config-bsp-private']
 
 # List of commits that will be uploaded with `repo upload`
 repo_upload_list = [
diff --git a/contrib/variant/guybrush.py b/contrib/variant/guybrush.py
index 1cd87c0..9268476 100644
--- a/contrib/variant/guybrush.py
+++ b/contrib/variant/guybrush.py
@@ -34,25 +34,21 @@
 coreboot_dir = 'third_party/coreboot'
 
 # List of packages to cros_workon
-workon_pkgs = ['coreboot', 'chromeos-ec', 'chromeos-config-bsp-guybrush-private']
+workon_pkgs = ['coreboot', 'chromeos-ec', 'chromeos-config-bsp-private']
 
 # The emerge command
 emerge_cmd = 'emerge-guybrush'
 
 # List of packages to emerge
 emerge_pkgs = [
-    'coreboot', 'vboot_reference',
-    'chromeos-ec', 'chromeos-config-bsp-guybrush-private',
-    'chromeos-config', 'chromeos-config-bsp',
-    'coreboot-private-files', 'chromeos-bootimage']
+    'coreboot', 'vboot_reference', 'chromeos-ec', 'chromeos-config-bsp-private',
+    'chromeos-config', 'coreboot-private-files', 'chromeos-bootimage']
 
 # List of packages to cros_workon to build the project config
-config_workon_pkgs = ['chromeos-config', 'chromeos-config-bsp-guybrush-private']
+config_workon_pkgs = ['chromeos-config', 'chromeos-config-bsp-private']
 
 # List of packages to emerge to build the project config
-config_emerge_pkgs = [
-    'chromeos-config-bsp', 'chromeos-config',
-    'chromeos-config-bsp-guybrush-private']
+config_emerge_pkgs = ['chromeos-config', 'chromeos-config-bsp-private']
 
 # List of commits that will be uploaded with `repo upload`
 repo_upload_list = [
diff --git a/contrib/variant/hatch.py b/contrib/variant/hatch.py
index 9040b5b..9fff7f0 100644
--- a/contrib/variant/hatch.py
+++ b/contrib/variant/hatch.py
@@ -45,7 +45,7 @@
 # Directory for fitimage; append '~/trunk/src/'' in chroot, '~/chromiumos/src'
 # outside
 fitimage_dir = ('private-overlays/baseboard-hatch-private/'
-    'sys-boot/coreboot-private-files-hatch')
+                'sys-boot/coreboot-private-files-hatch')
 
 # Directory under fitimage_dir where the fitimage binary will be
 fitimage_bin_dir = 'asset_generation/outputs'
@@ -65,7 +65,7 @@
 emerge_pkgs = [
     'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
     fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-private',
-    'chromeos-config', 'chromeos-config-bsp', 'chromeos-config-bsp-hatch',
+    'chromeos-config', 'chromeos-config-bsp', 'chromeos-config-bsp',
     'coreboot-private-files', 'chromeos-bootimage']
 
 # List of packages to cros_workon to build the project config
@@ -73,8 +73,7 @@
 
 # List of packages to emerge to build the project config
 config_emerge_pkgs = [
-    'chromeos-config-bsp', 'chromeos-config',
-    'chromeos-config-bsp-hatch', 'chromeos-config-bsp-private']
+    'chromeos-config-bsp', 'chromeos-config', 'chromeos-config-bsp-private']
 
 # Directory for the private yaml file
 private_yaml_dir = '~/trunk/src/private-overlays/overlay-hatch-private/'\
diff --git a/contrib/variant/lalala.py b/contrib/variant/lalala.py
index 1edfe88..11b00f2 100644
--- a/contrib/variant/lalala.py
+++ b/contrib/variant/lalala.py
@@ -49,8 +49,8 @@
 
 # Directory for fitimage; append '~/trunk/src/'' in chroot, '~/chromiumos/src'
 # outside
-fitimage_dir = 'private-overlays/baseboard-dedede-private/sys-boot/'\
-    'coreboot-private-files-baseboard-dedede'
+fitimage_dir = ('private-overlays/baseboard-dedede-private/sys-boot/'
+                'coreboot-private-files-baseboard-dedede')
 
 # Directory under fitimage_dir where the fitimage binary will be
 fitimage_bin_dir = 'files/blobs'
@@ -61,7 +61,7 @@
 # List of packages to cros_workon
 workon_pkgs = [
     'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
-    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-keeby-private']
+    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-private']
 
 # The emerge command
 emerge_cmd = 'emerge-keeby'
@@ -69,15 +69,14 @@
 # List of packages to emerge
 emerge_pkgs = [
     'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
-    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-keeby-private',
-    'chromeos-config', 'chromeos-config-bsp', 'coreboot-private-files',
-    'chromeos-bootimage']
+    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-private',
+    'chromeos-config', 'coreboot-private-files', 'chromeos-bootimage']
 
 # List of packages to cros_workon to build the project config
-config_workon_pkgs = ['chromeos-config-bsp-keeby-private']
+config_workon_pkgs = ['chromeos-config-bsp-private']
 
 # List of packages to emerge to build the project config
-config_emerge_pkgs = ['chromeos-config-bsp-keeby-private']
+config_emerge_pkgs = ['chromeos-config-bsp-private']
 
 # List of commits that will be uploaded with `repo upload`
 repo_upload_list = [
diff --git a/contrib/variant/puff.py b/contrib/variant/puff.py
index b378c57..5d17c52 100644
--- a/contrib/variant/puff.py
+++ b/contrib/variant/puff.py
@@ -46,8 +46,10 @@
 # Package name for the fitimage
 fitimage_pkg = 'coreboot-private-files-puff'
 
-# Directory for fitimage; append '~/trunk/src/'' in chroot, '~/chromiumos/src' outside
-fitimage_dir = 'private-overlays/baseboard-puff-private/sys-boot/coreboot-private-files-puff'
+# Directory for fitimage; append '~/trunk/src/'' in chroot, '~/chromiumos/src'
+# outside
+fitimage_dir = ('private-overlays/baseboard-puff-private/'
+                'sys-boot/coreboot-private-files-puff')
 
 # Directory under fitimage_dir where the fitimage binary will be
 fitimage_bin_dir = 'asset_generation/outputs'
@@ -58,7 +60,7 @@
 # List of packages to cros_workon
 workon_pkgs = [
     'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
-    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-puff-private']
+    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-private']
 
 # The emerge command
 emerge_cmd = 'emerge-puff'
@@ -66,15 +68,14 @@
 # List of packages to emerge
 emerge_pkgs = [
     'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
-    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-puff-private',
-    'chromeos-config', 'chromeos-config-bsp', 'coreboot-private-files',
-    'chromeos-bootimage']
+    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-private',
+    'chromeos-config', 'coreboot-private-files', 'chromeos-bootimage']
 
 # List of packages to cros_workon to build the project config
-config_workon_pkgs = ['chromeos-config-bsp-puff-private']
+config_workon_pkgs = ['chromeos-config-bsp-private']
 
 # List of packages to emerge to build the project config
-config_emerge_pkgs = ['chromeos-config-bsp-puff-private']
+config_emerge_pkgs = ['chromeos-config-bsp-private']
 
 # Directory for the private yaml file
 # None; puff doesn't use model.yaml
diff --git a/contrib/variant/revbump_ebuild.sh b/contrib/variant/revbump_ebuild.sh
index 6572bf3..126ba31 100644
--- a/contrib/variant/revbump_ebuild.sh
+++ b/contrib/variant/revbump_ebuild.sh
@@ -4,11 +4,10 @@
 # found in the LICENSE file.
 
 revbump_ebuild() {
-  # Revbump an ebuild file. It has the version number in its name,
-  # and furthermore, it's a symlink to another ebuild file.
+  # Revbump an ebuild file by updating the version number in its name.
 
-  # Find a symlink named *.ebuild, should be only one.
-  EBUILD=$(find . -name "*.ebuild" -type l)
+  # Find an *.ebuild with a revision number, not 9999, should be only one.
+  EBUILD=$(find . -name "*-r*.ebuild")
   # Remove the extension
   F=${EBUILD%.ebuild}
   # Get the numeric suffix after the 'r'.
diff --git a/contrib/variant/testdata/new_variant_fulltest.sh b/contrib/variant/testdata/new_variant_fulltest.sh
index 0e1d6de..7b33d32 100755
--- a/contrib/variant/testdata/new_variant_fulltest.sh
+++ b/contrib/variant/testdata/new_variant_fulltest.sh
@@ -29,6 +29,9 @@
 # Support for depthcharge variants was added later, so the default is no support
 SUPPORTS_DC_VARIANT=0
 
+# ebuild for all boards that use Boxster config
+EBUILD=chromeos-config-bsp-private-9999.ebuild
+
 # Set variables depending on the reference board.
 #
 # All boards:
@@ -42,7 +45,6 @@
 #   for the baseboard.
 # OVERLAY_DIR - the directory for the chromeos-config overlay ebuild, if it
 #   needs to be modified for this baseboard so that the new variant will build.
-# EBUILD - the name of the chromeos-config overlay ebuild, if needed.
 #
 # Intel-based reference boards only:
 #
@@ -72,8 +74,7 @@
     BASE=puff
     NEW=tiamat
     CONFIG_DIR=/mnt/host/source/src/project/puff
-    OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-puff-private/chromeos-base/chromeos-config-bsp-puff-private
-    EBUILD=chromeos-config-bsp-puff-private-9999.ebuild
+    OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-puff-private/chromeos-base/chromeos-config-bsp-private
     FITIMAGE=puff
     FITIMAGE_OUTPUTS_DIR=/mnt/host/source/src/private-overlays/baseboard-puff-private/sys-boot/coreboot-private-files-puff/asset_generation/outputs
     FITIMAGE_FILES_DIR=/mnt/host/source/src/private-overlays/baseboard-puff-private/sys-boot/coreboot-private-files-puff/files
@@ -83,8 +84,7 @@
     BASE=volteer
     NEW=gnastygnorc
     CONFIG_DIR=/mnt/host/source/src/project/volteer
-    OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-volteer-private/chromeos-base/chromeos-config-bsp-volteer-private
-    EBUILD=chromeos-config-bsp-volteer-private-9999.ebuild
+    OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-volteer-private/chromeos-base/chromeos-config-bsp-private
     FITIMAGE=volteer2
     FITIMAGE_OUTPUTS_DIR=/mnt/host/source/src/private-overlays/baseboard-volteer-private/sys-boot/coreboot-private-files-baseboard-volteer/files/blobs
     FITIMAGE_FILES_DIR=/mnt/host/source/src/private-overlays/baseboard-volteer-private/sys-boot/coreboot-private-files-baseboard-volteer/files
@@ -94,8 +94,7 @@
     BASE=dedede
     NEW=kingitchy
     CONFIG_DIR=/mnt/host/source/src/project/dedede
-    OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-dedede-private/chromeos-base/chromeos-config-bsp-dedede-private
-    EBUILD=chromeos-config-bsp-dedede-private-9999.ebuild
+    OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-dedede-private/chromeos-base/chromeos-config-bsp-private
     FITIMAGE=drawcia
     # FITIMAGE_OUTPUTS_DIR and FITIMAGE_FILES_DIR are supposed to be the same;
     # gen_fit_image.sh moves the generated files from asset_generation/outputs
@@ -109,8 +108,7 @@
     BASE=keeby
     NEW=kingitchy
     CONFIG_DIR=/mnt/host/source/src/project/keeby
-    OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-keeby-private/chromeos-base/chromeos-config-bsp-keeby-private
-    EBUILD=chromeos-config-bsp-keeby-private-9999.ebuild
+    OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-keeby-private/chromeos-base/chromeos-config-bsp-private
     FITIMAGE=lalala
     # FITIMAGE_OUTPUTS_DIR and FITIMAGE_FILES_DIR are supposed to be the same;
     # gen_fit_image.sh moves the generated files from asset_generation/outputs
@@ -124,16 +122,14 @@
     BASE=zork
     NEW=grue
     CONFIG_DIR=/mnt/host/source/src/project/zork
-    OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-zork-private/chromeos-base/chromeos-config-bsp-zork-private
-    EBUILD=chromeos-config-bsp-zork-private-9999.ebuild
+    OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-zork-private/chromeos-base/chromeos-config-bsp-private
     ;;
 
   brya0)
     BASE=brya
     NEW=eris
     CONFIG_DIR=/mnt/host/source/src/project/brya
-    OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-brya-private/chromeos-base/chromeos-config-bsp-brya-private
-    EBUILD=chromeos-config-bsp-brya-private-9999.ebuild
+    OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-brya-private/chromeos-base/chromeos-config-bsp-private
     FITIMAGE=brya0
     FITIMAGE_OUTPUTS_DIR=/mnt/host/source/src/private-overlays/baseboard-brya-private/sys-boot/coreboot-private-files-baseboard-brya/files/blobs
     FITIMAGE_FILES_DIR=/mnt/host/source/src/private-overlays/baseboard-brya-private/sys-boot/coreboot-private-files-baseboard-brya/files
@@ -144,8 +140,7 @@
     BASE=guybrush
     NEW=jojo
     CONFIG_DIR=/mnt/host/source/src/project/guybrush
-    OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-guybrush-private/chromeos-base/chromeos-config-bsp-guybrush-private
-    EBUILD=chromeos-config-bsp-guybrush-private-9999.ebuild
+    OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-guybrush-private/chromeos-base/chromeos-config-bsp-private
     ;;
 
   *)
@@ -210,6 +205,7 @@
       pushd "${FITIMAGE_FILES_DIR}/blobs"
       rm -f "csme-${NEW}.bin"
       rm -f "descriptor-${NEW}.bin"
+      rm -f "me_rw-${NEW}.bin"
       popd
       pushd "${FITIMAGE_FILES_DIR}/metadata"
       rm -f "mfitimage-${NEW}-versions.txt"
@@ -295,6 +291,7 @@
     pushd "${FITIMAGE_OUTPUTS_DIR}"
     cp "csme-${FITIMAGE}.bin" "csme-${NEW}.bin"
     cp "descriptor-${FITIMAGE}.bin" "descriptor-${NEW}.bin"
+    cp "me_rw-${FITIMAGE}.bin" "me_rw-${NEW}.bin"
     popd
     pushd "${FITIMAGE_FILES_DIR}/metadata"
     cp "mfitimage-${REFERENCE}-versions.txt" "mfitimage-${NEW}-versions.txt"
diff --git a/contrib/variant/trembyle.py b/contrib/variant/trembyle.py
index f27d3ad..dd09a49 100644
--- a/contrib/variant/trembyle.py
+++ b/contrib/variant/trembyle.py
@@ -34,25 +34,21 @@
 coreboot_dir = 'third_party/coreboot'
 
 # List of packages to cros_workon
-workon_pkgs = ['coreboot', 'chromeos-ec', 'chromeos-config-bsp-zork-private']
+workon_pkgs = ['coreboot', 'chromeos-ec', 'chromeos-config-bsp-private']
 
 # The emerge command
 emerge_cmd = 'emerge-zork'
 
 # List of packages to emerge
 emerge_pkgs = [
-    'coreboot', 'vboot_reference',
-    'chromeos-ec', 'chromeos-config-bsp-zork-private',
-    'chromeos-config', 'chromeos-config-bsp',
-    'coreboot-private-files', 'chromeos-bootimage']
+    'coreboot', 'vboot_reference', 'chromeos-ec', 'chromeos-config-bsp-private',
+    'chromeos-config', 'coreboot-private-files', 'chromeos-bootimage']
 
 # List of packages to cros_workon to build the project config
-config_workon_pkgs = ['chromeos-config', 'chromeos-config-bsp-zork-private']
+config_workon_pkgs = ['chromeos-config', 'chromeos-config-bsp-private']
 
 # List of packages to emerge to build the project config
-config_emerge_pkgs = [
-    'chromeos-config-bsp', 'chromeos-config',
-    'chromeos-config-bsp-zork-private']
+config_emerge_pkgs = ['chromeos-config', 'chromeos-config-bsp-private']
 
 # List of commits that will be uploaded with `repo upload`
 repo_upload_list = [
diff --git a/contrib/variant/volteer2.py b/contrib/variant/volteer2.py
index 8baec2f..f78da76 100644
--- a/contrib/variant/volteer2.py
+++ b/contrib/variant/volteer2.py
@@ -56,8 +56,8 @@
 
 # Directory for fitimage; append '~/trunk/src/'' in chroot, '~/chromiumos/src'
 # outside
-fitimage_dir = 'private-overlays/baseboard-volteer-private/sys-boot/'\
-    'coreboot-private-files-baseboard-volteer'
+fitimage_dir = ('private-overlays/baseboard-volteer-private/sys-boot/'
+                'coreboot-private-files-baseboard-volteer')
 
 # Volteer fitimages use csme-${VARIANT}.bin, not fitimage-${VARIANT}.bin
 fitimage_bin = 'csme-%s.bin'
@@ -74,7 +74,7 @@
 # List of packages to cros_workon
 workon_pkgs = [
     'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
-    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-volteer-private']
+    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-private']
 
 # The emerge command
 emerge_cmd = 'emerge-volteer'
@@ -82,15 +82,14 @@
 # List of packages to emerge
 emerge_pkgs = [
     'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
-    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-volteer-private',
-    'chromeos-config', 'chromeos-config-bsp', 'coreboot-private-files',
-    'chromeos-bootimage']
+    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-private',
+    'chromeos-config', 'coreboot-private-files', 'chromeos-bootimage']
 
 # List of packages to cros_workon to build the project config
-config_workon_pkgs = ['chromeos-config-bsp-volteer-private']
+config_workon_pkgs = ['chromeos-config-bsp-private']
 
 # List of packages to emerge to build the project config
-config_emerge_pkgs = ['chromeos-config-bsp-volteer-private']
+config_emerge_pkgs = ['chromeos-config-bsp-private']
 
 # List of commits that will be uploaded with `repo upload`
 repo_upload_list = [
diff --git a/contrib/variant/waddledee.py b/contrib/variant/waddledee.py
index 2d64bef..4210601 100644
--- a/contrib/variant/waddledee.py
+++ b/contrib/variant/waddledee.py
@@ -55,7 +55,7 @@
 # List of packages to cros_workon
 workon_pkgs = [
     'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
-    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-dedede-private']
+    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-private']
 
 # The emerge command
 emerge_cmd = 'emerge-dedede'
@@ -63,15 +63,14 @@
 # List of packages to emerge
 emerge_pkgs = [
     'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
-    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-dedede-private',
-    'chromeos-config', 'chromeos-config-bsp', 'coreboot-private-files',
-    'chromeos-bootimage']
+    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-private',
+    'chromeos-config', 'coreboot-private-files', 'chromeos-bootimage']
 
 # List of packages to cros_workon to build the project config
-config_workon_pkgs = ['chromeos-config-bsp-dedede-private']
+config_workon_pkgs = ['chromeos-config-bsp-private']
 
 # List of packages to emerge to build the project config
-config_emerge_pkgs = ['chromeos-config-bsp-dedede-private']
+config_emerge_pkgs = ['chromeos-config-bsp-private']
 
 # List of commits that will be uploaded with `repo upload`
 repo_upload_list = [