diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4021.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4022.ebuild
similarity index 90%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4021.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4022.ebuild
index 7d47716..6366026 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4021.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4022.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("e0db691a8d3cd40ca95ccc8eadf93093af733905" "bb7439ef0cc49f052239cc89e34e50e08d32241c")
-CROS_WORKON_TREE=("67c7f310fd46d8f6e8ad3ea96de3510e61010bb4" "32903f97edbef88a34223ca070e127065ee58332")
+CROS_WORKON_COMMIT=("7d4139ac58fd9bcb13d6170e66709defe892cd30" "bb7439ef0cc49f052239cc89e34e50e08d32241c")
+CROS_WORKON_TREE=("50a9f47070d2ce8a928b94d05a99fe8a06cffbec" "32903f97edbef88a34223ca070e127065ee58332")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/platform/ec"
diff --git a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8754.ebuild b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8755.ebuild
similarity index 91%
rename from chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8754.ebuild
rename to chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8755.ebuild
index a04b51b..bb91378 100644
--- a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8754.ebuild
+++ b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8755.ebuild
@@ -17,8 +17,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("e0db691a8d3cd40ca95ccc8eadf93093af733905" "3c5ce9a1c631043476c0f52bad47f241680cc053")
-CROS_WORKON_TREE=("67c7f310fd46d8f6e8ad3ea96de3510e61010bb4" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
+CROS_WORKON_COMMIT=("7d4139ac58fd9bcb13d6170e66709defe892cd30" "3c5ce9a1c631043476c0f52bad47f241680cc053")
+CROS_WORKON_TREE=("50a9f47070d2ce8a928b94d05a99fe8a06cffbec" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r612.ebuild b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r613.ebuild
similarity index 92%
rename from chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r612.ebuild
rename to chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r613.ebuild
index f48d983..d5548f2 100644
--- a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r612.ebuild
+++ b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r613.ebuild
@@ -9,8 +9,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("e0db691a8d3cd40ca95ccc8eadf93093af733905" "3c5ce9a1c631043476c0f52bad47f241680cc053")
-CROS_WORKON_TREE=("67c7f310fd46d8f6e8ad3ea96de3510e61010bb4" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
+CROS_WORKON_COMMIT=("7d4139ac58fd9bcb13d6170e66709defe892cd30" "3c5ce9a1c631043476c0f52bad47f241680cc053")
+CROS_WORKON_TREE=("50a9f47070d2ce8a928b94d05a99fe8a06cffbec" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4553.ebuild b/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4554.ebuild
similarity index 95%
rename from chromeos-base/chromeos-login/chromeos-login-0.0.2-r4553.ebuild
rename to chromeos-base/chromeos-login/chromeos-login-0.0.2-r4554.ebuild
index 23f8825..6558d36 100644
--- a/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4553.ebuild
+++ b/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4554.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "2442a4f39e2f73fa5881ba4f18d18788df6acf79" "ed310628c7b59ac5528ea8347990fc4f5e95c915" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "d3e9c1a56b0e7787376366ae56a251240022e788" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="71e70af5663a9b59ac506e207c9169bba1c601d2"
+CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "2442a4f39e2f73fa5881ba4f18d18788df6acf79" "ed310628c7b59ac5528ea8347990fc4f5e95c915" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "2a4b88747866178d86a191408c64f5e4c7b3980d" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6760.ebuild b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6761.ebuild
similarity index 94%
rename from chromeos-base/ec-devutils/ec-devutils-0.0.2-r6760.ebuild
rename to chromeos-base/ec-devutils/ec-devutils-0.0.2-r6761.ebuild
index 0aed6cc..92f40e8 100644
--- a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6760.ebuild
+++ b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6761.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="e0db691a8d3cd40ca95ccc8eadf93093af733905"
-CROS_WORKON_TREE="67c7f310fd46d8f6e8ad3ea96de3510e61010bb4"
+CROS_WORKON_COMMIT="7d4139ac58fd9bcb13d6170e66709defe892cd30"
+CROS_WORKON_TREE="50a9f47070d2ce8a928b94d05a99fe8a06cffbec"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 PYTHON_COMPAT=( python2_7 python3_6 )
diff --git a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5864.ebuild b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5865.ebuild
similarity index 87%
rename from chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5864.ebuild
rename to chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5865.ebuild
index dd04fa8..e1cbb4a 100644
--- a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5864.ebuild
+++ b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5865.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="e0db691a8d3cd40ca95ccc8eadf93093af733905"
-CROS_WORKON_TREE="67c7f310fd46d8f6e8ad3ea96de3510e61010bb4"
+CROS_WORKON_COMMIT="7d4139ac58fd9bcb13d6170e66709defe892cd30"
+CROS_WORKON_TREE="50a9f47070d2ce8a928b94d05a99fe8a06cffbec"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/ec-utils/ec-utils-0.0.2-r8693.ebuild b/chromeos-base/ec-utils/ec-utils-0.0.2-r8694.ebuild
similarity index 93%
rename from chromeos-base/ec-utils/ec-utils-0.0.2-r8693.ebuild
rename to chromeos-base/ec-utils/ec-utils-0.0.2-r8694.ebuild
index 5c0fcfe..a7b1252 100644
--- a/chromeos-base/ec-utils/ec-utils-0.0.2-r8693.ebuild
+++ b/chromeos-base/ec-utils/ec-utils-0.0.2-r8694.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="e0db691a8d3cd40ca95ccc8eadf93093af733905"
-CROS_WORKON_TREE="67c7f310fd46d8f6e8ad3ea96de3510e61010bb4"
+CROS_WORKON_COMMIT="7d4139ac58fd9bcb13d6170e66709defe892cd30"
+CROS_WORKON_TREE="50a9f47070d2ce8a928b94d05a99fe8a06cffbec"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 
diff --git a/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1777.ebuild b/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1778.ebuild
similarity index 76%
rename from chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1777.ebuild
rename to chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1778.ebuild
index ddcdf4d..c08098c 100644
--- a/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1777.ebuild
+++ b/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1778.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "0986dad080501c100cc8e9f446f15a01f3ae916d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="71e70af5663a9b59ac506e207c9169bba1c601d2"
+CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "01471fe321e7be48397d556f5b9a51e4f5d243a7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
@@ -30,8 +30,8 @@
 
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	./platform2_preinstall.sh "${OUT}" "${v}"
-	dolib.so "${OUT}"/lib/libchromeos-ui-"${v}".so
-	doins "${OUT}"/lib/libchromeos-ui-"${v}".pc
+	dolib.so "${OUT}"/lib/libchromeos-ui.so
+	doins "${OUT}"/lib/libchromeos-ui.pc
 
 	insinto /usr/include/chromeos/ui
 	doins "${S}"/chromeos/ui/*.h
diff --git a/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2062.ebuild b/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2063.ebuild
similarity index 85%
rename from chromeos-base/session_manager-client/session_manager-client-0.0.1-r2062.ebuild
rename to chromeos-base/session_manager-client/session_manager-client-0.0.1-r2063.ebuild
index bc4662f..ae388ac 100644
--- a/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2062.ebuild
+++ b/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2063.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "d3e9c1a56b0e7787376366ae56a251240022e788" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="71e70af5663a9b59ac506e207c9169bba1c601d2"
+CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "2a4b88747866178d86a191408c64f5e4c7b3980d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4666.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4667.ebuild
similarity index 91%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4666.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4667.ebuild
index 5b75c6b..7d07e80 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4666.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4667.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("033524bc183c4cdfba65c0e471200a5b166b33b3" "3869b60b5f93cb3e3bdb2765e0531b1861a4506f")
-CROS_WORKON_TREE=("d1eda2d845953d7094171d608462ab3b90224a78" "0e2d1f57708d010b218d348eaf5639ff2f3f2cb0")
+CROS_WORKON_COMMIT=("cd4a881c622b45fc95ed31558066fc1b1f1d5b0b" "3869b60b5f93cb3e3bdb2765e0531b1861a4506f")
+CROS_WORKON_TREE=("3af4ef4afce763d1c4ea6c665e7f98c41e6b63ba" "0e2d1f57708d010b218d348eaf5639ff2f3f2cb0")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4702.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4703.ebuild
similarity index 90%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4702.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4703.ebuild
index e726bc2..48694e7 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4702.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4703.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("033524bc183c4cdfba65c0e471200a5b166b33b3" "3869b60b5f93cb3e3bdb2765e0531b1861a4506f" "cc8d76349da4407d40f1aad42bb46f02bc1f7c5b")
-CROS_WORKON_TREE=("d1eda2d845953d7094171d608462ab3b90224a78" "0e2d1f57708d010b218d348eaf5639ff2f3f2cb0" "7351a21ed3d8b41cceeb3acfa305a1c42aaf07e4")
+CROS_WORKON_COMMIT=("cd4a881c622b45fc95ed31558066fc1b1f1d5b0b" "3869b60b5f93cb3e3bdb2765e0531b1861a4506f" "cc8d76349da4407d40f1aad42bb46f02bc1f7c5b")
+CROS_WORKON_TREE=("3af4ef4afce763d1c4ea6c665e7f98c41e6b63ba" "0e2d1f57708d010b218d348eaf5639ff2f3f2cb0" "7351a21ed3d8b41cceeb3acfa305a1c42aaf07e4")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/sys-boot/depthcharge/depthcharge-0.0.1-r3140.ebuild b/sys-boot/depthcharge/depthcharge-0.0.1-r3141.ebuild
similarity index 97%
rename from sys-boot/depthcharge/depthcharge-0.0.1-r3140.ebuild
rename to sys-boot/depthcharge/depthcharge-0.0.1-r3141.ebuild
index 0ae7136..bc2d40f 100644
--- a/sys-boot/depthcharge/depthcharge-0.0.1-r3140.ebuild
+++ b/sys-boot/depthcharge/depthcharge-0.0.1-r3141.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("f964445cd80f6bce2605acb71474135e4ebc5032" "fb25edf13402ef3be8935c7d3dc1416efff49c5b")
-CROS_WORKON_TREE=("8a5227ffd98152f6ae95103754404eebe35458e9" "c825a3116e75b3c782917c853f24721c645284f3")
+CROS_WORKON_COMMIT=("10202047803a835cfb417cf22c4c37c5adc09d90" "fb25edf13402ef3be8935c7d3dc1416efff49c5b")
+CROS_WORKON_TREE=("ad4dacbfbcf8b791c1152940352beef031ba2181" "c825a3116e75b3c782917c853f24721c645284f3")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/depthcharge"
 	"chromiumos/platform/vboot_reference"
diff --git a/sys-kernel/chromeos-kernel-4_14/chromeos-kernel-4_14-4.14.212-r1456.ebuild b/sys-kernel/chromeos-kernel-4_14/chromeos-kernel-4_14-4.14.212-r1457.ebuild
similarity index 92%
rename from sys-kernel/chromeos-kernel-4_14/chromeos-kernel-4_14-4.14.212-r1456.ebuild
rename to sys-kernel/chromeos-kernel-4_14/chromeos-kernel-4_14-4.14.212-r1457.ebuild
index 99e09ff..b15efaf 100644
--- a/sys-kernel/chromeos-kernel-4_14/chromeos-kernel-4_14-4.14.212-r1456.ebuild
+++ b/sys-kernel/chromeos-kernel-4_14/chromeos-kernel-4_14-4.14.212-r1457.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="fa9150d5c5d54e448490d2f0f79a89a9b7904cd5"
-CROS_WORKON_TREE="1486c60c46bf1e9893b13214b985999823258f29"
+CROS_WORKON_COMMIT="2a8904046b0ef50c4fdd7cfd224ce8e7466e1f89"
+CROS_WORKON_TREE="a2b58da8f150b17bdf542ea2c1653f5a9d707f68"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v4.14"
 CROS_WORKON_EGIT_BRANCH="chromeos-4.14"