diff --git a/openstack-common.conf b/openstack-common.conf
index 6724e71d..ced29552 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -19,4 +19,4 @@ module=uuidutils
 module=xmlutils
 
 # The base module to hold the copy of openstack.common
-base=savanna
+base=sahara
diff --git a/sahara/main.py b/sahara/main.py
index 29b02551..c25b23c7 100644
--- a/sahara/main.py
+++ b/sahara/main.py
@@ -159,7 +159,7 @@ def _get_infrastructure_engine():
              CONF.infrastructure_engine)
 
     extension_manager = stevedore.DriverManager(
-        namespace='savanna.infrastructure.engine',
+        namespace='sahara.infrastructure.engine',
         name=CONF.infrastructure_engine,
         invoke_on_load=True
     )
@@ -171,7 +171,7 @@ def _get_remote_driver():
     LOG.info("Loading '%s' remote" % CONF.remote)
 
     extension_manager = stevedore.DriverManager(
-        namespace='savanna.remote',
+        namespace='sahara.remote',
         name=CONF.remote,
         invoke_on_load=True
     )
diff --git a/sahara/plugins/base.py b/sahara/plugins/base.py
index 3d0b3c14..bcbda170 100644
--- a/sahara/plugins/base.py
+++ b/sahara/plugins/base.py
@@ -90,7 +90,7 @@ class PluginManager(object):
         config_plugins = CONF.plugins
         extension_manager = enabled.EnabledExtensionManager(
             check_func=lambda ext: ext.name in config_plugins,
-            namespace='savanna.cluster.plugins',
+            namespace='sahara.cluster.plugins',
             invoke_on_load=True
         )
 
diff --git a/setup.cfg b/setup.cfg
index a417f028..3dd39298 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,17 +33,16 @@ console_scripts =
     sahara-db-manage = sahara.db.migration.cli:main
     _sahara-subprocess = sahara.cli.sahara_subprocess:main
 
-savanna.cluster.plugins =
+sahara.cluster.plugins =
     vanilla = sahara.plugins.vanilla.plugin:VanillaProvider
     hdp = sahara.plugins.hdp.ambariplugin:AmbariPlugin
     idh = sahara.plugins.intel.plugin:IDHProvider
 
-savanna.infrastructure.engine =
-    savanna = sahara.service.direct_engine:DirectEngine
+sahara.infrastructure.engine =
     direct = sahara.service.direct_engine:DirectEngine
     heat = sahara.service.heat_engine:HeatEngine
 
-savanna.remote =
+sahara.remote =
     ssh = sahara.utils.ssh_remote:SshRemoteDriver
     agent = sahara.utils.agent_remote:AgentRemoteDriver