diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r152.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r152.ebuild
index 43bb85adab..372f32eccb 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r152.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r152.ebuild
@@ -22,7 +22,7 @@ IUSE="cros_host test"
 
 LIBCHROME_DEPEND=$(
 	printf \
-		'chromeos-base/libchrome:%s[cros-debug=] ' \
+		'coreos-base/libchrome:%s[cros-debug=] ' \
 		${LIBCHROME_VERS[@]}
 )
 RDEPEND="${LIBCHROME_DEPEND}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-9999.ebuild
index adbcd3e7e2..5f10fc9fe3 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-9999.ebuild
@@ -20,7 +20,7 @@ IUSE="cros_host test"
 
 LIBCHROME_DEPEND=$(
 	printf \
-		'chromeos-base/libchrome:%s[cros-debug=] ' \
+		'coreos-base/libchrome:%s[cros-debug=] ' \
 		${LIBCHROME_VERS[@]}
 )
 RDEPEND="${LIBCHROME_DEPEND}
@@ -30,7 +30,7 @@ RDEPEND="${LIBCHROME_DEPEND}
 	dev-libs/protobuf"
 
 DEPEND="${RDEPEND}
-	chromeos-base/protofiles
+	coreos-base/protofiles
 	test? ( dev-cpp/gtest )
 	cros_host? ( dev-util/scons )"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/metrics/metrics-0.0.1-r83.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/metrics/metrics-0.0.1-r83.ebuild
index 4edd8f3b27..0396d5f8e6 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/metrics/metrics-0.0.1-r83.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/metrics/metrics-0.0.1-r83.ebuild
@@ -19,8 +19,8 @@ IUSE=""
 
 LIBCHROME_VERS="125070"
 
-RDEPEND="chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=]
-	chromeos-base/libchromeos
+RDEPEND="coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=]
+	coreos-base/libchromeos
 	dev-cpp/gflags
 	dev-libs/dbus-glib
 	>=dev-libs/glib-2.0
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/metrics/metrics-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/metrics/metrics-9999.ebuild
index a4738eaab0..5774850dd7 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/metrics/metrics-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/metrics/metrics-9999.ebuild
@@ -17,8 +17,8 @@ IUSE=""
 
 LIBCHROME_VERS="125070"
 
-RDEPEND="chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=]
-	chromeos-base/libchromeos
+RDEPEND="coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=]
+	coreos-base/libchromeos
 	dev-cpp/gflags
 	dev-libs/dbus-glib
 	>=dev-libs/glib-2.0
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/protofiles/protofiles-0.0.1-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/protofiles/protofiles-0.0.1-r11.ebuild
index 411a7b4d69..4124220af9 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/protofiles/protofiles-0.0.1-r11.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/protofiles/protofiles-0.0.1-r11.ebuild
@@ -1,6 +1,8 @@
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI="2"
+
 # This project checks out the proto files from the read only repository
 # linked to the src/chrome/browser/policy/proto directory of the Chromium
 # project. It is not cros-work-able if changes to the protobufs are needed
@@ -11,7 +13,6 @@ EGIT_REPO_URI="${EGIT_REPO_SERVER}/chromium/src/chrome/browser/policy/proto.git"
 EGIT_PROJECT="proto"
 EGIT_COMMIT="18f481b411ea0a861f0879af2065effce0e1fe6c"
 
-EAPI="2"
 inherit git
 
 DESCRIPTION="Protobuf installer for the device policy proto definitions."
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r361.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r361.ebuild
index 1d088cf90c..aff43a9107 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r361.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r361.ebuild
@@ -4,7 +4,7 @@
 EAPI="4"
 CROS_WORKON_COMMIT="50c6063bf22ea1776579fda55402ce34b4c21daa"
 CROS_WORKON_TREE="bb8510cb7d96ac37c6e2407ce9b4b3006a11b0f4"
-CROS_WORKON_PROJECT="chromiumos/platform/update_engine"
+CROS_WORKON_PROJECT="coreos/platform/update_engine"
 
 inherit toolchain-funcs cros-debug cros-workon scons-utils
 
@@ -20,12 +20,12 @@ IUSE="cros_host -delta_generator"
 LIBCHROME_VERS="125070"
 
 RDEPEND="app-arch/bzip2
-	chromeos-base/chromeos-ca-certificates
-	chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=]
-	chromeos-base/libchromeos
-	chromeos-base/metrics
-	chromeos-base/vboot_reference
-	chromeos-base/verity
+	coreos-base/chromeos-ca-certificates
+	coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=]
+	coreos-base/libchromeos
+	coreos-base/metrics
+	coreos-base/vboot_reference
+	coreos-base/verity
 	dev-cpp/gflags
 	dev-libs/glib
 	dev-libs/libpcre