diff --git a/tools-hardened/fixup.sh b/tools-hardened/fixup.sh
deleted file mode 100755
index 98bc241e..00000000
--- a/tools-hardened/fixup.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# This just fixes up the symbolic links
-# to the latest stage{1,2,3} tarballs
-
-mydate=$1
-mypwd=/var/tmp/catalyst/builds
-
-find ${mypwd} -type f -size 0 -exec rm {} +
-find -L  ${mypwd} -type l -exec rm {} +
-
-for arch in amd64 i686; do
-  for flavor in hardened vanilla; do
-    for s in 1 2 3; do
-      file=stage${s}-${arch}-uclibc-${flavor}-${mydate}.tar.bz2
-      link=stage${s}-${arch}-uclibc-${flavor}.tar.bz2
-      cd "${mypwd}/${flavor}/${arch}"
-      if [[ -f ${file} ]]; then
-        ln -sf ${file} ${link}
-      else
-        echo "!!! ${file} doesn't exist!"
-        echo "!!! make sure \${mydate} is right!"
-        exit 1
-      fi
-    done
-  done
-done
-
-tree ${mypwd}
diff --git a/tools-hardened/run-armv7a.sh b/tools-hardened/run-armv7a.sh
index 1385e588..f169aece 100755
--- a/tools-hardened/run-armv7a.sh
+++ b/tools-hardened/run-armv7a.sh
@@ -16,16 +16,16 @@ prepare_confs() {
   local flavor=$2
 
   for s in 1 2 3; do
-    cat stage${s}-${arch}-hardfloat-${flavor}.conf.template | \
-      sed -e "s/\(^version_stamp.*$\)/\1-${mydate}/" >  stage${s}-${arch}-hardfloat-${flavor}.conf
+    cat stage${s}-${arch}_hardfp-${flavor}.conf.template | \
+      sed -e "s/\(^version_stamp.*$\)/\1-${mydate}/" >  stage${s}-${arch}_hardfp-${flavor}.conf
   done
 }
 
 banner() {
-cat << EOF | tee -a zzz.log > stage$1-$2-uclibc-$3.log
+cat << EOF | tee -a zzz.log > stage$1-$2_hardfp-$3.log
 
 ************************************************************************
-*    stage$1-$2-uclibc-$3
+*    stage$1-$2_hardfp-$3
 ************************************************************************"
 
 EOF
@@ -39,30 +39,30 @@ do_stages() {
 
   for s in 1 2 3; do
     local tgpath="${storedir}/builds/${flavor}/${arch}"
-    local target="stage${s}-${arch}-hardfloat-${flavor}-${mydate}.tar.bz2"
-    local tglink="stage${s}-${arch}-hardfloat-${flavor}.tar.bz2"
+    local target="stage${s}-${arch}_hardfp-${flavor}-${mydate}.tar.bz2"
+    local tglink="stage${s}-${arch}_hardfp-${flavor}.tar.bz2"
 
     if [[ ! -f "${tgpath}/${tglink}" ]]; then
-       touch stage${s}-${arch}-hardfloat-${flavor}.log
+       touch stage${s}-${arch}_hardfp-${flavor}.log
        echo "!!! ${target} at ${tgpath} doesn't exit" \
          | tee -a zzz.log \
-         > stage${s}-${arch}-hardfloat-${flavor}.err
+         > stage${s}-${arch}_hardfp-${flavor}.err
        return 1
     fi
 
     if [[ "x${pretend}" != "xtest" ]]; then
       banner ${s} ${arch} ${flavor}
-      catalyst -f stage${s}-${arch}-hardfloat-${flavor}.conf \
+      catalyst -f stage${s}-${arch}_hardfp-${flavor}.conf \
         | tee -a zzz.log \
-        > stage${s}-${arch}-hardfloat-${flavor}.log \
-        2> stage${s}-${arch}-hardfloat-${flavor}.err
+        > stage${s}-${arch}_hardfp-${flavor}.log \
+        2> stage${s}-${arch}_hardfp-${flavor}.err
     else
-      touch stage${s}-${arch}-hardfloat-${flavor}.log
-      touch stage${s}-${arch}-hardfloat-${flavor}.err
+      touch stage${s}-${arch}_hardfp-${flavor}.log
+      touch stage${s}-${arch}_hardfp-${flavor}.err
       touch "${tgpath}/${target}"
-      echo "PRETEND: catalyst -f stage${s}-${arch}-hardfloat-${flavor}.conf \ "
-      echo "PRETEND:   > stage${s}-${arch}-hardfloat-${flavor}.log \ "
-      echo "PRETEND:   2> stage${s}-${arch}-hardfloat-${flavor}.err"
+      echo "PRETEND: catalyst -f stage${s}-${arch}_hardfp-${flavor}.conf \ "
+      echo "PRETEND:   > stage${s}-${arch}_hardfp-${flavor}.log \ "
+      echo "PRETEND:   2> stage${s}-${arch}_hardfp-${flavor}.err"
     fi
 
     if [[ -f "${tgpath}/${target}" ]]; then
@@ -71,7 +71,7 @@ do_stages() {
     else
       echo "!!! ${target} was not generated" \
         | tee -a zzz.log \
-        >stage${s}-${arch}-hardfloat-${flavor}.err
+        >stage${s}-${arch}_hardfp-${flavor}.err
       return 1
     fi
   done
@@ -92,13 +92,13 @@ main() {
 
   >zzz.log
 
-  if [[ "x${pretend}" != "xtest" ]]; then
-     catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
-  else
-     >snapshot.log
-     >snapshot.err
-     echo "PRETEND: catalyst -s current > snapshot.log 2> snapshot.err"
-  fi
+#  if [[ "x${pretend}" != "xtest" ]]; then
+#     catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
+#  else
+#     >snapshot.log
+#     >snapshot.err
+#     echo "PRETEND: catalyst -s current > snapshot.log 2> snapshot.err"
+#  fi
 
   for arch in armv7a; do
     for flavor in hardened; do
diff --git a/tools-hardened/stage1-armv7a-hardfloat-hardened.conf.template b/tools-hardened/stage1-armv7a-hardfloat-hardened.conf.template
deleted file mode 100644
index b4a6f863..00000000
--- a/tools-hardened/stage1-armv7a-hardfloat-hardened.conf.template
+++ /dev/null
@@ -1,8 +0,0 @@
-subarch: armv7a_hardfp
-target: stage1
-version_stamp: hardfloat-hardened
-rel_type: hardened/armv7a
-profile: hardened/linux/arm/armv7a
-snapshot: current
-source_subpath: hardened/armv7a/stage3-armv7a-hardfloat-hardened
-chost: armv7a-hardfloat-linux-gnueabi
diff --git a/tools-hardened/stage1-armv7a_hardfp-hardened.conf.template b/tools-hardened/stage1-armv7a_hardfp-hardened.conf.template
new file mode 100644
index 00000000..c21db83d
--- /dev/null
+++ b/tools-hardened/stage1-armv7a_hardfp-hardened.conf.template
@@ -0,0 +1,7 @@
+subarch: armv7a_hardfp
+target: stage1
+version_stamp: hardened
+rel_type: hardened/armv7a
+profile: hardened/linux/arm/armv7a
+snapshot: current
+source_subpath: hardened/armv7a/stage3-armv7a_hardfp-hardened
diff --git a/tools-hardened/stage2-armv7a-hardfloat-hardened.conf.template b/tools-hardened/stage2-armv7a-hardfloat-hardened.conf.template
deleted file mode 100644
index 671e10e4..00000000
--- a/tools-hardened/stage2-armv7a-hardfloat-hardened.conf.template
+++ /dev/null
@@ -1,8 +0,0 @@
-subarch: armv7a_hardfp
-target: stage2
-version_stamp: hardfloat-hardened
-rel_type: hardened/armv7a
-profile: hardened/linux/arm/armv7a
-snapshot: current
-source_subpath: hardened/armv7a/stage1-armv7a-hardfloat-hardened
-chost: armv7a-hardfloat-linux-gnueabi
diff --git a/tools-hardened/stage2-armv7a_hardfp-hardened.conf.template b/tools-hardened/stage2-armv7a_hardfp-hardened.conf.template
new file mode 100644
index 00000000..30110c1a
--- /dev/null
+++ b/tools-hardened/stage2-armv7a_hardfp-hardened.conf.template
@@ -0,0 +1,7 @@
+subarch: armv7a_hardfp
+target: stage2
+version_stamp: hardened
+rel_type: hardened/armv7a
+profile: hardened/linux/arm/armv7a
+snapshot: current
+source_subpath: hardened/armv7a/stage1-armv7a_hardfp-hardened
diff --git a/tools-hardened/stage3-armv7a-hardfloat-hardened.conf.template b/tools-hardened/stage3-armv7a_hardfp-hardened.conf.template
similarity index 54%
rename from tools-hardened/stage3-armv7a-hardfloat-hardened.conf.template
rename to tools-hardened/stage3-armv7a_hardfp-hardened.conf.template
index 392bab74..b52059b8 100644
--- a/tools-hardened/stage3-armv7a-hardfloat-hardened.conf.template
+++ b/tools-hardened/stage3-armv7a_hardfp-hardened.conf.template
@@ -1,7 +1,7 @@
 subarch: armv7a_hardfp
 target: stage3
-version_stamp: hardfloat-hardened
+version_stamp: hardened
 rel_type: hardened/armv7a
 profile: hardened/linux/arm/armv7a
 snapshot: current
-source_subpath: hardened/armv7a/stage2-armv7a-hardfloat-hardened
+source_subpath: hardened/armv7a/stage2-armv7a_hardfp-hardened