diff --git a/init-cluster.sh b/init-cluster.sh
index 9ff3d7de6e..3e6a6446c0 100755
--- a/init-cluster.sh
+++ b/init-cluster.sh
@@ -16,7 +16,7 @@ curl --silent --dump - -L -X PUT "$ETCD/v2/keys/$NAME/Target/MapIDToEndpoint/Pav
 curl --silent --dump - -L -X PUT "$ETCD/v2/keys/$NAME/Target/MapIDToEndpoint/Perry" -d "value=tcp://127.0.0.1:8531" || exit 1
 curl --silent --dump - -L -X PUT "$ETCD/v2/keys/$NAME/Target/MapIDToEndpoint/Claus" -d "value=tcp://127.0.0.1:8529" || exit 1
 
-curl --silent --dump - -L -X PUT "$ETCD/v2/keys/$NAME/Target/Collections/_system/1234567" -d 'value={"status":"LOADED","shards":{"shardBlubb": "Pavel"},"shardKeys":["xyz"],"indexes":{},"name":"testCollection","typ":3}' || exit 1
+curl --silent --dump - -L -X PUT "$ETCD/v2/keys/$NAME/Current/Collections/system/1234567" -d 'value={"status":3,"shards":{"shardBlubb": "Pavel"},"shardKeys":["xyz"],"indexes":{},"name":"testCollection","type":2,"id":"5678"}' || exit 1
 
 echo
 echo start arangod with:
diff --git a/utils/arangom.in b/utils/arangom.in
index 4a2f547c46..871b433a0b 100755
--- a/utils/arangom.in
+++ b/utils/arangom.in
@@ -47,26 +47,26 @@ if [ "$1" == "init" ] ; then
     set Target/DBServers
     set Target/Coordinators
     set Target/Collections
-    set Target/Collections/_system
-    set Target/Collections/_system/Version 1
-    set Target/Collections/_system/Lock UNLOCKED
+    set Target/Collections/system
+    set Target/Collections/system/Version 1
+    set Target/Collections/system/Lock UNLOCKED
 
     set Plan/Version 1
     set Plan/DBServers
     set Plan/Coordinators
     set Plan/Collections
-    set Plan/Collections/_system
-    set Plan/Collections/_system/Version 1
-    set Plan/Collections/_system/Lock UNLOCKED
+    set Plan/Collections/system
+    set Plan/Collections/system/Version 1
+    set Plan/Collections/system/Lock UNLOCKED
 
     set Current/Version 1
     set Current/ServersRegistered
     set Current/DBServers
     set Current/Coordinators
     set Current/Collections
-    set Current/Collections/_system
-    set Current/Collections/_system/Version 1
-    set Current/Collections/_system/Lock UNLOCKED
+    set Current/Collections/system
+    set Current/Collections/system/Version 1
+    set Current/Collections/system/Lock UNLOCKED
 
     set Current/ShardsCopied