diff --git a/scripts/initopenvim.sh b/scripts/initopenvim.sh
index ae839ba..85dda5b 100755
--- a/scripts/initopenvim.sh
+++ b/scripts/initopenvim.sh
@@ -173,12 +173,12 @@
     ${DIRvim}/openvim host-remove -f fake-host-1      || echo "fail"
     ${DIRvim}/openvim host-remove -f fake-host-2      || echo "fail"
     ${DIRvim}/openvim host-remove -f fake-host-3      || echo "fail"
-    result=`openvim tenant-list TEST-admin`
+    result=`openvim tenant-list osm`
     vimtenant=`echo $result |gawk '{print $1}'`
     #check a valid uuid is obtained
-    is_valid_uuid $vimtenant || ! echo "Tenant TEST-admin not found. Already delete?" >&2 || $_exit 1
+    is_valid_uuid $vimtenant || ! echo "Tenant 'osm' not found. Already delete?" >&2 || $_exit 1
     export OPENVIM_TENANT=$vimtenant
-    ${DIRvim}/openvim tenant-delete -f TEST-admin     || echo "fail"
+    ${DIRvim}/openvim tenant-delete -f osm     || echo "fail"
     echo
 
 elif [[ $action == "create" ]]
@@ -194,8 +194,8 @@
     ${DIRvim}/openvim net-create $DIRvim/test/networks/net-example2.yaml || ! echo "fail" >&2 || $_exit 1
     ${DIRvim}/openvim net-create $DIRvim/test/networks/net-example3.yaml || ! echo "fail" >&2 || $_exit 1
 
-    printf "%-50s" "Creating openvim tenant 'TEST-admin': "
-    result=`${DIRvim}/openvim tenant-create '{"tenant": {"name":"TEST-admin", "description":"admin"}}'`
+    printf "%-50s" "Creating openvim tenant 'osm': "
+    result=`openvim tenant-create '{tenant: {name: osm, description: admin}}'`
     vimtenant=`echo $result |gawk '{print $1}'`
     #check a valid uuid is obtained
     ! is_valid_uuid $vimtenant && echo "FAIL" && echo "    $result" && $_exit 1