diff --git a/planetstack/core/dashboard/views/view_common.py b/planetstack/core/dashboard/views/view_common.py
index deb8210..7d59278 100644
--- a/planetstack/core/dashboard/views/view_common.py
+++ b/planetstack/core/dashboard/views/view_common.py
@@ -18,7 +18,7 @@
 from operator import itemgetter, attrgetter
 import traceback
 import math
-from planetstack.config import Config, XOS_DIR
+from xos.config import Config, XOS_DIR
 
 def getDashboardContext(user, context={}, tableFormat = False):
         context = {}
diff --git a/planetstack/core/middleware.py b/planetstack/core/middleware.py
index 54267e3..4cfd991 100644
--- a/planetstack/core/middleware.py
+++ b/planetstack/core/middleware.py
@@ -4,7 +4,7 @@
 
 def get_request():
     if not hasattr(_active, "request"):
-        raise Exception("Please add 'core.middleware.GlobalRequestMiddleware' to <XOS_DIR>/planetstack/settings.py:MIDDLEWARE_CLASSES")
+        raise Exception("Please add 'core.middleware.GlobalRequestMiddleware' to <XOS_DIR>/xos.settings.py:MIDDLEWARE_CLASSES")
     return _active.request
 
 class GlobalRequestMiddleware(object):
diff --git a/planetstack/core/models/site.py b/planetstack/core/models/site.py
index 2a41352..d1f04dd 100644
--- a/planetstack/core/models/site.py
+++ b/planetstack/core/models/site.py
@@ -6,7 +6,7 @@
 from django.contrib.contenttypes import generic
 from geoposition.fields import GeopositionField
 from core.acl import AccessControlList
-from planetstack.config import Config
+from xos.config import Config
 
 config = Config()
 
diff --git a/planetstack/core/models/sliver.py b/planetstack/core/models/sliver.py
index 62e487b..0173887 100644
--- a/planetstack/core/models/sliver.py
+++ b/planetstack/core/models/sliver.py
@@ -13,7 +13,7 @@
 from core.models import Tag
 from core.models import Flavor
 from django.contrib.contenttypes import generic
-from planetstack.config import Config
+from xos.config import Config
 from monitor import driver as monitor
 
 config = Config()
diff --git a/planetstack/core/views/legacyapi.py b/planetstack/core/views/legacyapi.py
index 978fd21..520f137 100644
--- a/planetstack/core/views/legacyapi.py
+++ b/planetstack/core/views/legacyapi.py
@@ -298,6 +298,6 @@
         configs={}
         configs[slicename] = GetConfiguration({"name": "princeton_vcoblitz"})
 
-        file("planetstack_config","w").write(json.dumps(configs))
+        file("xos.config","w").write(json.dumps(configs))
         file("planetstack_slices","w").write(json.dumps(slices))
         file("planetstack_nodes","w").write(json.dumps(nodes))
diff --git a/planetstack/core/xoslib/tools/make_defaults.py b/planetstack/core/xoslib/tools/make_defaults.py
index 04fccc0..e008845 100644
--- a/planetstack/core/xoslib/tools/make_defaults.py
+++ b/planetstack/core/xoslib/tools/make_defaults.py
@@ -3,7 +3,7 @@
 XOS_DIR="/opt/xos"
 os.chdir(XOS_DIR)
 sys.path.append(XOS_DIR)
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xos.settings")
 import django
 import core.models
 from django.db import models
diff --git a/planetstack/core/xoslib/tools/make_validators.py b/planetstack/core/xoslib/tools/make_validators.py
index f627457..44ef43a 100644
--- a/planetstack/core/xoslib/tools/make_validators.py
+++ b/planetstack/core/xoslib/tools/make_validators.py
@@ -3,7 +3,7 @@
 XOS_DIR="/opt/xos"
 os.chdir(XOS_DIR)
 sys.path.append(XOS_DIR)
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xos.settings")
 import django
 import core.models
 from django.db import models