diff --git a/.testr.conf b/.testr.conf
index 35d9ba4..ccafd7c 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -2,6 +2,6 @@
 test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
              OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
+             ${PYTHON:-python} -m subunit.run discover -t ./ ./oslo_context $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/oslo/__init__.py b/oslo/__init__.py
deleted file mode 100644
index dc130d6..0000000
--- a/oslo/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-__import__('pkg_resources').declare_namespace(__name__)
diff --git a/oslo/context/__init__.py b/oslo_context/__init__.py
similarity index 100%
rename from oslo/context/__init__.py
rename to oslo_context/__init__.py
diff --git a/oslo/context/context.py b/oslo_context/context.py
similarity index 100%
rename from oslo/context/context.py
rename to oslo_context/context.py
diff --git a/tests/__init__.py b/oslo_context/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to oslo_context/tests/__init__.py
diff --git a/tests/test_context.py b/oslo_context/tests/test_context.py
similarity index 98%
rename from tests/test_context.py
rename to oslo_context/tests/test_context.py
index 823e52d..05c717d 100644
--- a/tests/test_context.py
+++ b/oslo_context/tests/test_context.py
@@ -15,7 +15,7 @@
 
 from oslotest import base as test_base
 
-from oslo.context import context
+from oslo_context import context
 
 
 class ContextTest(test_base.BaseTestCase):
diff --git a/setup.cfg b/setup.cfg
index 7b95bc3..855a439 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,10 +22,7 @@ classifier =
 
 [files]
 packages =
-    oslo
-    oslo.context
-namespace_packages =
-    oslo
+    oslo_context
 
 [pbr]
 warnerrors = true
@@ -39,18 +36,18 @@ all_files = 1
 upload-dir = doc/build/html
 
 [compile_catalog]
-directory = oslo.context/locale
-domain = oslo.context
+directory = oslo_context/locale
+domain = oslo_context
 
 [update_catalog]
-domain = oslo.context
-output_dir = oslo.context/locale
-input_file = oslo.context/locale/oslo.context.pot
+domain = oslo_context
+output_dir = oslo_context/locale
+input_file = oslo_context/locale/oslo_context.pot
 
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = oslo.context/locale/oslo.context.pot
+output_file = oslo_context/locale/oslo_context.pot
 
 [wheel]
 universal = true