diff --git a/planetstack/hpc_wizard/bigquery_config.py b/planetstack/hpc_wizard/bigquery_config.py
index ffe3e7f..345acf2 100644
--- a/planetstack/hpc_wizard/bigquery_config.py
+++ b/planetstack/hpc_wizard/bigquery_config.py
@@ -1,3 +1,3 @@
-BIGQUERY_DIR = "/opt/planetstack"
+BIGQUERY_DIR = "/opt/xos"
 BIGQUERY_SECRETS_FN = os.path.join(BIGQUERY_DIR, "hpc_wizard/client_secrets.json")
 BIGQUERY_CREDENTIALS_FN = os.path.join(BIGQUERY_DIR, "hpc_wizard/bigquery_credentials.dat")
diff --git a/planetstack/hpc_wizard/planetstack_analytics.py b/planetstack/hpc_wizard/planetstack_analytics.py
index 2cbb7e7..06a083b 100644
--- a/planetstack/hpc_wizard/planetstack_analytics.py
+++ b/planetstack/hpc_wizard/planetstack_analytics.py
@@ -9,7 +9,7 @@
 import urllib2
 
 # XXX hardcoded path
-sys.path.append("/opt/planetstack")
+sys.path.append("/opt/xos")
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
 from django.conf import settings
diff --git a/planetstack/openstack_observer/ansible.py b/planetstack/openstack_observer/ansible.py
index b8cd311..1cee3d9 100644
--- a/planetstack/openstack_observer/ansible.py
+++ b/planetstack/openstack_observer/ansible.py
@@ -10,7 +10,7 @@
 
 # XXX hardcoded path
 #    is there any reason why we aren't importing planetstack.config ?
-XOS_DIR="/opt/planetstack"
+XOS_DIR="/opt/xos"
 
 try:
     step_dir = Config().observer_steps_dir
diff --git a/planetstack/planetstack/config.py b/planetstack/planetstack/config.py
index 0654fe6..cb2e33f 100644
--- a/planetstack/planetstack/config.py
+++ b/planetstack/planetstack/config.py
@@ -12,7 +12,7 @@
 """
 """
 
-XOS_DIR = "/opt/planetstack"
+XOS_DIR = "/opt/xos"
 DEFAULT_CONFIG_FN = os.path.join(XOS_DIR, "xos_config")
 
 # warning for now, remove once we're sure everyone has made the change
diff --git a/planetstack/scripts/opencloud b/planetstack/scripts/opencloud
index 64e25da..041e419 100644
--- a/planetstack/scripts/opencloud
+++ b/planetstack/scripts/opencloud
@@ -5,8 +5,8 @@
     exit
 fi
 
-XOS_DIR=/opt/planetstack
-BACKUP_DIR=/opt/planetstack_backups
+XOS_DIR=/opt/xos
+BACKUP_DIR=/opt/xos_backups
 DBNAME=planetstack
 
 DJANGO_17=`python -c "import django; from distutils.version import StrictVersion; print int(StrictVersion(django.get_version()) >= StrictVersion('1.7'))"`
diff --git a/planetstack/xos_config b/planetstack/xos_config
index 0075218..86864cc 100644
--- a/planetstack/xos_config
+++ b/planetstack/xos_config
@@ -19,7 +19,7 @@
 omf_enabled=0
 mail_support_address=support@localhost
 nova_enabled=True
-logfile=/var/log/planetstack.log
+logfile=/var/log/xos.log
 
 [nova]
 admin_user=admin@domain.com