diff --git a/utils/warden/bin/cell-def b/utils/warden/bin/cell-def
index 12fd284..c7c7116 100755
--- a/utils/warden/bin/cell-def
+++ b/utils/warden/bin/cell-def
@@ -8,7 +8,7 @@
 echo "export ONOS_NIC=\"10.128.11.*\""
 
 sudo lxc-ls -F "name,ipv4" --fancy | grep $name | \
-    sed "s/^$name/OC/" | tr "[:lower:]" "[:upper:]" | \
+    sed "s/^$name-/OC/" | tr "[:lower:]" "[:upper:]" | \
     sed -r 's/[ ]+/\=/;s/^/export /'
 
 echo "export OCT=\"\$OC1\""
diff --git a/utils/warden/bin/clone-node b/utils/warden/bin/clone-node
index 8e60d40..2a3465a 100755
--- a/utils/warden/bin/clone-node
+++ b/utils/warden/bin/clone-node
@@ -4,7 +4,8 @@
 base="$1"
 ip="$2"
 name="$3"
-key="$4"
+shift 3
+key="$@"
 
 sudo lxc-clone -o $base -n $name
 
diff --git a/utils/warden/bin/create-cell b/utils/warden/bin/create-cell
index f24a386..59ccb96 100755
--- a/utils/warden/bin/create-cell
+++ b/utils/warden/bin/create-cell
@@ -3,11 +3,12 @@
 
 name="$1"
 ipx="$2"
-key="$3"
+shift 2
+key="$@"
 
 cd $(dirname $0)
 
-./clone-node base-mininet ${ipx/x/0} $name-mn "$key"
+./clone-node base-mininet ${ipx/x/0} $name-n "$key"
 
 for n in {1..3}; do
     ./clone-node base-onos ${ipx/x/$n} $name-$n "$key"
diff --git a/utils/warden/bin/destroy-cell b/utils/warden/bin/destroy-cell
index c39d5fe..0af757e 100755
--- a/utils/warden/bin/destroy-cell
+++ b/utils/warden/bin/destroy-cell
@@ -5,7 +5,7 @@
 
 cd $(dirname $0)
 
-./destroy-node $name-mn
+./destroy-node $name-n
 
 for n in {1..3}; do
     ./destroy-node $name-$n