diff --git a/specs/2006.1/alpha/livecd-stage2-minimal.spec b/specs/2006.1/alpha/livecd-stage2-minimal.spec
index 76cd9abe..ae3f7ff6 100644
--- a/specs/2006.1/alpha/livecd-stage2-minimal.spec
+++ b/specs/2006.1/alpha/livecd-stage2-minimal.spec
@@ -7,9 +7,9 @@ snapshot: 2006.1
 source_subpath: default/livecd-stage1-alpha-2006.1
 
 livecd/fstype: squashfs
-livecd/cdtar: /usr/lib/catalyst2/livecd/cdtar/aboot-0.9-r1-cdtar.tar.bz2
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/aboot-0.9-r1-cdtar.tar.bz2
 
-livecd/iso: /var/tmp/catalyst2/builds/default/install-alpha-minimal-2006.1.iso
+livecd/iso: /var/tmp/catalyst/builds/default/install-alpha-minimal-2006.1.iso
 
 livecd/volid: Gentoo Linux alpha 2006.1
 livecd/type: gentoo-release-minimal
diff --git a/specs/2006.1/alpha/livecd-stage2-universal.spec b/specs/2006.1/alpha/livecd-stage2-universal.spec
index 636be21d..b24789a5 100644
--- a/specs/2006.1/alpha/livecd-stage2-universal.spec
+++ b/specs/2006.1/alpha/livecd-stage2-universal.spec
@@ -7,9 +7,9 @@ snapshot: 2006.1
 source_subpath: default/livecd-stage1-alpha-2006.1
 
 livecd/fstype: squashfs
-livecd/cdtar: /usr/lib/catalyst2/livecd/cdtar/aboot-0.9-r1-cdtar.tar.bz2
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/aboot-0.9-r1-cdtar.tar.bz2
 
-livecd/iso: /var/tmp/catalyst2/builds/default/install-alpha-universal-2006.1.iso
+livecd/iso: /var/tmp/catalyst/builds/default/install-alpha-universal-2006.1.iso
 
 livecd/volid: Gentoo Linux alpha 2006.1
 livecd/type: gentoo-release-universal
diff --git a/specs/2006.1/amd64/livecd-stage2-gnome.spec b/specs/2006.1/amd64/livecd-stage2-gnome.spec
index e64c2a75..13b4b0a4 100644
--- a/specs/2006.1/amd64/livecd-stage2-gnome.spec
+++ b/specs/2006.1/amd64/livecd-stage2-gnome.spec
@@ -9,7 +9,7 @@ source_subpath: default/livecd-stage1-amd64-installer-2006.1
 livecd/fstype: squashfs
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2
 
-livecd/iso: /var/tmp/catalyst2/builds/default/livecd-amd64-installer-2006.1.iso
+livecd/iso: /var/tmp/catalyst/builds/default/livecd-amd64-installer-2006.1.iso
 livecd/splash_type: gensplash
 livecd/splash_theme: livecd-2006.1
 livecd/xdm: gdm
diff --git a/specs/2006.1/amd64/livecd-stage2-minimal.spec b/specs/2006.1/amd64/livecd-stage2-minimal.spec
index 0cd58063..89bd8299 100644
--- a/specs/2006.1/amd64/livecd-stage2-minimal.spec
+++ b/specs/2006.1/amd64/livecd-stage2-minimal.spec
@@ -7,9 +7,9 @@ snapshot: 2006.1
 source_subpath: default/livecd-stage1-amd64-2006.1
 
 livecd/fstype: squashfs
-livecd/cdtar: /usr/lib/catalyst2/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2
 
-livecd/iso: /var/tmp/catalyst2/builds/default/install-amd64-minimal-2006.1.iso
+livecd/iso: /var/tmp/catalyst/builds/default/install-amd64-minimal-2006.1.iso
 livecd/splash_type: gensplash
 livecd/splash_theme: livecd-2006.1
 
diff --git a/specs/2006.1/hppa/livecd-stage2-minimal.spec b/specs/2006.1/hppa/livecd-stage2-minimal.spec
index ae77d10b..5c6da193 100644
--- a/specs/2006.1/hppa/livecd-stage2-minimal.spec
+++ b/specs/2006.1/hppa/livecd-stage2-minimal.spec
@@ -7,9 +7,9 @@ snapshot: 2006.1
 source_subpath: default/livecd-stage1-hppa1.1-2006.1
 
 livecd/fstype: squashfs
-livecd/cdtar: /usr/lib/catalyst2/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2
 
-livecd/iso: /var/tmp/catalyst2/builds/default/install-hppa-minimal-2006.1.iso
+livecd/iso: /var/tmp/catalyst/builds/default/install-hppa-minimal-2006.1.iso
 livecd/devmanager: udev
 
 livecd/type: gentoo-release-minimal
diff --git a/specs/2006.1/hppa/livecd-stage2-universal.spec b/specs/2006.1/hppa/livecd-stage2-universal.spec
index 1958092a..2dcda884 100644
--- a/specs/2006.1/hppa/livecd-stage2-universal.spec
+++ b/specs/2006.1/hppa/livecd-stage2-universal.spec
@@ -7,9 +7,9 @@ snapshot: 2006.1
 source_subpath: default/livecd-stage1-hppa1.1-2006.1
 
 livecd/fstype: squashfs
-livecd/cdtar: /usr/lib/catalyst2/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2
 
-livecd/iso: /var/tmp/catalyst2/builds/default/install-hppa-universal-2006.1.iso
+livecd/iso: /var/tmp/catalyst/builds/default/install-hppa-universal-2006.1.iso
 livecd/devmanager: udev
 
 livecd/type: gentoo-release-universal
diff --git a/specs/2006.1/ia64/livecd-stage2-minimal.spec b/specs/2006.1/ia64/livecd-stage2-minimal.spec
index e3569e2d..89b09d12 100644
--- a/specs/2006.1/ia64/livecd-stage2-minimal.spec
+++ b/specs/2006.1/ia64/livecd-stage2-minimal.spec
@@ -7,9 +7,9 @@ snapshot: 2006.1
 source_subpath: default/livecd-stage1-ia64-2006.1
 
 livecd/cdfstype: squashfs
-livecd/cdtar: /usr/lib/catalyst2/livecd/cdtar/elilo-3.4-cdtar.tar.bz2
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/elilo-3.4-cdtar.tar.bz2
 
-livecd/iso: /var/tmp/catalyst2/builds/default/install-ia64-minimal-2006.1.iso
+livecd/iso: /var/tmp/catalyst/builds/default/install-ia64-minimal-2006.1.iso
 
 livecd/volid: Gentoo Linux IA64 2006.1
 livecd/type: gentoo-release-minimal
diff --git a/specs/2006.1/ppc/ppc32/livecd-stage2-minimal.spec b/specs/2006.1/ppc/ppc32/livecd-stage2-minimal.spec
index 3db982e1..a56020dd 100644
--- a/specs/2006.1/ppc/ppc32/livecd-stage2-minimal.spec
+++ b/specs/2006.1/ppc/ppc32/livecd-stage2-minimal.spec
@@ -7,9 +7,9 @@ snapshot: 2006.1
 source_subpath: default/livecd-stage1-ppc-2006.1
 
 livecd/fstype: squashfs
-livecd/cdtar: /usr/lib/catalyst2/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2
 
-livecd/iso: /var/tmp/catalyst2/builds/default/install-ppc-minimal-2006.1.iso
+livecd/iso: /var/tmp/catalyst/builds/default/install-ppc-minimal-2006.1.iso
 
 livecd/volid: Gentoo Linux 2006.1 PPC
 livecd/type: gentoo-release-minimal
diff --git a/specs/2006.1/ppc/ppc32/livecd-stage2-universal.spec b/specs/2006.1/ppc/ppc32/livecd-stage2-universal.spec
index f5701a4a..c63569b7 100644
--- a/specs/2006.1/ppc/ppc32/livecd-stage2-universal.spec
+++ b/specs/2006.1/ppc/ppc32/livecd-stage2-universal.spec
@@ -7,9 +7,9 @@ snapshot: 2006.1
 source_subpath: default/livecd-stage1-ppc-2006.1
 
 livecd/fstype: squashfs
-livecd/cdtar: /usr/lib/catalyst2/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2
 
-livecd/iso: /var/tmp/catalyst2/builds/default/install-ppc-universal-2006.1.iso
+livecd/iso: /var/tmp/catalyst/builds/default/install-ppc-universal-2006.1.iso
 
 livecd/volid: Gentoo Linux 2006.1 PPC
 livecd/type: gentoo-release-universal
diff --git a/specs/2006.1/x86/i686/livecd-stage2-gnome.spec b/specs/2006.1/x86/i686/livecd-stage2-gnome.spec
index d32e9ee8..8a2a8cac 100644
--- a/specs/2006.1/x86/i686/livecd-stage2-gnome.spec
+++ b/specs/2006.1/x86/i686/livecd-stage2-gnome.spec
@@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-i686-installer-2006.1
 
 livecd/fstype: squashfs
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2
-livecd/iso: /var/tmp/catalyst2/builds/default/livecd-i686-installer-2006.1.iso
+livecd/iso: /var/tmp/catalyst/builds/default/livecd-i686-installer-2006.1.iso
 livecd/splash_type: gensplash
 livecd/splash_theme: livecd-2006.1
 livecd/xdm: gdm
diff --git a/specs/2006.1/x86/livecd-stage2-minimal.spec b/specs/2006.1/x86/livecd-stage2-minimal.spec
index b88b1a24..0558eba3 100644
--- a/specs/2006.1/x86/livecd-stage2-minimal.spec
+++ b/specs/2006.1/x86/livecd-stage2-minimal.spec
@@ -7,9 +7,9 @@ snapshot: 2006.1
 source_subpath: default/livecd-stage1-x86-2006.1
 
 livecd/fstype: squashfs
-livecd/cdtar: /usr/lib/catalyst2/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2
 
-livecd/iso: /var/tmp/catalyst2/builds/default/install-x86-minimal-2006.1.iso
+livecd/iso: /var/tmp/catalyst/builds/default/install-x86-minimal-2006.1.iso
 livecd/splash_type: gensplash
 livecd/splash_theme: livecd-2006.1