diff --git a/tools/test/bin/onos-archetypes-test b/tools/test/bin/onos-archetypes-test
index e6b653e..69df9ed 100755
--- a/tools/test/bin/onos-archetypes-test
+++ b/tools/test/bin/onos-archetypes-test
@@ -19,19 +19,17 @@
 set -e
 
 export AROOT=${ONOS_STAGE_ROOT:-/tmp}/foo
-export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=2.2.2-SNAPSHOT"
+export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=2.2.0-SNAPSHOT"
 
-rm -fr $AROOT 2>/dev/null
 mkdir -p $AROOT
-
 # FIXME: for an in api bundle cli rest ui uitab uitopo ui2; do
 for an in api bundle cli rest ui uitab uitopo; do
     cd $AROOT
-    [ $an = api ] && name=foo-api || name=foo-app
+    rm -fr $AROOT/foo-$an
     mvn -q -B archetype:generate "$@" $ARCHETYPE_OPTS \
         -DarchetypeArtifactId=onos-$an-archetype \
-        -DgroupId=org.foo -DartifactId=$name -Dversion=1.0 \
-        -Dpackage=org.foo.test -DinteractiveMode=false
-    cd $AROOT/$name
+        -DgroupId=org.foo -DartifactId=foo-$an -Dversion=1.0 \
+        -Dpackage=org.foo.$an -DinteractiveMode=false
+    cd $AROOT/foo-$an
     mvn "$@" -q -B clean install
 done