diff --git a/.coveragerc b/.coveragerc
index 07a5303..734c8a7 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,7 +1,7 @@
 [run]
 branch = True
-source = savanna
-omit = savanna/tests/*,savanna/openstack/*
+source = sahara
+omit = sahara/tests/*,sahara/openstack/*
 
 [report]
-ignore-errors = True
\ No newline at end of file
+ignore-errors = True
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 79e3b8c..f8ecbd7 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -14,4 +14,4 @@ Pull requests submitted through GitHub will be ignored.
 
 Bugs should be filed on Launchpad, not GitHub:
 
-   https://bugs.launchpad.net/savanna-guestagent
\ No newline at end of file
+   https://bugs.launchpad.net/sahara-guestagent
diff --git a/HACKING.rst b/HACKING.rst
index 572b607..1278b5e 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -1,4 +1,4 @@
-savanna-guestagent Style Commandments
+sahara-guestagent Style Commandments
 ===============================================
 
-Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
\ No newline at end of file
+Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
diff --git a/README.rst b/README.rst
index 2aefa35..4e358ea 100644
--- a/README.rst
+++ b/README.rst
@@ -1,13 +1,13 @@
 ===============================
-savanna-guestagent
+sahara-guestagent
 ===============================
 
 OpenStack Boilerplate contains all the boilerplate you need to create an OpenStack package.
 
 * Free software: Apache license
-* Documentation: http://docs.openstack.org/developer/savanna-guestagent
+* Documentation: http://docs.openstack.org/developer/sahara-guestagent
 
 Features
 --------
 
-* TODO
\ No newline at end of file
+* TODO
diff --git a/doc/source/conf.py b/doc/source/conf.py
index cb6322d..b0a49c4 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -37,7 +37,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'savanna-guestagent'
+project = u'sahara-guestagent'
 copyright = u'2013, OpenStack Foundation'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 036a6e9..e28400f 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,9 +1,9 @@
-.. savanna-guestagent documentation master file, created by
+.. sahara-guestagent documentation master file, created by
    sphinx-quickstart on Tue Jul  9 22:26:36 2013.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to savanna-guestagent's documentation!
+Welcome to sahara-guestagent's documentation!
 ========================================================
 
 Contents:
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index 4f36543..0c08364 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -4,9 +4,9 @@ Installation
 
 At the command line::
 
-    $ pip install savanna-guestagent
+    $ pip install sahara-guestagent
 
 Or, if you have virtualenvwrapper installed::
 
-    $ mkvirtualenv savanna-guestagent
-    $ pip install savanna-guestagent
\ No newline at end of file
+    $ mkvirtualenv sahara-guestagent
+    $ pip install sahara-guestagent
diff --git a/doc/source/usage.rst b/doc/source/usage.rst
index f4a1751..3b33043 100644
--- a/doc/source/usage.rst
+++ b/doc/source/usage.rst
@@ -2,6 +2,6 @@
 Usage
 ========
 
-To use savanna-guestagent in a project::
+To use sahara-guestagent in a project::
 
-	import savanna
\ No newline at end of file
+	import sahara
diff --git a/openstack-common.conf b/openstack-common.conf
index 2a7d5d9..4670595 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -4,4 +4,4 @@
 module=log
 
 # The base module to hold the copy of openstack.common
-base=savanna.guestagent
+base=sahara.guestagent
diff --git a/savanna/__init__.py b/sahara/__init__.py
similarity index 100%
rename from savanna/__init__.py
rename to sahara/__init__.py
diff --git a/savanna/exceptions.py b/sahara/exceptions.py
similarity index 92%
rename from savanna/exceptions.py
rename to sahara/exceptions.py
index 26df804..3dbcd60 100644
--- a/savanna/exceptions.py
+++ b/sahara/exceptions.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-class SavannaException(Exception):
+class SaharaException(Exception):
     """Base Exception for the project
 
     To correctly use this class, inherit from it and define
@@ -27,11 +27,11 @@ class SavannaException(Exception):
         return self.message
 
     def __init__(self):
-        super(SavannaException, self).__init__(
+        super(SaharaException, self).__init__(
             '%s: %s' % (self.code, self.message))
 
 
-class RemoteCommandException(SavannaException):
+class RemoteCommandException(SaharaException):
     message = "Error during command execution: \"%s\""
 
     def __init__(self, cmd, ret_code=None, stdout=None,
diff --git a/savanna/guestagent/__init__.py b/sahara/guestagent/__init__.py
similarity index 93%
rename from savanna/guestagent/__init__.py
rename to sahara/guestagent/__init__.py
index b19f0f4..10710ac 100644
--- a/savanna/guestagent/__init__.py
+++ b/sahara/guestagent/__init__.py
@@ -16,4 +16,4 @@ import pbr.version
 
 
 __version__ = pbr.version.VersionInfo(
-    'savanna-guestagent').version_string()
+    'sahara-guestagent').version_string()
diff --git a/savanna/guestagent/agent.py b/sahara/guestagent/agent.py
similarity index 94%
rename from savanna/guestagent/agent.py
rename to sahara/guestagent/agent.py
index 0757782..7750130 100644
--- a/savanna/guestagent/agent.py
+++ b/sahara/guestagent/agent.py
@@ -28,9 +28,9 @@ import tempfile
 from oslo.config import cfg
 from oslo import messaging
 
-from savanna import exceptions as ex
-from savanna import guestagent
-from savanna.guestagent.openstack.common import log
+from sahara import exceptions as ex
+from sahara import guestagent
+from sahara.guestagent.openstack.common import log
 
 
 agent_ops = [
@@ -176,17 +176,17 @@ class AgentEndpoint(object):
 
 
 def main():
-    CONF(sys.argv[1:], project='savanna-guestagent',
+    CONF(sys.argv[1:], project='sahara-guestagent',
          version=guestagent.__version__)
 
     log.setup('guestagent')
 
     transport = messaging.get_transport(cfg.CONF)
 
-    LOG.info('Listening as server_id "%s" on topic "savanna-topic"' %
+    LOG.info('Listening as server_id "%s" on topic "sahara-agent-topic"' %
              CONF.server_id)
 
-    target = messaging.Target(topic='savanna-topic', version='1.0',
+    target = messaging.Target(topic='sahara-agent-topic', version='1.0',
                               server=CONF.server_id)
     server = messaging.get_rpc_server(transport, target,
                                       endpoints=[AgentEndpoint()],
diff --git a/savanna/guestagent/openstack/__init__.py b/sahara/guestagent/openstack/__init__.py
similarity index 100%
rename from savanna/guestagent/openstack/__init__.py
rename to sahara/guestagent/openstack/__init__.py
diff --git a/savanna/guestagent/openstack/common/__init__.py b/sahara/guestagent/openstack/common/__init__.py
similarity index 100%
rename from savanna/guestagent/openstack/common/__init__.py
rename to sahara/guestagent/openstack/common/__init__.py
diff --git a/savanna/guestagent/openstack/common/gettextutils.py b/sahara/guestagent/openstack/common/gettextutils.py
similarity index 97%
rename from savanna/guestagent/openstack/common/gettextutils.py
rename to sahara/guestagent/openstack/common/gettextutils.py
index 8f50be1..c1e09dd 100644
--- a/savanna/guestagent/openstack/common/gettextutils.py
+++ b/sahara/guestagent/openstack/common/gettextutils.py
@@ -19,7 +19,7 @@ gettext for openstack-common modules.
 
 Usual usage in an openstack.common module:
 
-    from savanna.guestagent.openstack.common.gettextutils import _
+    from sahara.guestagent.openstack.common.gettextutils import _
 """
 
 import copy
@@ -33,15 +33,15 @@ import re
 from babel import localedata
 import six
 
-_localedir = os.environ.get('savanna.guestagent'.upper() + '_LOCALEDIR')
-_t = gettext.translation('savanna.guestagent', localedir=_localedir, fallback=True)
+_localedir = os.environ.get('sahara.guestagent'.upper() + '_LOCALEDIR')
+_t = gettext.translation('sahara.guestagent', localedir=_localedir, fallback=True)
 
 # We use separate translation catalogs for each log level, so set up a
 # mapping between the log level name and the translator. The domain
 # for the log level is project_name + "-log-" + log_level so messages
 # for each level end up in their own catalog.
 _t_log_levels = dict(
-    (level, gettext.translation('savanna.guestagent' + '-log-' + level,
+    (level, gettext.translation('sahara.guestagent' + '-log-' + level,
                                 localedir=_localedir,
                                 fallback=True))
     for level in ['info', 'warning', 'error', 'critical']
@@ -65,7 +65,7 @@ def enable_lazy():
 
 def _(msg):
     if USE_LAZY:
-        return Message(msg, domain='savanna.guestagent')
+        return Message(msg, domain='sahara.guestagent')
     else:
         if six.PY3:
             return _t.gettext(msg)
@@ -76,7 +76,7 @@ def _log_translation(msg, level):
     """Build a single translation of a log message
     """
     if USE_LAZY:
-        return Message(msg, domain='savanna.guestagent' + '-log-' + level)
+        return Message(msg, domain='sahara.guestagent' + '-log-' + level)
     else:
         translator = _t_log_levels[level]
         if six.PY3:
@@ -153,7 +153,7 @@ class Message(six.text_type):
     """
 
     def __new__(cls, msgid, msgtext=None, params=None,
-                domain='savanna.guestagent', *args):
+                domain='sahara.guestagent', *args):
         """Create a new Message object.
 
         In order for translation to work gettext requires a message ID, this
diff --git a/savanna/guestagent/openstack/common/importutils.py b/sahara/guestagent/openstack/common/importutils.py
similarity index 97%
rename from savanna/guestagent/openstack/common/importutils.py
rename to sahara/guestagent/openstack/common/importutils.py
index 2c827ae..3598b8b 100644
--- a/savanna/guestagent/openstack/common/importutils.py
+++ b/sahara/guestagent/openstack/common/importutils.py
@@ -59,7 +59,7 @@ def import_module(import_str):
 
 
 def import_versioned_module(version, submodule=None):
-    module = 'savanna.guestagent.v%s' % version
+    module = 'sahara.guestagent.v%s' % version
     if submodule:
         module = '.'.join((module, submodule))
     return import_module(module)
diff --git a/savanna/guestagent/openstack/common/jsonutils.py b/sahara/guestagent/openstack/common/jsonutils.py
similarity index 97%
rename from savanna/guestagent/openstack/common/jsonutils.py
rename to sahara/guestagent/openstack/common/jsonutils.py
index f7dd153..ce1cda7 100644
--- a/savanna/guestagent/openstack/common/jsonutils.py
+++ b/sahara/guestagent/openstack/common/jsonutils.py
@@ -48,9 +48,9 @@ except ImportError:
 
 import six
 
-from savanna.guestagent.openstack.common import gettextutils
-from savanna.guestagent.openstack.common import importutils
-from savanna.guestagent.openstack.common import timeutils
+from sahara.guestagent.openstack.common import gettextutils
+from sahara.guestagent.openstack.common import importutils
+from sahara.guestagent.openstack.common import timeutils
 
 netaddr = importutils.try_import("netaddr")
 
diff --git a/savanna/guestagent/openstack/common/local.py b/sahara/guestagent/openstack/common/local.py
similarity index 100%
rename from savanna/guestagent/openstack/common/local.py
rename to sahara/guestagent/openstack/common/local.py
diff --git a/savanna/guestagent/openstack/common/log.py b/sahara/guestagent/openstack/common/log.py
similarity index 98%
rename from savanna/guestagent/openstack/common/log.py
rename to sahara/guestagent/openstack/common/log.py
index 2c3badc..02bc664 100644
--- a/savanna/guestagent/openstack/common/log.py
+++ b/sahara/guestagent/openstack/common/log.py
@@ -41,10 +41,10 @@ from oslo.config import cfg
 import six
 from six import moves
 
-from savanna.guestagent.openstack.common.gettextutils import _
-from savanna.guestagent.openstack.common import importutils
-from savanna.guestagent.openstack.common import jsonutils
-from savanna.guestagent.openstack.common import local
+from sahara.guestagent.openstack.common.gettextutils import _
+from sahara.guestagent.openstack.common import importutils
+from sahara.guestagent.openstack.common import jsonutils
+from sahara.guestagent.openstack.common import local
 
 
 _DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
@@ -537,7 +537,7 @@ def _setup_logging_from_conf(project, version):
 
     if CONF.publish_errors:
         handler = importutils.import_object(
-            "savanna.guestagent.openstack.common.log_handler.PublishErrorsHandler",
+            "sahara.guestagent.openstack.common.log_handler.PublishErrorsHandler",
             logging.ERROR)
         log_root.addHandler(handler)
 
diff --git a/savanna/guestagent/openstack/common/timeutils.py b/sahara/guestagent/openstack/common/timeutils.py
similarity index 100%
rename from savanna/guestagent/openstack/common/timeutils.py
rename to sahara/guestagent/openstack/common/timeutils.py
diff --git a/savanna/tests/__init__.py b/sahara/tests/__init__.py
similarity index 100%
rename from savanna/tests/__init__.py
rename to sahara/tests/__init__.py
diff --git a/savanna/tests/base.py b/sahara/tests/base.py
similarity index 100%
rename from savanna/tests/base.py
rename to sahara/tests/base.py
diff --git a/setup.cfg b/setup.cfg
index 99d75ef..9f11905 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,12 +1,12 @@
 [metadata]
-name = savanna-guestagent
+name = sahara-guestagent
 version=0.1
-summary = Savanna guest agent is an RPC agent for Savanna project.
+summary = Sahara guest agent is an RPC agent for Sahara project.
 description-file =
     README.rst
 author = OpenStack
 author-email = openstack-dev@lists.openstack.org
-home-page = http://savanna.readthedocs.org
+home-page = http://docs.openstack.org/developer/sahara
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -22,7 +22,7 @@ classifier =
 
 [files]
 packages =
-    savanna
+    sahara
 
 [build_sphinx]
 source-dir = doc/source
@@ -33,19 +33,19 @@ all_files = 1
 upload-dir = doc/build/html
 
 [compile_catalog]
-directory = savanna/locale
-domain = savanna-guestagent
+directory = sahara/locale
+domain = sahara-guestagent
 
 [update_catalog]
-domain = savanna-guestagent
-output_dir = savanna/locale
-input_file = savanna/locale/savanna-guestagent.pot
+domain = sahara-guestagent
+output_dir = sahara/locale
+input_file = sahara/locale/sahara-guestagent.pot
 
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = savanna/locale/savanna-guestagent.pot
+output_file = sahara/locale/sahara-guestagent.pot
 
 [entry_points]
 console_scripts =
-    savanna-agent = savanna.guestagent.agent:main
+    sahara-agent = sahara.guestagent.agent:main