diff --git a/bases/common-base/entry.sh b/bases/common-base/entry.sh
deleted file mode 100755
index 039e4d0..0000000
--- a/bases/common-base/entry.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exit 0
diff --git a/bases/common-base/chroot/README-common-base.txt b/bases/retrodebian/chroot/README-common-base.txt
similarity index 100%
rename from bases/common-base/chroot/README-common-base.txt
rename to bases/retrodebian/chroot/README-common-base.txt
diff --git a/bases/common-base/entry.py b/bases/retrodebian/entry.py
similarity index 100%
rename from bases/common-base/entry.py
rename to bases/retrodebian/entry.py
diff --git a/bases/sample-base/entry.sh b/bases/retrodebian/entry.sh
old mode 100755
new mode 100644
similarity index 62%
rename from bases/sample-base/entry.sh
rename to bases/retrodebian/entry.sh
index 6246744..7366107
--- a/bases/sample-base/entry.sh
+++ b/bases/retrodebian/entry.sh
@@ -6,9 +6,6 @@ PHASE=${1:-}
 
 case "$PHASE" in
     pre-feature|post-feature)
-        mkdir -p "$LIVE_DIR/builder-notes"
-        printf 'sample-base entry.sh %s
-' "$PHASE" > "$LIVE_DIR/builder-notes/base-entry-${PHASE}.txt"
         ;;
     *)
         echo "Unsupported base phase: $PHASE" >&2
diff --git a/bases/common-base/generate.sh b/bases/retrodebian/generate.sh
old mode 100755
new mode 100644
similarity index 100%
rename from bases/common-base/generate.sh
rename to bases/retrodebian/generate.sh
diff --git a/bases/common-base/hooks/05-common-base.sh b/bases/retrodebian/hooks/05-common-base.sh
old mode 100755
new mode 100644
similarity index 100%
rename from bases/common-base/hooks/05-common-base.sh
rename to bases/retrodebian/hooks/05-common-base.sh
diff --git a/bases/common-base/packageslists/common-base.list b/bases/retrodebian/packageslists/common-base.list
similarity index 100%
rename from bases/common-base/packageslists/common-base.list
rename to bases/retrodebian/packageslists/common-base.list
diff --git a/bases/sample-base/chroot/etc/retrodebian-base.conf b/bases/voodoo2/chroot/etc/retrodebian-base.conf
similarity index 100%
rename from bases/sample-base/chroot/etc/retrodebian-base.conf
rename to bases/voodoo2/chroot/etc/retrodebian-base.conf
diff --git a/bases/sample-base/entry.py b/bases/voodoo2/entry.py
similarity index 98%
rename from bases/sample-base/entry.py
rename to bases/voodoo2/entry.py
index 2041cf9..e54c9c9 100644
--- a/bases/sample-base/entry.py
+++ b/bases/voodoo2/entry.py
@@ -16,7 +16,7 @@ from retrobuilder.model import BaseSpec
 
 SPEC = BaseSpec(
     description='Sample base used to validate the V2 builder flow.',
-    parent='common-base',
+    parent='retrodebian',
     docker_overrides={
         # 'pre-feature': {'image': 'retrodebian/custom-lenny:latest'},
         # 'post-feature': {'dockerfile': 'bases/sample-base/Dockerfile.lenny'},
diff --git a/bases/voodoo2/entry.sh b/bases/voodoo2/entry.sh
new file mode 100644
index 0000000..7366107
--- /dev/null
+++ b/bases/voodoo2/entry.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -eu
+
+PHASE=${1:-}
+[ -n "$PHASE" ] || { echo "Usage: entry.sh <phase>" >&2; exit 2; }
+
+case "$PHASE" in
+    pre-feature|post-feature)
+        ;;
+    *)
+        echo "Unsupported base phase: $PHASE" >&2
+        exit 2
+        ;;
+esac
diff --git a/bases/sample-base/generate.sh b/bases/voodoo2/generate.sh
old mode 100755
new mode 100644
similarity index 100%
rename from bases/sample-base/generate.sh
rename to bases/voodoo2/generate.sh
diff --git a/bases/sample-base/hooks/10-sample-base.sh b/bases/voodoo2/hooks/10-sample-base.sh
old mode 100755
new mode 100644
similarity index 100%
rename from bases/sample-base/hooks/10-sample-base.sh
rename to bases/voodoo2/hooks/10-sample-base.sh