diff --git a/scripts/redstack b/scripts/redstack
index f5d753c1..d8c78991 100755
--- a/scripts/redstack
+++ b/scripts/redstack
@@ -284,30 +284,30 @@ function cmd_set_datastore() {
     PACKAGES=${PACKAGES:-""}
     if [ "$DATASTORE_TYPE" == "mysql" ]; then
         PACKAGES=${PACKAGES:-"mysql-server-5.5"}
-        VERSION="-5.5"
+        VERSION="5.5"
     elif [ "$DATASTORE_TYPE" == "percona" ]; then
         PACKAGES=${PACKAGES:-"percona-server-server-5.5"}
-        VERSION="-5.5"
+        VERSION="5.5"
     elif [ "$DATASTORE_TYPE" == "mongodb" ]; then
         PACKAGES=${PACKAGES:-"mongodb"}
-        VERSION="-2.0.4"
+        VERSION="2.0.4"
     elif [ "$DATASTORE_TYPE" == "redis" ]; then
         PACKAGES=${PACKAGES:-"redis-server"}
-        VERSION="-2.8"
+        VERSION="2.8"
     elif [ "$DATASTORE_TYPE" == "cassandra" ]; then
         PACKAGES=${PACKAGES:-"cassandra"}
-        VERSION="-2.0.5"
+        VERSION="2.0.5"
     elif [ "$DATASTORE_TYPE" == "couchbase" ]; then
         PACKAGES=${PACKAGES:-"couchbase-server"}
-        VERSION="-2.2.0"
+        VERSION="2.2.0"
     else
         echo "Unrecognized datastore type. ($DATASTORE_TYPE)"
         exit 1
     fi
     #rd_manage datastore_version_update <datastore_name> <version_name> <datastore_manager> <image_id> <packages> <active>
-    rd_manage datastore_version_update "$DATASTORE_TYPE" "$DATASTORE_TYPE$VERSION" "$DATASTORE_TYPE" $IMAGEID "$PACKAGES" 1
-    rd_manage datastore_version_update "$DATASTORE_TYPE" "$DATASTORE_TYPE"_inactive_version "manager1" $IMAGEID "" 0
-    rd_manage datastore_update "$DATASTORE_TYPE" "$DATASTORE_TYPE$VERSION"
+    rd_manage datastore_version_update "$DATASTORE_TYPE" "$VERSION" "$DATASTORE_TYPE" $IMAGEID "$PACKAGES" 1
+    rd_manage datastore_version_update "$DATASTORE_TYPE" "inactive_version" "manager1" $IMAGEID "" 0
+    rd_manage datastore_update "$DATASTORE_TYPE" "$VERSION"
     rd_manage datastore_update Test_Datastore_1 ""
     cmd_stop
     iniset $TROVE_CONF_DIR/trove.conf DEFAULT default_datastore "$DATASTORE_TYPE"
@@ -480,10 +480,10 @@ function init_fake_mode() {
          INSERT INTO datastores values ('e00000e0-00e0-0e00-00e0-000e000000ee', \
             'Test_Datastore_1', ''); \
          INSERT INTO datastore_versions VALUES ('b00000b0-00b0-0b00-00b0-000b000000bb', \
-            'a00000a0-00a0-0a00-00a0-000a000000aa', 'mysql-5.5', \
+            'a00000a0-00a0-0a00-00a0-000a000000aa', '5.5', \
             'c00000c0-00c0-0c00-00c0-000c000000cc', 'mysql-server-5.5', 1, 'mysql'); \
          INSERT INTO datastore_versions VALUES ('d00000d0-00d0-0d00-00d0-000d000000dd', \
-            'a00000a0-00a0-0a00-00a0-000a000000aa', 'mysql_inactive_version', \
+            'a00000a0-00a0-0a00-00a0-000a000000aa', 'inactive_version', \
             '', '', 0, 'manager1');"
 }