diff --git a/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-0.0.1-r32.ebuild b/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-0.0.1-r32.ebuild
deleted file mode 120000
index ac428ab..0000000
--- a/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-0.0.1-r32.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-chromeos-bsp-lakitu-0.0.1.ebuild
\ No newline at end of file
diff --git a/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-common-0.0.1-r1.ebuild b/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-common-0.0.1-r1.ebuild
new file mode 120000
index 0000000..6872485
--- /dev/null
+++ b/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-common-0.0.1-r1.ebuild
@@ -0,0 +1 @@
+chromeos-bsp-lakitu-common-0.0.1.ebuild
\ No newline at end of file
diff --git a/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-0.0.1.ebuild b/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-common-0.0.1.ebuild
similarity index 95%
rename from project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-0.0.1.ebuild
rename to project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-common-0.0.1.ebuild
index ea371c7..93486b5 100644
--- a/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-0.0.1.ebuild
+++ b/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-common-0.0.1.ebuild
@@ -5,7 +5,7 @@
 
 inherit systemd
 
-DESCRIPTION="Board-specific packages for Lakitu"
+DESCRIPTION="Board-specific packages for all Lakitu derivatives"
 HOMEPAGE="http://src.chromium.org"
 SRC_URI=""
 
diff --git a/project-lakitu/metadata/layout.conf b/project-lakitu/metadata/layout.conf
index 754c187..1d8dd3a 100644
--- a/project-lakitu/metadata/layout.conf
+++ b/project-lakitu/metadata/layout.conf
@@ -1,6 +1,6 @@
 masters = portage-stable chromiumos eclass-overlay
 profile-formats = portage-2 profile-default-eapi
 profile_eapi_when_unspecified = 5-progress
-repo-name = lakitu
+repo-name = project-lakitu
 thin-manifests = true
 use-manifests = strict
diff --git a/project-lakitu/prebuilt.conf b/project-lakitu/prebuilt.conf
deleted file mode 100644
index 7ec0006..0000000
--- a/project-lakitu/prebuilt.conf
+++ /dev/null
@@ -1 +0,0 @@
-FULL_BINHOST="gs://chromeos-prebuilt/board/lakitu/full-R86-13333.0.0-rc2/packages/"
diff --git a/project-lakitu/profiles/arch/amd64/make.defaults b/project-lakitu/profiles/arch/amd64/make.defaults
new file mode 100644
index 0000000..b048973
--- /dev/null
+++ b/project-lakitu/profiles/arch/amd64/make.defaults
@@ -0,0 +1,3 @@
+LINUX_FIRMWARE=""
+CHROMEOS_KERNEL_SPLITCONFIG="chromiumos-x86_64"
+CHROMEOS_KERNEL_ARCH="x86_64"
diff --git a/project-lakitu/profiles/base/parent b/project-lakitu/profiles/arch/amd64/parent
similarity index 100%
rename from project-lakitu/profiles/base/parent
rename to project-lakitu/profiles/arch/amd64/parent
diff --git a/project-lakitu/profiles/base/make.defaults b/project-lakitu/profiles/base/make.defaults
index d889342..2589217 100644
--- a/project-lakitu/profiles/base/make.defaults
+++ b/project-lakitu/profiles/base/make.defaults
@@ -1,7 +1,3 @@
-LINUX_FIRMWARE=""
-CHROMEOS_KERNEL_SPLITCONFIG="chromiumos-x86_64"
-CHROMEOS_KERNEL_ARCH="x86_64"
-
 # Empty USE to allow the same form below in real assignments
 USE=""
 
diff --git a/project-lakitu/toolchain.conf b/project-lakitu/toolchain.conf
deleted file mode 100644
index d12a114..0000000
--- a/project-lakitu/toolchain.conf
+++ /dev/null
@@ -1 +0,0 @@
-x86_64-cros-linux-gnu
diff --git a/project-lakitu/virtual/chromeos-bsp/chromeos-bsp-2-r1.ebuild b/project-lakitu/virtual/chromeos-bsp/chromeos-bsp-2-r1.ebuild
deleted file mode 120000
index 7eee884..0000000
--- a/project-lakitu/virtual/chromeos-bsp/chromeos-bsp-2-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-chromeos-bsp-2.ebuild
\ No newline at end of file
diff --git a/project-lakitu/virtual/chromeos-bsp/chromeos-bsp-2.ebuild b/project-lakitu/virtual/chromeos-bsp/chromeos-bsp-2.ebuild
deleted file mode 100644
index 86c2305..0000000
--- a/project-lakitu/virtual/chromeos-bsp/chromeos-bsp-2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Chrome OS BSP virtual package"
-HOMEPAGE="http://src.chromium.org"
-
-LICENSE="BSD-Google"
-SLOT="0"
-KEYWORDS="*"
-
-RDEPEND="chromeos-base/chromeos-bsp-lakitu"