diff --git a/specs/2005.0/x86/packagecd-athlon-xp.spec b/specs/2005.0/x86/athlon-xp/packagecd.spec
similarity index 100%
rename from specs/2005.0/x86/packagecd-athlon-xp.spec
rename to specs/2005.0/x86/athlon-xp/packagecd.spec
diff --git a/specs/2005.0/x86/athlon-xp/athlon-xp-stage2.spec b/specs/2005.0/x86/athlon-xp/stage2.spec
similarity index 100%
rename from specs/2005.0/x86/athlon-xp/athlon-xp-stage2.spec
rename to specs/2005.0/x86/athlon-xp/stage2.spec
diff --git a/specs/2005.0/x86/athlon-xp/athlon-xp-stage3.spec b/specs/2005.0/x86/athlon-xp/stage3.spec
similarity index 100%
rename from specs/2005.0/x86/athlon-xp/athlon-xp-stage3.spec
rename to specs/2005.0/x86/athlon-xp/stage3.spec
diff --git a/specs/2005.0/x86/packagecd-i686.spec b/specs/2005.0/x86/i686/packagecd.spec
similarity index 100%
rename from specs/2005.0/x86/packagecd-i686.spec
rename to specs/2005.0/x86/i686/packagecd.spec
diff --git a/specs/2005.0/x86/i686/i686-stage2.spec b/specs/2005.0/x86/i686/stage2.spec
similarity index 100%
rename from specs/2005.0/x86/i686/i686-stage2.spec
rename to specs/2005.0/x86/i686/stage2.spec
diff --git a/specs/2005.0/x86/i686/i686-stage3.spec b/specs/2005.0/x86/i686/stage3.spec
similarity index 100%
rename from specs/2005.0/x86/i686/i686-stage3.spec
rename to specs/2005.0/x86/i686/stage3.spec
diff --git a/specs/2005.0/x86/packagecd-x86.spec b/specs/2005.0/x86/packagecd.spec
similarity index 100%
rename from specs/2005.0/x86/packagecd-x86.spec
rename to specs/2005.0/x86/packagecd.spec
diff --git a/specs/2005.0/x86/packagecd-pentium3.spec b/specs/2005.0/x86/pentium3/packagecd.spec
similarity index 100%
rename from specs/2005.0/x86/packagecd-pentium3.spec
rename to specs/2005.0/x86/pentium3/packagecd.spec
diff --git a/specs/2005.0/x86/pentium3/pentium3-stage2.spec b/specs/2005.0/x86/pentium3/stage2.spec
similarity index 100%
rename from specs/2005.0/x86/pentium3/pentium3-stage2.spec
rename to specs/2005.0/x86/pentium3/stage2.spec
diff --git a/specs/2005.0/x86/pentium3/pentium3-stage3.spec b/specs/2005.0/x86/pentium3/stage3.spec
similarity index 100%
rename from specs/2005.0/x86/pentium3/pentium3-stage3.spec
rename to specs/2005.0/x86/pentium3/stage3.spec
diff --git a/specs/2005.0/x86/packagecd-pentium4.spec b/specs/2005.0/x86/pentium4/packagecd.spec
similarity index 100%
rename from specs/2005.0/x86/packagecd-pentium4.spec
rename to specs/2005.0/x86/pentium4/packagecd.spec
diff --git a/specs/2005.0/x86/pentium4/pentium4-stage2.spec b/specs/2005.0/x86/pentium4/stage2.spec
similarity index 100%
rename from specs/2005.0/x86/pentium4/pentium4-stage2.spec
rename to specs/2005.0/x86/pentium4/stage2.spec
diff --git a/specs/2005.0/x86/pentium4/pentium4-stage3.spec b/specs/2005.0/x86/pentium4/stage3.spec
similarity index 100%
rename from specs/2005.0/x86/pentium4/pentium4-stage3.spec
rename to specs/2005.0/x86/pentium4/stage3.spec