diff --git a/alpine.sh b/alpine.sh
index b022010..bd7d4b2 100755
--- a/alpine.sh
+++ b/alpine.sh
@@ -81,8 +81,8 @@ chroot /mnt update-extlinux
 chroot /mnt setup-timezone -z Europe/Prague
 
 # Set hostname
-echo 'spottervm' >/mnt/etc/hostname
-echo '127.0.0.1 spottervm localhost localhost.localdomain' >/mnt/etc/hosts
+echo 'spotter.vm' >/mnt/etc/hostname
+echo '127.0.0.1 spotter.vm localhost localhost.localdomain' >/mnt/etc/hosts
 sed -i '/hostname/d' /mnt/etc/network/interfaces
 
 # Enable services on boot
diff --git a/basic.sh b/basic.sh
index 5f3274a..36378e8 100755
--- a/basic.sh
+++ b/basic.sh
@@ -23,7 +23,7 @@ cp ${SOURCE_DIR}/boot/extlinux.conf /boot/extlinux.conf
 cp ${SOURCE_DIR}/boot/vm.txt /boot/vm.txt
 cp ${SOURCE_DIR}/etc/inittab /etc/inittab
 cp ${SOURCE_DIR}/sbin/extend-disk /sbin/extend-disk
-cp ${SOURCE_DIR}/sbin/spotty /sbin/spotty
+cp ${SOURCE_DIR}/sbin/vmtty /sbin/vmtty
 >/etc/motd
 
 # Enable support for Czech characters
@@ -39,20 +39,20 @@ wget https://raw.githubusercontent.com/Neilpang/acme.sh/master/acme.sh -O /usr/b
 sed -i 's|$HOME/.$PROJECT_NAME|/etc/acme.sh.d|' /usr/bin/acme.sh
 chmod +x /usr/bin/acme.sh
 
-# Copy Spotter AppMgr resources
-cp ${SOURCE_DIR}/etc/init.d/spotter-appmgr /etc/init.d/spotter-appmgr
+# Copy AppMgr resources
+cp ${SOURCE_DIR}/etc/init.d/vm-appmgr /etc/init.d/vm-appmgr
 rc-update -u
-cp -r ${SOURCE_DIR}/srv/spotter /srv/spotter
-ln -s /srv/spotter/cli.py /usr/bin/spotter-appmgr
+cp -r ${SOURCE_DIR}/srv/vm /srv/vm
+ln -s /srv/vm/cli.py /usr/bin/vm-appmgr
 
 # Create a self-signed certificate
-spotter-appmgr create-selfsigned
+vm-appmgr create-selfsigned
 
 # Configure nginx
 cp ${SOURCE_DIR}/etc/nginx/nginx.conf /etc/nginx/nginx.conf
 
 # Configure services
-for SERVICE in consolefont crond nginx ntpd sshd spotter-appmgr swap; do
+for SERVICE in consolefont crond nginx ntpd sshd vm-appmgr swap; do
     rc-update add ${SERVICE} boot
     service ${SERVICE} start
 done
@@ -67,4 +67,4 @@ service docker start
 docker build -t alpine ${SOURCE_DIR}
 
 # Set dummy host and generate related files
-spotter-appmgr update-host spotter.vm 443
+vm-appmgr update-host spotter.vm 443
diff --git a/basic/etc/init.d/spotter-appmgr b/basic/etc/init.d/vm-appmgr
similarity index 50%
rename from basic/etc/init.d/spotter-appmgr
rename to basic/etc/init.d/vm-appmgr
index 3cbaf79..5c93035 100755
--- a/basic/etc/init.d/spotter-appmgr
+++ b/basic/etc/init.d/vm-appmgr
@@ -1,6 +1,6 @@
 #!/sbin/openrc-run
 
-command=/srv/spotter/wsgi.py
-description="Spotter application manager"
-pidfile=/var/run/spotter-appmgr.pid
+command=/srv/vm/wsgi.py
+description="VM application manager"
+pidfile=/var/run/vm-appmgr.pid
 start_stop_daemon_args="--background --make-pidfile --stderr /dev/null --stdout /dev/null"
diff --git a/basic/etc/inittab b/basic/etc/inittab
index 6676941..8852c85 100644
--- a/basic/etc/inittab
+++ b/basic/etc/inittab
@@ -6,7 +6,7 @@
 ::wait:/sbin/openrc default >/dev/null 2>&1
 
 # Set up getty
-tty1::respawn:/sbin/getty -n -l /sbin/spotty 38400 tty1
+tty1::respawn:/sbin/getty -n -l /sbin/vmtty 38400 tty1
 ttyS0::respawn:/sbin/getty -L 115200 ttyS0 xterm
 
 # Stuff to do for the 3-finger salute
diff --git a/basic/sbin/spotty b/basic/sbin/vmtty
similarity index 79%
rename from basic/sbin/spotty
rename to basic/sbin/vmtty
index a289230..624e9cf 100755
--- a/basic/sbin/spotty
+++ b/basic/sbin/vmtty
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Rebuild /etc/issue
-/usr/bin/spotter-appmgr rebuild-issue
+/usr/bin/vm-appmgr rebuild-issue
 # Remove double-escaping needed for the real /etc/issue
 /bin/sed 's|\\\\|\\|g' /etc/issue
 # Wait for key press
diff --git a/basic/srv/spotter/appmgr/__init__.py b/basic/srv/vm/appmgr/__init__.py
similarity index 97%
rename from basic/srv/spotter/appmgr/__init__.py
rename to basic/srv/vm/appmgr/__init__.py
index f64c3bc..ab6bcb6 100644
--- a/basic/srv/spotter/appmgr/__init__.py
+++ b/basic/srv/vm/appmgr/__init__.py
@@ -11,7 +11,7 @@ from . import validator
 
 VERSION = '0.0.1'
 
-CONF_FILE = '/srv/spotter/config.json'
+CONF_FILE = '/srv/vm/config.json'
 ISSUE_FILE = '/etc/issue'
 NGINX_DIR = '/etc/nginx/conf.d'
 ACME_CRON = '/etc/periodic/daily/acme-sh'
@@ -32,12 +32,12 @@ NGINX_TEMPLATE = '''server {{
 
     error_page 502 /502.html;
     location = /502.html {{
-        root /srv/spotter/templates;
+        root /srv/vm/templates;
     }}
 
-    location = /spotter-ping {{
+    location = /vm-ping {{
         add_header Content-Type text/plain;
-        return 200 "spotter-pong";
+        return 200 "vm-pong";
     }}
 }}
 '''
@@ -53,9 +53,9 @@ NGINX_DEFAULT_TEMPLATE = '''server {{
         root /etc/acme.sh.d;
     }}
 
-    location = /spotter-ping {{
+    location = /vm-ping {{
         add_header Content-Type text/plain;
-        return 200 "spotter-pong";
+        return 200 "vm-pong";
     }}
 }}
 
@@ -67,17 +67,17 @@ server {{
     }}
 
     location /static {{
-        root /srv/spotter;
+        root /srv/vm;
     }}
 
     error_page 502 /502.html;
     location = /502.html {{
-        root /srv/spotter/templates;
+        root /srv/vm/templates;
     }}
 
-    location = /spotter-ping {{
+    location = /vm-ping {{
         add_header Content-Type text/plain;
-        return 200 "spotter-pong";
+        return 200 "vm-pong";
     }}
 }}
 '''
diff --git a/basic/srv/spotter/appmgr/confupdater.py b/basic/srv/vm/appmgr/confupdater.py
similarity index 100%
rename from basic/srv/spotter/appmgr/confupdater.py
rename to basic/srv/vm/appmgr/confupdater.py
diff --git a/basic/srv/spotter/appmgr/tools.py b/basic/srv/vm/appmgr/tools.py
similarity index 96%
rename from basic/srv/spotter/appmgr/tools.py
rename to basic/srv/vm/appmgr/tools.py
index afc7293..018c10e 100644
--- a/basic/srv/spotter/appmgr/tools.py
+++ b/basic/srv/vm/appmgr/tools.py
@@ -72,7 +72,7 @@ def resolve_ip(domain, type):
 
 def ping_url(url):
     try:
-        return requests.post('https://tools.dasm.cz/spotter-ping.php', data = {'url': url}, timeout=5).text == 'spotter-pong'
+        return requests.post('https://tools.dasm.cz/vm-ping.php', data = {'url': url}, timeout=5).text == 'vm-pong'
     except requests.exceptions.Timeout:
         raise
     except:
diff --git a/basic/srv/spotter/appmgr/validator.py b/basic/srv/vm/appmgr/validator.py
similarity index 100%
rename from basic/srv/spotter/appmgr/validator.py
rename to basic/srv/vm/appmgr/validator.py
diff --git a/basic/srv/spotter/appmgr/wsgiapp.py b/basic/srv/vm/appmgr/wsgiapp.py
similarity index 99%
rename from basic/srv/spotter/appmgr/wsgiapp.py
rename to basic/srv/vm/appmgr/wsgiapp.py
index cb75cd9..60cf0fe 100644
--- a/basic/srv/spotter/appmgr/wsgiapp.py
+++ b/basic/srv/vm/appmgr/wsgiapp.py
@@ -20,7 +20,7 @@ SESSION_KEY = os.urandom(26)
 
 class WSGIApp(object):
     def __init__(self):
-        self.jinja_env = Environment(loader=FileSystemLoader('/srv/spotter/templates'), autoescape=True, lstrip_blocks=True, trim_blocks=True)
+        self.jinja_env = Environment(loader=FileSystemLoader('/srv/vm/templates'), autoescape=True, lstrip_blocks=True, trim_blocks=True)
         self.jinja_env.globals.update(is_service_autostarted=tools.is_service_autostarted)
         self.jinja_env.globals.update(is_service_started=tools.is_service_started)
 
@@ -254,7 +254,7 @@ class WSGIApp(object):
         return self.render_json({'ok': request.session.lang.app_stopped()})
 
     def update_password_action(self, request):
-        # Updates password for both HDD encryption (LUKS-on-LVM) and admin account to spotter-appmgr
+        # Updates password for both HDD encryption (LUKS-on-LVM) and admin account to vm-appmgr
         try:
             if request.form['newpassword'] != request.form['newpassword2']:
                 return self.render_json({'error': request.session.lang.password_mismatch()})
diff --git a/basic/srv/spotter/appmgr/wsgilang.py b/basic/srv/vm/appmgr/wsgilang.py
similarity index 100%
rename from basic/srv/spotter/appmgr/wsgilang.py
rename to basic/srv/vm/appmgr/wsgilang.py
diff --git a/basic/srv/spotter/appmgr/wsgisession.py b/basic/srv/vm/appmgr/wsgisession.py
similarity index 100%
rename from basic/srv/spotter/appmgr/wsgisession.py
rename to basic/srv/vm/appmgr/wsgisession.py
diff --git a/basic/srv/spotter/cli.py b/basic/srv/vm/cli.py
similarity index 98%
rename from basic/srv/spotter/cli.py
rename to basic/srv/vm/cli.py
index 85c14fe..0e22021 100755
--- a/basic/srv/spotter/cli.py
+++ b/basic/srv/vm/cli.py
@@ -4,11 +4,11 @@
 import argparse
 import getpass
 import sys
-sys.path.append('/srv/spotter')
+sys.path.append('/srv/vm')
 
 from appmgr import AppMgr
 
-parser = argparse.ArgumentParser(description='Spotter VM application manager')
+parser = argparse.ArgumentParser(description='VM application manager')
 subparsers = parser.add_subparsers()
 
 parser_update_login = subparsers.add_parser('update-login', help='Updates application login')
diff --git a/basic/srv/spotter/config.json b/basic/srv/vm/config.json
similarity index 100%
rename from basic/srv/spotter/config.json
rename to basic/srv/vm/config.json
diff --git a/basic/srv/spotter/static/css/style.css b/basic/srv/vm/static/css/style.css
similarity index 100%
rename from basic/srv/spotter/static/css/style.css
rename to basic/srv/vm/static/css/style.css
diff --git a/basic/srv/spotter/static/img/CAP.png b/basic/srv/vm/static/img/CAP.png
similarity index 100%
rename from basic/srv/spotter/static/img/CAP.png
rename to basic/srv/vm/static/img/CAP.png
diff --git a/basic/srv/spotter/static/img/CKAN.png b/basic/srv/vm/static/img/CKAN.png
similarity index 100%
rename from basic/srv/spotter/static/img/CKAN.png
rename to basic/srv/vm/static/img/CKAN.png
diff --git a/basic/srv/spotter/static/img/CTS.png b/basic/srv/vm/static/img/CTS.png
similarity index 100%
rename from basic/srv/spotter/static/img/CTS.png
rename to basic/srv/vm/static/img/CTS.png
diff --git a/basic/srv/spotter/static/img/Cluster_Spotter.png b/basic/srv/vm/static/img/Cluster_Spotter.png
similarity index 100%
rename from basic/srv/spotter/static/img/Cluster_Spotter.png
rename to basic/srv/vm/static/img/Cluster_Spotter.png
diff --git a/basic/srv/spotter/static/img/Crisis_Cleanup.png b/basic/srv/vm/static/img/Crisis_Cleanup.png
similarity index 100%
rename from basic/srv/spotter/static/img/Crisis_Cleanup.png
rename to basic/srv/vm/static/img/Crisis_Cleanup.png
diff --git a/basic/srv/spotter/static/img/Diaspora.png b/basic/srv/vm/static/img/Diaspora.png
similarity index 100%
rename from basic/srv/spotter/static/img/Diaspora.png
rename to basic/srv/vm/static/img/Diaspora.png
diff --git a/basic/srv/spotter/static/img/EDEN.png b/basic/srv/vm/static/img/EDEN.png
similarity index 100%
rename from basic/srv/spotter/static/img/EDEN.png
rename to basic/srv/vm/static/img/EDEN.png
diff --git a/basic/srv/spotter/static/img/FrontlineSMS.png b/basic/srv/vm/static/img/FrontlineSMS.png
similarity index 100%
rename from basic/srv/spotter/static/img/FrontlineSMS.png
rename to basic/srv/vm/static/img/FrontlineSMS.png
diff --git a/basic/srv/spotter/static/img/FrontlineSync.png b/basic/srv/vm/static/img/FrontlineSync.png
similarity index 100%
rename from basic/srv/spotter/static/img/FrontlineSync.png
rename to basic/srv/vm/static/img/FrontlineSync.png
diff --git a/basic/srv/spotter/static/img/GNU_Health.png b/basic/srv/vm/static/img/GNU_Health.png
similarity index 100%
rename from basic/srv/spotter/static/img/GNU_Health.png
rename to basic/srv/vm/static/img/GNU_Health.png
diff --git a/basic/srv/spotter/static/img/GeoODK_Collect.png b/basic/srv/vm/static/img/GeoODK_Collect.png
similarity index 100%
rename from basic/srv/spotter/static/img/GeoODK_Collect.png
rename to basic/srv/vm/static/img/GeoODK_Collect.png
diff --git a/basic/srv/spotter/static/img/Kanboard.png b/basic/srv/vm/static/img/Kanboard.png
similarity index 100%
rename from basic/srv/spotter/static/img/Kanboard.png
rename to basic/srv/vm/static/img/Kanboard.png
diff --git a/basic/srv/spotter/static/img/MifosX.png b/basic/srv/vm/static/img/MifosX.png
similarity index 100%
rename from basic/srv/spotter/static/img/MifosX.png
rename to basic/srv/vm/static/img/MifosX.png
diff --git a/basic/srv/spotter/static/img/MifosX_Mobile.png b/basic/srv/vm/static/img/MifosX_Mobile.png
similarity index 100%
rename from basic/srv/spotter/static/img/MifosX_Mobile.png
rename to basic/srv/vm/static/img/MifosX_Mobile.png
diff --git a/basic/srv/spotter/static/img/Motech.png b/basic/srv/vm/static/img/Motech.png
similarity index 100%
rename from basic/srv/spotter/static/img/Motech.png
rename to basic/srv/vm/static/img/Motech.png
diff --git a/basic/srv/spotter/static/img/ODK.png b/basic/srv/vm/static/img/ODK.png
similarity index 100%
rename from basic/srv/spotter/static/img/ODK.png
rename to basic/srv/vm/static/img/ODK.png
diff --git a/basic/srv/spotter/static/img/ODK_Collect.png b/basic/srv/vm/static/img/ODK_Collect.png
similarity index 100%
rename from basic/srv/spotter/static/img/ODK_Collect.png
rename to basic/srv/vm/static/img/ODK_Collect.png
diff --git a/basic/srv/spotter/static/img/OMK.png b/basic/srv/vm/static/img/OMK.png
similarity index 100%
rename from basic/srv/spotter/static/img/OMK.png
rename to basic/srv/vm/static/img/OMK.png
diff --git a/basic/srv/spotter/static/img/OpenID.png b/basic/srv/vm/static/img/OpenID.png
similarity index 100%
rename from basic/srv/spotter/static/img/OpenID.png
rename to basic/srv/vm/static/img/OpenID.png
diff --git a/basic/srv/spotter/static/img/POSM.png b/basic/srv/vm/static/img/POSM.png
similarity index 100%
rename from basic/srv/spotter/static/img/POSM.png
rename to basic/srv/vm/static/img/POSM.png
diff --git a/basic/srv/spotter/static/img/Pandora.png b/basic/srv/vm/static/img/Pandora.png
similarity index 100%
rename from basic/srv/spotter/static/img/Pandora.png
rename to basic/srv/vm/static/img/Pandora.png
diff --git a/basic/srv/spotter/static/img/PostGIS.png b/basic/srv/vm/static/img/PostGIS.png
similarity index 100%
rename from basic/srv/spotter/static/img/PostGIS.png
rename to basic/srv/vm/static/img/PostGIS.png
diff --git a/basic/srv/spotter/static/img/SMS_Sync.png b/basic/srv/vm/static/img/SMS_Sync.png
similarity index 100%
rename from basic/srv/spotter/static/img/SMS_Sync.png
rename to basic/srv/vm/static/img/SMS_Sync.png
diff --git a/basic/srv/spotter/static/img/SeedDMS.png b/basic/srv/vm/static/img/SeedDMS.png
similarity index 100%
rename from basic/srv/spotter/static/img/SeedDMS.png
rename to basic/srv/vm/static/img/SeedDMS.png
diff --git a/basic/srv/spotter/static/img/Sigmah.png b/basic/srv/vm/static/img/Sigmah.png
similarity index 100%
rename from basic/srv/spotter/static/img/Sigmah.png
rename to basic/srv/vm/static/img/Sigmah.png
diff --git a/basic/srv/spotter/static/img/Ushahidi.png b/basic/srv/vm/static/img/Ushahidi.png
similarity index 100%
rename from basic/srv/spotter/static/img/Ushahidi.png
rename to basic/srv/vm/static/img/Ushahidi.png
diff --git a/basic/srv/spotter/static/img/Ushahidi_mobile.png b/basic/srv/vm/static/img/Ushahidi_mobile.png
similarity index 100%
rename from basic/srv/spotter/static/img/Ushahidi_mobile.png
rename to basic/srv/vm/static/img/Ushahidi_mobile.png
diff --git a/basic/srv/spotter/static/img/icons/Android.png b/basic/srv/vm/static/img/icons/Android.png
similarity index 100%
rename from basic/srv/spotter/static/img/icons/Android.png
rename to basic/srv/vm/static/img/icons/Android.png
diff --git a/basic/srv/spotter/static/img/icons/Java.png b/basic/srv/vm/static/img/icons/Java.png
similarity index 100%
rename from basic/srv/spotter/static/img/icons/Java.png
rename to basic/srv/vm/static/img/icons/Java.png
diff --git a/basic/srv/spotter/static/img/icons/Linux.png b/basic/srv/vm/static/img/icons/Linux.png
similarity index 100%
rename from basic/srv/spotter/static/img/icons/Linux.png
rename to basic/srv/vm/static/img/icons/Linux.png
diff --git a/basic/srv/spotter/static/img/icons/MacOS.png b/basic/srv/vm/static/img/icons/MacOS.png
similarity index 100%
rename from basic/srv/spotter/static/img/icons/MacOS.png
rename to basic/srv/vm/static/img/icons/MacOS.png
diff --git a/basic/srv/spotter/static/img/icons/Windows.png b/basic/srv/vm/static/img/icons/Windows.png
similarity index 100%
rename from basic/srv/spotter/static/img/icons/Windows.png
rename to basic/srv/vm/static/img/icons/Windows.png
diff --git a/basic/srv/spotter/static/img/icons/iOS.png b/basic/srv/vm/static/img/icons/iOS.png
similarity index 100%
rename from basic/srv/spotter/static/img/icons/iOS.png
rename to basic/srv/vm/static/img/icons/iOS.png
diff --git a/basic/srv/spotter/static/js/admin.js b/basic/srv/vm/static/js/admin.js
similarity index 100%
rename from basic/srv/spotter/static/js/admin.js
rename to basic/srv/vm/static/js/admin.js
diff --git a/basic/srv/spotter/static/js/jquery-3.3.1.min.js b/basic/srv/vm/static/js/jquery-3.3.1.min.js
similarity index 100%
rename from basic/srv/spotter/static/js/jquery-3.3.1.min.js
rename to basic/srv/vm/static/js/jquery-3.3.1.min.js
diff --git a/basic/srv/spotter/static/js/script.js b/basic/srv/vm/static/js/script.js
similarity index 100%
rename from basic/srv/spotter/static/js/script.js
rename to basic/srv/vm/static/js/script.js
diff --git a/basic/srv/spotter/templates/404.html b/basic/srv/vm/templates/404.html
similarity index 100%
rename from basic/srv/spotter/templates/404.html
rename to basic/srv/vm/templates/404.html
diff --git a/basic/srv/spotter/templates/502.html b/basic/srv/vm/templates/502.html
similarity index 100%
rename from basic/srv/spotter/templates/502.html
rename to basic/srv/vm/templates/502.html
diff --git a/basic/srv/spotter/templates/layout.html b/basic/srv/vm/templates/layout.html
similarity index 100%
rename from basic/srv/spotter/templates/layout.html
rename to basic/srv/vm/templates/layout.html
diff --git a/basic/srv/spotter/templates/login.html b/basic/srv/vm/templates/login.html
similarity index 100%
rename from basic/srv/spotter/templates/login.html
rename to basic/srv/vm/templates/login.html
diff --git a/basic/srv/spotter/templates/portal-admin.html b/basic/srv/vm/templates/portal-admin.html
similarity index 100%
rename from basic/srv/spotter/templates/portal-admin.html
rename to basic/srv/vm/templates/portal-admin.html
diff --git a/basic/srv/spotter/templates/portal-user.html b/basic/srv/vm/templates/portal-user.html
similarity index 100%
rename from basic/srv/spotter/templates/portal-user.html
rename to basic/srv/vm/templates/portal-user.html
diff --git a/basic/srv/spotter/templates/setup-apps.html b/basic/srv/vm/templates/setup-apps.html
similarity index 100%
rename from basic/srv/spotter/templates/setup-apps.html
rename to basic/srv/vm/templates/setup-apps.html
diff --git a/basic/srv/spotter/templates/setup-host.html b/basic/srv/vm/templates/setup-host.html
similarity index 100%
rename from basic/srv/spotter/templates/setup-host.html
rename to basic/srv/vm/templates/setup-host.html
diff --git a/basic/srv/spotter/wsgi.py b/basic/srv/vm/wsgi.py
similarity index 90%
rename from basic/srv/spotter/wsgi.py
rename to basic/srv/vm/wsgi.py
index 64e8896..7ee6bd9 100755
--- a/basic/srv/spotter/wsgi.py
+++ b/basic/srv/vm/wsgi.py
@@ -3,7 +3,7 @@
 
 import sys
 
-sys.path.append('/srv/spotter')
+sys.path.append('/srv/vm')
 from appmgr.wsgiapp import WSGIApp
 
 application = WSGIApp()
diff --git a/ckan.sh b/ckan.sh
index 7053ae5..694d93c 100755
--- a/ckan.sh
+++ b/ckan.sh
@@ -56,7 +56,7 @@ export CKAN_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
 export CKAN_ADMIN_HASH=$(docker run --rm ckan python -c "from passlib.hash import pbkdf2_sha512;print pbkdf2_sha512.encrypt('${CKAN_ADMIN_PWD}')")
 export CKAN_ADMIN_EMAIL="admin@example.com"
 envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i postgres psql ckan
-spotter-appmgr update-login ckan "${CKAN_ADMIN_USER}" "${CKAN_ADMIN_PWD}"
+vm-appmgr update-login ckan "${CKAN_ADMIN_USER}" "${CKAN_ADMIN_PWD}"
 
 # Install cron job
 cp ${SOURCE_DIR}/etc/periodic/hourly/ckan /etc/periodic/hourly/ckan
diff --git a/ckan/etc/init.d/ckan b/ckan/etc/init.d/ckan
index a435be1..e9fce2f 100755
--- a/ckan/etc/init.d/ckan
+++ b/ckan/etc/init.d/ckan
@@ -21,11 +21,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy ckan
+	/usr/bin/vm-appmgr register-proxy ckan
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy ckan
+	/usr/bin/vm-appmgr unregister-proxy ckan
 }
 
 stop() {
diff --git a/crisiscleanup.sh b/crisiscleanup.sh
index b8c1b04..afcde37 100755
--- a/crisiscleanup.sh
+++ b/crisiscleanup.sh
@@ -31,7 +31,7 @@ envsubst <${SOURCE_DIR}/srv/crisiscleanup/conf/database.yml >/srv/crisiscleanup/
 cp ${SOURCE_DIR}/srv/crisiscleanup/conf/boot.rb /srv/crisiscleanup/conf/boot.rb
 cp ${SOURCE_DIR}/srv/crisiscleanup/conf/initializers/devise.rb /srv/crisiscleanup/conf/initializers/devise.rb
 cp ${SOURCE_DIR}/srv/crisiscleanup/conf/environments/production.rb /srv/crisiscleanup/conf/environments/production.rb
-spotter-appmgr update-login crisiscleanup "${CRISISCLEANUP_ADMIN_EMAIL}" "${CRISISCLEANUP_ADMIN_PWD}"
+vm-appmgr update-login crisiscleanup "${CRISISCLEANUP_ADMIN_EMAIL}" "${CRISISCLEANUP_ADMIN_PWD}"
 
 # Populate database
 envsubst <${SOURCE_DIR}/srv/crisiscleanup/db/seeds.rb >/tmp/seeds.rb
diff --git a/crisiscleanup/etc/init.d/crisiscleanup b/crisiscleanup/etc/init.d/crisiscleanup
index c58658c..4020c98 100755
--- a/crisiscleanup/etc/init.d/crisiscleanup
+++ b/crisiscleanup/etc/init.d/crisiscleanup
@@ -17,11 +17,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy crisiscleanup
+	/usr/bin/vm-appmgr register-proxy crisiscleanup
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy crisiscleanup
+	/usr/bin/vm-appmgr unregister-proxy crisiscleanup
 }
 
 stop() {
diff --git a/cts.sh b/cts.sh
index 2db03fa..36852e3 100755
--- a/cts.sh
+++ b/cts.sh
@@ -39,7 +39,7 @@ export CTS_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
 export CTS_ADMIN_HASH=$(docker run --rm -h cts -v /srv/cts/conf:/srv/cts/cts/settings cts python -c "from django.contrib.auth.hashers import make_password; print make_password('${CTS_ADMIN_PWD}')")
 export CTS_ADMIN_SECRET=$(head -c 12 /dev/urandom | sha256sum | cut -c1-13)
 envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i postgres psql cts
-spotter-appmgr update-login cts "${CTS_ADMIN_EMAIL}" "${CTS_ADMIN_PWD}"
+vm-appmgr update-login cts "${CTS_ADMIN_EMAIL}" "${CTS_ADMIN_PWD}"
 
 # Stop services required for build
 service postgres stop
diff --git a/cts/etc/init.d/cts b/cts/etc/init.d/cts
index 028b1d8..0775cad 100755
--- a/cts/etc/init.d/cts
+++ b/cts/etc/init.d/cts
@@ -16,11 +16,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy cts
+	/usr/bin/vm-appmgr register-proxy cts
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy cts
+	/usr/bin/vm-appmgr unregister-proxy cts
 }
 
 stop() {
diff --git a/frontlinesms.sh b/frontlinesms.sh
index 62262c1..13ba416 100755
--- a/frontlinesms.sh
+++ b/frontlinesms.sh
@@ -16,4 +16,4 @@ export FRONTLINESMS_ADMIN_USER_HASH=$(echo -n "${FRONTLINESMS_ADMIN_USER}" | bas
 export FRONTLINESMS_ADMIN_PWD_HASH=$(echo -n "${FRONTLINESMS_ADMIN_PWD}" | base64)
 envsubst <${SOURCE_DIR}/srv/frontlinesms/data/app-settings.properties >/srv/frontlinesms/data/app-settings.properties
 chown -R 8018:8018 /srv/frontlinesms/data
-spotter-appmgr update-login frontlinesms "${FRONTLINESMS_ADMIN_USER}" "${FRONTLINESMS_ADMIN_PWD}"
+vm-appmgr update-login frontlinesms "${FRONTLINESMS_ADMIN_USER}" "${FRONTLINESMS_ADMIN_PWD}"
diff --git a/frontlinesms/etc/init.d/frontlinesms b/frontlinesms/etc/init.d/frontlinesms
index dfb314b..701042f 100755
--- a/frontlinesms/etc/init.d/frontlinesms
+++ b/frontlinesms/etc/init.d/frontlinesms
@@ -15,11 +15,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy frontlinesms
+	/usr/bin/vm-appmgr register-proxy frontlinesms
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy frontlinesms
+	/usr/bin/vm-appmgr unregister-proxy frontlinesms
 }
 
 stop() {
diff --git a/gnuhealth.sh b/gnuhealth.sh
index 57f94b0..c3ece90 100755
--- a/gnuhealth.sh
+++ b/gnuhealth.sh
@@ -27,7 +27,7 @@ export GNUHEALTH_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
 echo ${GNUHEALTH_ADMIN_PWD} >/tmp/.adminpwd
 docker run --rm -h gnuhealth --link postgres -v /srv/gnuhealth/conf:/srv/gnuhealth/gnuhealth/tryton/server/config -v /tmp/.adminpwd:/tmp/.adminpwd -e TRYTONPASSFILE=/tmp/.adminpwd gnuhealth /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.15/bin/trytond-admin -d gnuhealth --all -v
 rm -f /tmp/.adminpwd
-spotter-appmgr update-login gnuhealth "${GNUHEALTH_ADMIN_USER}" "${GNUHEALTH_ADMIN_PWD}"
+vm-appmgr update-login gnuhealth "${GNUHEALTH_ADMIN_USER}" "${GNUHEALTH_ADMIN_PWD}"
 
 # Populate demo database
 wget http://health.gnu.org/downloads/postgres_dumps/gnuhealth-32-demo.sql.gz -O /tmp/gnuhealth_demo.sql.gz
diff --git a/gnuhealth/etc/init.d/gnuhealth b/gnuhealth/etc/init.d/gnuhealth
index 3273215..d658081 100755
--- a/gnuhealth/etc/init.d/gnuhealth
+++ b/gnuhealth/etc/init.d/gnuhealth
@@ -17,11 +17,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy gnuhealth
+	/usr/bin/vm-appmgr register-proxy gnuhealth
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy gnuhealth
+	/usr/bin/vm-appmgr unregister-proxy gnuhealth
 }
 
 stop() {
diff --git a/kanboard.sh b/kanboard.sh
index ab70a95..ab7edf8 100755
--- a/kanboard.sh
+++ b/kanboard.sh
@@ -26,7 +26,7 @@ export KANBOARD_ADMIN_USER=admin
 export KANBOARD_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
 export KANBOARD_ADMIN_HASH=$(docker run --rm kanboard php -r "echo password_hash('${KANBOARD_ADMIN_PWD}', PASSWORD_BCRYPT);")
 envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i postgres psql kanboard
-spotter-appmgr update-login kanboard "${KANBOARD_ADMIN_USER}" "${KANBOARD_ADMIN_PWD}"
+vm-appmgr update-login kanboard "${KANBOARD_ADMIN_USER}" "${KANBOARD_ADMIN_PWD}"
 
 # Install cron job
 cp ${SOURCE_DIR}/etc/periodic/daily/kanboard /etc/periodic/daily/kanboard
diff --git a/kanboard/etc/init.d/kanboard b/kanboard/etc/init.d/kanboard
index 0d13268..af0aac5 100755
--- a/kanboard/etc/init.d/kanboard
+++ b/kanboard/etc/init.d/kanboard
@@ -18,11 +18,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy kanboard
+	/usr/bin/vm-appmgr register-proxy kanboard
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy kanboard
+	/usr/bin/vm-appmgr unregister-proxy kanboard
 }
 
 stop() {
diff --git a/mifosx.sh b/mifosx.sh
index cae39fb..f86ac70 100755
--- a/mifosx.sh
+++ b/mifosx.sh
@@ -42,7 +42,7 @@ export MIFOSX_ADMIN_EMAIL=admin@example.com
 export MIFOSX_ADMIN_PWD=$(head -c 12 /dev/urandom | base64 | tr -d "+")
 export MIFOSX_ADMIN_HASH=$(echo -n "${MIFOSX_ADMIN_PWD}{1}" | sha256sum | awk '{print $1}')
 envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i mariadb mysql mifostenant-default
-spotter-appmgr update-login mifosx "${MIFOSX_ADMIN_USER}" "${MIFOSX_ADMIN_PWD}"
+vm-appmgr update-login mifosx "${MIFOSX_ADMIN_USER}" "${MIFOSX_ADMIN_PWD}"
 
 # Stop services required for build
 service mariadb stop
diff --git a/mifosx/etc/init.d/mifosx b/mifosx/etc/init.d/mifosx
index 1a7252b..a75023d 100755
--- a/mifosx/etc/init.d/mifosx
+++ b/mifosx/etc/init.d/mifosx
@@ -18,11 +18,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy mifosx
+	/usr/bin/vm-appmgr register-proxy mifosx
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy mifosx
+	/usr/bin/vm-appmgr unregister-proxy mifosx
 }
 
 stop() {
diff --git a/motech.sh b/motech.sh
index 7b0932a..7087f5f 100755
--- a/motech.sh
+++ b/motech.sh
@@ -38,7 +38,7 @@ export MOTECH_ADMIN_EMAIL="admin@example.com"
 export MOTECH_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
 curl -H "Content-Type: application/json" -X POST -d "{\"adminLogin\":\"${MOTECH_ADMIN_USER}\",\"adminEmail\":\"${MOTECH_ADMIN_EMAIL}\",\"adminPassword\":\"${MOTECH_ADMIN_PWD}\",\"adminConfirmPassword\":\"${MOTECH_ADMIN_PWD}\",\"language\":\"cs\",\"providerName\":\"\",\"providerUrl\":\"\",\"schedulerUrl\":\"\"}" http://${MOTECH_IP}:8080/module/server/startup/
 service motech stop
-spotter-appmgr update-login motech "${MOTECH_ADMIN_USER}" "${MOTECH_ADMIN_PWD}"
+vm-appmgr update-login motech "${MOTECH_ADMIN_USER}" "${MOTECH_ADMIN_PWD}"
 
 # Stop services required for build
 service activemq stop
diff --git a/motech/etc/init.d/motech b/motech/etc/init.d/motech
index f75c102..ae0b52f 100755
--- a/motech/etc/init.d/motech
+++ b/motech/etc/init.d/motech
@@ -18,11 +18,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy motech
+	/usr/bin/vm-appmgr register-proxy motech
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy motech
+	/usr/bin/vm-appmgr unregister-proxy motech
 }
 
 stop() {
diff --git a/opendatakit-build/etc/init.d/opendatakit-build b/opendatakit-build/etc/init.d/opendatakit-build
index 478e92b..95aa0cb 100755
--- a/opendatakit-build/etc/init.d/opendatakit-build
+++ b/opendatakit-build/etc/init.d/opendatakit-build
@@ -17,11 +17,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy opendatakit-build
+	/usr/bin/vm-appmgr register-proxy opendatakit-build
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy opendatakit-build
+	/usr/bin/vm-appmgr unregister-proxy opendatakit-build
 }
 
 stop() {
diff --git a/opendatakit.sh b/opendatakit.sh
index 060f757..6551d07 100755
--- a/opendatakit.sh
+++ b/opendatakit.sh
@@ -39,7 +39,7 @@ export OPENDATAKIT_ADMIN_SALT=$(head -c 4 /dev/urandom | hexdump -e '"%x"') # Mu
 export OPENDATAKIT_ADMIN_BASIC_HASH=$(echo -n "${OPENDATAKIT_ADMIN_PWD}{${OPENDATAKIT_ADMIN_SALT}}" | sha1sum | tr -d " -")
 export OPENDATAKIT_ADMIN_DIGEST_HASH=$(echo -n "${OPENDATAKIT_ADMIN_USER}:${OPENDATAKIT_ADMIN_REALM}:${OPENDATAKIT_ADMIN_PWD}" | md5sum | tr -d " -")
 envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i postgres psql opendatakit
-spotter-appmgr update-login opendatakit "${OPENDATAKIT_ADMIN_USER}" "${OPENDATAKIT_ADMIN_PWD}"
+vm-appmgr update-login opendatakit "${OPENDATAKIT_ADMIN_USER}" "${OPENDATAKIT_ADMIN_PWD}"
 
 # Stop services required for build
 service postgres stop
diff --git a/opendatakit/etc/init.d/opendatakit b/opendatakit/etc/init.d/opendatakit
index 3f8bfbf..bf5d5b0 100755
--- a/opendatakit/etc/init.d/opendatakit
+++ b/opendatakit/etc/init.d/opendatakit
@@ -19,11 +19,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy opendatakit
+	/usr/bin/vm-appmgr register-proxy opendatakit
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy opendatakit
+	/usr/bin/vm-appmgr unregister-proxy opendatakit
 }
 
 stop() {
diff --git a/openmapkit.sh b/openmapkit.sh
index 542755e..c931c0a 100755
--- a/openmapkit.sh
+++ b/openmapkit.sh
@@ -15,4 +15,4 @@ mkdir -p /srv/openmapkit/conf /srv/openmapkit/data
 chown -R 8007:8007 /srv/openmapkit/data
 docker run --rm -v /srv/openmapkit/data:/mnt/data openmapkit cp -rp /srv/openmapkit/data/. /mnt/data
 envsubst <${SOURCE_DIR}/srv/openmapkit/conf/settings.js >/srv/openmapkit/conf/settings.js
-spotter-appmgr update-login openmapkit "${OPENMAPKIT_ADMIN_USER}" "${OPENMAPKIT_ADMIN_PWD}"
+vm-appmgr update-login openmapkit "${OPENMAPKIT_ADMIN_USER}" "${OPENMAPKIT_ADMIN_PWD}"
diff --git a/openmapkit/etc/init.d/openmapkit b/openmapkit/etc/init.d/openmapkit
index 9a07ca3..1d42c76 100755
--- a/openmapkit/etc/init.d/openmapkit
+++ b/openmapkit/etc/init.d/openmapkit
@@ -16,11 +16,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy openmapkit
+	/usr/bin/vm-appmgr register-proxy openmapkit
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy openmapkit
+	/usr/bin/vm-appmgr unregister-proxy openmapkit
 }
 
 stop() {
diff --git a/pandora.sh b/pandora.sh
index ddce635..f6522b9 100755
--- a/pandora.sh
+++ b/pandora.sh
@@ -55,7 +55,7 @@ export PANDORA_ADMIN_EMAIL=admin@example.com
 export PANDORA_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
 export PANDORA_ADMIN_HASH=$(docker run --rm -h pandora -e DJANGO_SETTINGS_MODULE=pandora.settings -v /srv/pandora/conf:/srv/pandora/conf pandora python3 -c "from django.contrib.auth.hashers import make_password; print(make_password('${PANDORA_ADMIN_PWD}'))")
 envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i postgres psql pandora
-spotter-appmgr update-login pandora "${PANDORA_ADMIN_USER}" "${PANDORA_ADMIN_PWD}"
+vm-appmgr update-login pandora "${PANDORA_ADMIN_USER}" "${PANDORA_ADMIN_PWD}"
 
 # Stop services required for build
 service rabbitmq stop
diff --git a/pandora/etc/init.d/pandora b/pandora/etc/init.d/pandora
index 51b7f8a..540a6f9 100755
--- a/pandora/etc/init.d/pandora
+++ b/pandora/etc/init.d/pandora
@@ -19,11 +19,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy pandora
+	/usr/bin/vm-appmgr register-proxy pandora
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy pandora
+	/usr/bin/vm-appmgr unregister-proxy pandora
 }
 
 stop() {
diff --git a/sahana-demo.sh b/sahana-demo.sh
index 945b1c5..9ee4d1b 100755
--- a/sahana-demo.sh
+++ b/sahana-demo.sh
@@ -30,7 +30,7 @@ export SAHANADEMO_ADMIN_USER=admin@example.com
 export SAHANADEMO_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
 envsubst <${SOURCE_DIR}/srv/sahana-demo/conf/000_config.py >/srv/sahana-demo/conf/000_config.py
 envsubst <${SOURCE_DIR}/masterUsers.csv >/tmp/masterUsers.csv
-spotter-appmgr update-login sahana-demo "${SAHANADEMO_ADMIN_USER}" "${SAHANADEMO_ADMIN_PWD}"
+vm-appmgr update-login sahana-demo "${SAHANADEMO_ADMIN_USER}" "${SAHANADEMO_ADMIN_PWD}"
 
 # Populate database
 docker run --rm -h sahana-demo --link postgres -v /srv/sahana-demo/conf:/srv/web2py/applications/eden/models -v /srv/sahana-demo/data/${TEMPLATE}:/srv/web2py/applications/eden/modules/templates/${TEMPLATE} -v /srv/sahana-demo/data/databases:/srv/web2py/applications/eden/databases -v /tmp/masterUsers.csv:/srv/web2py/applications/eden/modules/templates/default/users/masterUsers.csv sahana su - sahana -c "./web2py.py -S eden -M -R applications/eden/static/scripts/tools/noop.py"
diff --git a/sahana-demo/etc/init.d/sahana-demo b/sahana-demo/etc/init.d/sahana-demo
index e2a658d..412661b 100755
--- a/sahana-demo/etc/init.d/sahana-demo
+++ b/sahana-demo/etc/init.d/sahana-demo
@@ -20,11 +20,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy sahana-demo
+	/usr/bin/vm-appmgr register-proxy sahana-demo
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy sahana-demo
+	/usr/bin/vm-appmgr unregister-proxy sahana-demo
 }
 
 stop() {
diff --git a/sahana.sh b/sahana.sh
index e579648..1047434 100755
--- a/sahana.sh
+++ b/sahana.sh
@@ -33,7 +33,7 @@ export SAHANA_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
 envsubst <${SOURCE_DIR}/srv/sahana/conf/000_config.py >/srv/sahana/conf/000_config.py
 envsubst <${SOURCE_DIR}/srv/sahana/data/Spotter/masterUsers.csv >/srv/sahana/data/Spotter/masterUsers.csv
 cp ${SOURCE_DIR}/srv/sahana/conf/00_settings.py /srv/sahana/conf/00_settings.py
-spotter-appmgr update-login sahana "${SAHANA_ADMIN_USER}" "${SAHANA_ADMIN_PWD}"
+vm-appmgr update-login sahana "${SAHANA_ADMIN_USER}" "${SAHANA_ADMIN_PWD}"
 
 # Populate database
 docker run --rm -h sahana --link postgres -v /srv/sahana/conf:/srv/web2py/applications/eden/models -v /srv/sahana/data/Spotter:/srv/web2py/applications/eden/modules/templates/Spotter -v /srv/sahana/data/databases:/srv/web2py/applications/eden/databases sahana su - sahana -c "./web2py.py -S eden -M -R applications/eden/static/scripts/tools/noop.py"
diff --git a/sahana/etc/init.d/sahana b/sahana/etc/init.d/sahana
index e1a082a..aec3a2f 100755
--- a/sahana/etc/init.d/sahana
+++ b/sahana/etc/init.d/sahana
@@ -20,11 +20,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy sahana
+	/usr/bin/vm-appmgr register-proxy sahana
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy sahana
+	/usr/bin/vm-appmgr unregister-proxy sahana
 }
 
 stop() {
diff --git a/sambro.sh b/sambro.sh
index a95adc8..ad36595 100755
--- a/sambro.sh
+++ b/sambro.sh
@@ -31,7 +31,7 @@ envsubst <${SOURCE_DIR}/srv/sambro/conf/000_config.py >/srv/sambro/conf/000_conf
 envsubst <${SOURCE_DIR}/masterUsers.csv >/tmp/masterUsers.csv
 cp ${SOURCE_DIR}/srv/sambro/conf/00_settings.py /srv/sambro/conf/00_settings.py
 cp ${SOURCE_DIR}/srv/sambro/data/SAMBRO/config.py /srv/sambro/data/SAMBRO/config.py
-spotter-appmgr update-login sambro "${SAMBRO_ADMIN_USER}" "${SAMBRO_ADMIN_PWD}"
+vm-appmgr update-login sambro "${SAMBRO_ADMIN_USER}" "${SAMBRO_ADMIN_PWD}"
 
 # Populate database
 docker run --rm -h sambro --link postgres -v /srv/sambro/conf:/srv/web2py/applications/eden/models -v /srv/sambro/data/SAMBRO:/srv/web2py/applications/eden/modules/templates/SAMBRO -v /tmp/masterUsers.csv:/srv/web2py/applications/eden/modules/templates/default/users/masterUsers.csv -v /srv/sambro/data/databases:/srv/web2py/applications/eden/databases sahana su - sahana -c "./web2py.py -S eden -M -R applications/eden/static/scripts/tools/noop.py"
diff --git a/sambro/etc/init.d/sambro b/sambro/etc/init.d/sambro
index 8dde8f3..ae97922 100755
--- a/sambro/etc/init.d/sambro
+++ b/sambro/etc/init.d/sambro
@@ -20,11 +20,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy sambro
+	/usr/bin/vm-appmgr register-proxy sambro
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy sambro
+	/usr/bin/vm-appmgr unregister-proxy sambro
 }
 
 stop() {
diff --git a/seeddms.sh b/seeddms.sh
index c6525d7..3ec1775 100755
--- a/seeddms.sh
+++ b/seeddms.sh
@@ -32,7 +32,7 @@ export SEEDDMS_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
 export SEEDDMS_ADMIN_EMAIL=admin@example.com
 envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i postgres psql seeddms
 chown -R 8010:8010 /srv/seeddms/conf
-spotter-appmgr update-login seeddms "${SEEDDMS_ADMIN_USER}" "${SEEDDMS_ADMIN_PWD}"
+vm-appmgr update-login seeddms "${SEEDDMS_ADMIN_USER}" "${SEEDDMS_ADMIN_PWD}"
 
 # Install cron job
 cp ${SOURCE_DIR}/etc/periodic/hourly/seeddms /etc/periodic/hourly/seeddms
diff --git a/seeddms/etc/init.d/seeddms b/seeddms/etc/init.d/seeddms
index 495b2b3..8105a02 100755
--- a/seeddms/etc/init.d/seeddms
+++ b/seeddms/etc/init.d/seeddms
@@ -18,11 +18,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy seeddms
+	/usr/bin/vm-appmgr register-proxy seeddms
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy seeddms
+	/usr/bin/vm-appmgr unregister-proxy seeddms
 }
 
 stop() {
diff --git a/sigmah.sh b/sigmah.sh
index 6e02069..cb0450c 100755
--- a/sigmah.sh
+++ b/sigmah.sh
@@ -44,7 +44,7 @@ sed -i "s|\$2a\$10\$pMcTA1p9fefR8U9NoOPei.H0eq/TbbdSF27M0tn9iDWBrA4JHeCDC|${SIGM
 cat /tmp/sigmah-MinimumDataKit.sql | docker exec -i -e PGPASSWORD=${SIGMAH_PWD} postgres psql -U sigmah sigmah
 cat /tmp/sigmah-newOrganizationLaunchScript.sql | docker exec -i -e PGPASSWORD=${SIGMAH_PWD} postgres psql -U sigmah sigmah
 rm -f /tmp/sigmah-MinimumDataKit.sql /tmp/sigmah-newOrganizationLaunchScript.sql
-spotter-appmgr update-login sigmah "${SIGMAH_ADMIN_EMAIL}" "${SIGMAH_ADMIN_PWD}"
+vm-appmgr update-login sigmah "${SIGMAH_ADMIN_EMAIL}" "${SIGMAH_ADMIN_PWD}"
 
 # Stop services required for build
 service postgres stop
diff --git a/sigmah/etc/init.d/sigmah b/sigmah/etc/init.d/sigmah
index d87d9de..4420642 100755
--- a/sigmah/etc/init.d/sigmah
+++ b/sigmah/etc/init.d/sigmah
@@ -19,11 +19,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy sigmah
+	/usr/bin/vm-appmgr register-proxy sigmah
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy sigmah
+	/usr/bin/vm-appmgr unregister-proxy sigmah
 }
 
 stop() {
diff --git a/ushahidi.sh b/ushahidi.sh
index 5217b07..214967e 100755
--- a/ushahidi.sh
+++ b/ushahidi.sh
@@ -31,7 +31,7 @@ export USHAHIDI_ADMIN_USER=admin@example.com
 export USHAHIDI_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
 export USHAHIDI_ADMIN_HASH=$(docker run --rm ushahidi php -r "echo password_hash('${USHAHIDI_ADMIN_PWD}', PASSWORD_BCRYPT);")
 envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i mariadb mysql ushahidi
-spotter-appmgr update-login ushahidi "${USHAHIDI_ADMIN_USER}" "${USHAHIDI_ADMIN_PWD}"
+vm-appmgr update-login ushahidi "${USHAHIDI_ADMIN_USER}" "${USHAHIDI_ADMIN_PWD}"
 
 # Install cron job
 cp ${SOURCE_DIR}/etc/periodic/15min/ushahidi /etc/periodic/15min/ushahidi
diff --git a/ushahidi/etc/init.d/ushahidi b/ushahidi/etc/init.d/ushahidi
index 6ddfaee..1a1b29e 100755
--- a/ushahidi/etc/init.d/ushahidi
+++ b/ushahidi/etc/init.d/ushahidi
@@ -19,11 +19,11 @@ start() {
 }
 
 start_post() {
-	/usr/bin/spotter-appmgr register-proxy ushahidi
+	/usr/bin/vm-appmgr register-proxy ushahidi
 }
 
 stop_pre() {
-	/usr/bin/spotter-appmgr unregister-proxy ushahidi
+	/usr/bin/vm-appmgr unregister-proxy ushahidi
 }
 
 stop() {
diff --git a/zz-extra/spotter-ping.php b/zz-extra/vm-ping.php
similarity index 82%
rename from zz-extra/spotter-ping.php
rename to zz-extra/vm-ping.php
index 3303240..66ee879 100644
--- a/zz-extra/spotter-ping.php
+++ b/zz-extra/vm-ping.php
@@ -7,13 +7,13 @@ if (empty($url)) {
 if(substr($url, -1) == '/') {
     $url = substr($url, 0, -1);
 }
-$url .= '/spotter-ping';
+$url .= '/vm-ping';
 
 $ch = curl_init($url);
 curl_setopt_array($ch, [CURLOPT_RETURNTRANSFER => TRUE, CURLOPT_HEADER => FALSE, CURLOPT_SSL_VERIFYHOST => FALSE, CURLOPT_SSL_VERIFYPEER => FALSE, CURLOPT_TIMEOUT => 4]);
 $content = curl_exec($ch);
 curl_close($ch);
 
-if ($content == 'spotter-pong') {
-    echo 'spotter-pong';
+if ($content == 'vm-pong') {
+    echo 'vm-pong';
 }