diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index ef31963d0e..450d7f6dc7 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -166,14 +166,34 @@ savanna:
       - change-merged
       - x-vrif-minus-2
     projects:
-      - openstack/savanna
-      - openstack/python-savannaclient
-      - openstack/savanna-dashboard
-      - openstack/savanna-extra
-      - openstack/savanna-image-elements
-      - stackforge/puppet-savanna
-      - stackforge/savanna-ci-config
-      - stackforge/savanna-guestagent
+      - openstack/sahara
+      - openstack/python-saharaclient
+      - openstack/sahara-dashboard
+      - openstack/sahara-extra
+      - openstack/sahara-image-elements
+      - stackforge/puppet-sahara
+      - stackforge/sahara-ci-config
+      - stackforge/sahara-guestagent
+    branches:
+      - master
+      - stable/0.1
+      - stable/0.2
+      - stable/0.3
+
+openstack-sahara:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack/sahara
+      - openstack/python-saharaclient
+      - openstack/sahara-dashboard
+      - openstack/sahara-extra
+      - openstack/sahara-image-elements
+      - stackforge/puppet-sahara
+      - stackforge/sahara-ci-config
+      - stackforge/sahara-guestagent
     branches:
       - master
       - stable/0.1
@@ -658,11 +678,11 @@ openstack-merges:
       - openstack-infra/release-tools
       - openstack/marconi
       - openstack/python-marconiclient
-      - openstack/savanna
-      - openstack/python-savannaclient
-      - openstack/savanna-dashboard
-      - openstack/savanna-extra
-      - openstack/savanna-image-elements
+      - openstack/sahara
+      - openstack/python-saharaclient
+      - openstack/sahara-dashboard
+      - openstack/sahara-extra
+      - openstack/sahara-image-elements
 
 openstack-oslo:
     events:
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/sahara.config b/modules/openstack_project/files/gerrit/acls/openstack/sahara.config
new file mode 100644
index 0000000000..75297d94a9
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack/sahara.config
@@ -0,0 +1,21 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group sahara-core
+        label-Approved = +0..+1 group sahara-core
+        workInProgress = group sahara-core
+        create = group sahara-milestone
+[access "refs/heads/milestone-proposed"]
+        label-Code-Review = -2..+2 group sahara-milestone
+        label-Approved = +0..+1 group sahara-milestone
+[access "refs/heads/stable/*"]
+        exclusiveGroupPermissions = label-Code-Review label-Approved
+        label-Code-Review = -2..+2 group sahara-core
+        label-Approved = +0..+1 group sahara-core
+        label-Code-Review = -1..+1 group Registered Users
+[access "refs/tags/*"]
+        create = group sahara-ptl
+        pushTag = group sahara-ptl
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/savanna.config b/modules/openstack_project/files/gerrit/acls/openstack/savanna.config
deleted file mode 100644
index d96c5e35b6..0000000000
--- a/modules/openstack_project/files/gerrit/acls/openstack/savanna.config
+++ /dev/null
@@ -1,21 +0,0 @@
-[access "refs/heads/*"]
-        label-Code-Review = -2..+2 group savanna-core
-        label-Approved = +0..+1 group savanna-core
-        workInProgress = group savanna-core
-        create = group savanna-milestone
-[access "refs/heads/milestone-proposed"]
-        label-Code-Review = -2..+2 group savanna-milestone
-        label-Approved = +0..+1 group savanna-milestone
-[access "refs/heads/stable/*"]
-        exclusiveGroupPermissions = label-Code-Review label-Approved
-        label-Code-Review = -2..+2 group savanna-core
-        label-Approved = +0..+1 group savanna-core
-        label-Code-Review = -1..+1 group Registered Users
-[access "refs/tags/*"]
-        create = group savanna-ptl
-        pushTag = group savanna-ptl
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-[submit]
-        mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/sahara-ci-config.config b/modules/openstack_project/files/gerrit/acls/stackforge/sahara-ci-config.config
new file mode 100644
index 0000000000..9bced42593
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/sahara-ci-config.config
@@ -0,0 +1,8 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group sahara-ci-config-admins
+        label-Approved = +0..+1 group sahara-ci-config-admins
+        workInProgress = group sahara-ci-config-admins
+[receive]
+        requireChangeId = true
+[submit]
+        mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/sahara-guestagent.config b/modules/openstack_project/files/gerrit/acls/stackforge/sahara-guestagent.config
new file mode 100644
index 0000000000..e16767505e
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/sahara-guestagent.config
@@ -0,0 +1,17 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group sahara-guestagent-core
+        label-Approved = +0..+1 group sahara-guestagent-core
+        workInProgress = group sahara-guestagent-core
+[access "refs/heads/stable/*"]
+        exclusiveGroupPermissions = label-Code-Review label-Approved
+        label-Code-Review = -2..+2 group sahara-guestagent-core
+        label-Approved = +0..+1 group sahara-guestagent-core
+        label-Code-Review = -1..+1 group Registered Users
+[access "refs/tags/*"]
+        create = group sahara-guestagent-milestone
+        pushTag = group sahara-guestagent-milestone
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/savanna-ci-config.config b/modules/openstack_project/files/gerrit/acls/stackforge/savanna-ci-config.config
deleted file mode 100644
index 42eda668c3..0000000000
--- a/modules/openstack_project/files/gerrit/acls/stackforge/savanna-ci-config.config
+++ /dev/null
@@ -1,8 +0,0 @@
-[access "refs/heads/*"]
-        label-Code-Review = -2..+2 group savanna-ci-config-admins
-        label-Approved = +0..+1 group savanna-ci-config-admins
-        workInProgress = group savanna-ci-config-admins
-[receive]
-        requireChangeId = true
-[submit]
-        mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/savanna-guestagent.config b/modules/openstack_project/files/gerrit/acls/stackforge/savanna-guestagent.config
deleted file mode 100644
index da88b28677..0000000000
--- a/modules/openstack_project/files/gerrit/acls/stackforge/savanna-guestagent.config
+++ /dev/null
@@ -1,17 +0,0 @@
-[access "refs/heads/*"]
-        label-Code-Review = -2..+2 group savanna-guestagent-core
-        label-Approved = +0..+1 group savanna-guestagent-core
-        workInProgress = group savanna-guestagent-core
-[access "refs/heads/stable/*"]
-        exclusiveGroupPermissions = label-Code-Review label-Approved
-        label-Code-Review = -2..+2 group savanna-guestagent-core
-        label-Approved = +0..+1 group savanna-guestagent-core
-        label-Code-Review = -1..+1 group Registered Users
-[access "refs/tags/*"]
-        create = group savanna-guestagent-milestone
-        pushTag = group savanna-guestagent-milestone
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-[submit]
-        mergeContent = true
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index 0fb47414ad..6f8396c51d 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -808,7 +808,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-savanna-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-sahara-full{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -825,7 +825,7 @@
           export DEVSTACK_GATE_TIMEOUT=180
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_SAVANNA=1
+          export DEVSTACK_GATE_SAHARA=1
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@@ -840,7 +840,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-savanna-postgres{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-sahara-postgres{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -857,7 +857,7 @@
           export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_POSTGRES=1
-          export DEVSTACK_GATE_SAVANNA=1
+          export DEVSTACK_GATE_SAHARA=1
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@@ -872,7 +872,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-savanna-neutron{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-sahara-neutron{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -890,7 +890,7 @@
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_SMOKE_SERIAL=1
-          export DEVSTACK_GATE_SAVANNA=1
+          export DEVSTACK_GATE_SAHARA=1
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@@ -1099,9 +1099,9 @@
       - '{pipeline}-grenade-dsvm-neutron'
       - '{pipeline}-grenade-dsvm-neutron-forward'
       - '{pipeline}-grenade-dsvm-partial-ncpu'
-      - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-savanna-postgres{branch-designator}'
-      - '{pipeline}-tempest-dsvm-savanna-neutron{branch-designator}'
+      - '{pipeline}-tempest-dsvm-sahara-full{branch-designator}'
+      - '{pipeline}-tempest-dsvm-sahara-postgres{branch-designator}'
+      - '{pipeline}-tempest-dsvm-sahara-neutron{branch-designator}'
       - '{pipeline}-devstack-dsvm-neutron{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}'
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 7ad4d470e5..57d7b41abb 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -198,7 +198,7 @@
           node: bare-precise
 
 - project:
-    name: savanna
+    name: sahara
     github-org: openstack
     node: bare-precise
     tarball-site: tarballs.openstack.org
@@ -211,24 +211,24 @@
       - pypi-jobs
       - translation-jobs
       - openstack-publish-jobs
-      - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}':
+      - '{pipeline}-tempest-dsvm-sahara-full{branch-designator}':
           pipeline: check
           node: 'devstack-precise || devstack-precise-check'
           branch-designator: '-nv'
           branch-override: default
-      - '{pipeline}-tempest-dsvm-savanna-postgres{branch-designator}':
+      - '{pipeline}-tempest-dsvm-sahara-postgres{branch-designator}':
           pipeline: check
           node: 'devstack-precise || devstack-precise-check'
           branch-designator: '-nv'
           branch-override: default
-      - '{pipeline}-tempest-dsvm-savanna-neutron{branch-designator}':
+      - '{pipeline}-tempest-dsvm-sahara-neutron{branch-designator}':
           pipeline: check
           node: 'devstack-precise || devstack-precise-check'
           branch-designator: '-nv'
           branch-override: default
 
 - project:
-    name: python-savannaclient
+    name: python-saharaclient
     github-org: openstack
     node: bare-precise
     tarball-site: tarballs.openstack.org
@@ -251,7 +251,7 @@
       - hook-{name}-rtfd
 
 - project:
-    name: savanna-dashboard
+    name: sahara-dashboard
     github-org: openstack
     node: bare-precise
     tarball-site: tarballs.openstack.org
@@ -261,7 +261,7 @@
       - pypi-jobs
 
 - project:
-    name: savanna-extra
+    name: sahara-extra
     github-org: openstack
     node: bare-precise
     tarball-site: tarballs.openstack.org
@@ -271,7 +271,7 @@
       - pypi-jobs
 
 - project:
-    name: savanna-image-elements
+    name: sahara-image-elements
     github-org: openstack
     node: bare-precise
     tarball-site: tarballs.openstack.org
@@ -1485,7 +1485,7 @@
       - puppet-module-unit
 
 - project:
-    name: puppet-savanna
+    name: puppet-sahara
     github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
@@ -1496,7 +1496,7 @@
       - puppet-module-unit
 
 - project:
-    name: savanna-ci-config
+    name: sahara-ci-config
     github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
@@ -1505,7 +1505,7 @@
       - gate-{name}-pep8
 
 - project:
-    name: savanna-guestagent
+    name: sahara-guestagent
     github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
diff --git a/modules/openstack_project/files/logstash/jenkins-log-client.yaml b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
index 1a53defa5c..786957ecde 100644
--- a/modules/openstack_project/files/logstash/jenkins-log-client.yaml
+++ b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
@@ -143,6 +143,10 @@ source-files:
     tags:
       - screen
       - oslofmt
+  - name: logs/screen-sahara.txt
+    tags:
+      - screen
+      - oslofmt
 # TODO(clarkb) Add swift proxy logs here.
   - name: logs/syslog.txt
     tags:
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 16523e7f35..b26333d2f5 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -310,9 +310,10 @@
 - project: openstack/python-novaclient
   docimpact-group: openstack-manuals
 - project: openstack/python-openstackclient
-- project: openstack/python-savannaclient
-  description: Python bindings and CLI to Savanna.
-  acl-config: /home/gerrit2/acls/openstack/savanna.config
+- project: openstack/python-saharaclient
+  group: python-savannaclient
+  description: Python bindings and CLI for Sahara.
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
 - project: openstack/python-swiftclient
   docimpact-group: openstack-manuals
 - project: openstack/python-troveclient
@@ -320,21 +321,22 @@
   description: Python bindings and CLI to Tuskar.
   upstream: git://github.com/tuskar/python-tuskarclient.git
 - project: openstack/requirements
-- project: openstack/savanna
-  description: Savanna aims to provide users with simple means to provision a Hadoop cluster by specifying several parameters like Hadoop version, cluster topology, nodes hardware details and a few more.
-  acl-config: /home/gerrit2/acls/openstack/savanna.config
-- project: openstack/savanna-dashboard
+- project: openstack/sahara
   group: savanna
-  description: Savanna Horizon plugin.
-  acl-config: /home/gerrit2/acls/openstack/savanna.config
-- project: openstack/savanna-extra
+  description: Sahara aims to provide users with simple means to provision a Hadoop cluster by specifying several parameters like Hadoop version, cluster topology, nodes hardware details and a few more.
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+- project: openstack/sahara-dashboard
   group: savanna
-  description: Repo for Savanna-related utils.
-  acl-config: /home/gerrit2/acls/openstack/savanna.config
-- project: openstack/savanna-image-elements
+  description: Sahara Horizon plugin.
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+- project: openstack/sahara-extra
   group: savanna
-  description: Disk image elements for Savanna
-  acl-config: /home/gerrit2/acls/openstack/savanna.config
+  description: Repo for sahara-related utils.
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+- project: openstack/sahara-image-elements
+  group: savanna
+  description: Disk image elements for Sahara
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
 - project: openstack/stevedore
   group: python-stevedore
   description: Manage dynamic plugins for Python applications
@@ -730,10 +732,10 @@
   description: OpenStack Puppet Dev Environment
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
   upstream: git://github.com/puppetlabs/puppetlabs-openstack_dev_env.git
-- project: stackforge/puppet-savanna
+- project: stackforge/puppet-sahara
   group: savanna
-  description: Savanna Puppet Module
-  acl-config: /home/gerrit2/acls/openstack/savanna.config
+  description: Sahara Puppet Module
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
 - project: stackforge/puppet-swift
   description: OpenStack Swift Puppet Module
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
@@ -790,15 +792,15 @@
 - project: stackforge/rubick
   description: Rule-based diagnostics of configuration of OpenStack platform
   upstream: git://github.com/MirantisLabs/rubick
+- project: stackforge/sahara-ci-config
+  description: Sahara-ci 3rd party testing configs (jjb, zuul, etc.)
+  acl-config: /home/gerrit2/acls/stackforge/sahara-ci-config.config
+- project: stackforge/sahara-guestagent
+  description: Guest agent for Sahara project
+  acl-config: /home/gerrit2/acls/stackforge/sahara-guestagent.config
 - project: stackforge/satori
   upstream: git://github.com/rackerlabs/satori
   description: Configuration Discovery
-- project: stackforge/savanna-ci-config
-  description: savanna-ci 3rd party testing configs (jjb, zuul, etc.)
-  acl-config: /home/gerrit2/acls/stackforge/savanna-ci-config.config
-- project: stackforge/savanna-guestagent
-  description: Guest agent for Savanna project
-  acl-config: /home/gerrit2/acls/stackforge/savanna-guestagent.config
 - project: stackforge/solum
   description: 'An OpenStack related project designed to make cloud services easier to consume and integrate into your application development process. See: https://wiki.openstack.org/wiki/Solum'
   upstream: git://github.com/rackerlabs/solum
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 403902392f..6548029899 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -501,13 +501,13 @@ jobs:
     voting: false
   - name: gate-hacking-integration-nova
     voting: false
-  - name: gate-savanna-pylint
+  - name: gate-sahara-pylint
     voting: false
-  - name: ^(gate|check)-tempest-dsvm-savanna-full-nv$
+  - name: ^(gate|check)-tempest-dsvm-sahara-full-nv$
     voting: false
-  - name: ^(gate|check)-tempest-dsvm-savanna-postgres-nv$
+  - name: ^(gate|check)-tempest-dsvm-sahara-postgres-nv$
     voting: false
-  - name: ^(gate|check)-tempest-dsvm-savanna-neutron-nv$
+  - name: ^(gate|check)-tempest-dsvm-sahara-neutron-nv$
     voting: false
   - name: ^(gate|check)-tempest-dsvm-trove-full$
     voting: false
@@ -1023,36 +1023,36 @@ projects:
           - post-mirror-python26
           - post-mirror-python27
 
-  - name: openstack/savanna
+  - name: openstack/sahara
     template:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
     check:
-      - gate-savanna-pylint
-      - check-tempest-dsvm-savanna-full
-      - check-tempest-dsvm-savanna-postgres
-      - check-tempest-dsvm-savanna-neutron
+      - gate-sahara-pylint
+      - check-tempest-dsvm-sahara-full
+      - check-tempest-dsvm-sahara-postgres
+      - check-tempest-dsvm-sahara-neutron
     gate:
-      - gate-tempest-dsvm-savanna-full
-      - gate-tempest-dsvm-savanna-postgres
-      - gate-tempest-dsvm-savanna-neutron
+      - gate-tempest-dsvm-sahara-full
+      - gate-tempest-dsvm-sahara-postgres
+      - gate-tempest-dsvm-sahara-neutron
     post:
-      - hook-savanna-rtfd
-      - savanna-upstream-translation-update
+      - hook-sahara-rtfd
+      - sahara-upstream-translation-update
     pre-release:
-      - savanna-tarball
-      - hook-savanna-rtfd
+      - sahara-tarball
+      - hook-sahara-rtfd
     release:
-      - savanna-tarball:
-        - savanna-pypi-upload:
+      - sahara-tarball:
+        - sahara-pypi-upload:
           - post-mirror-python26
           - post-mirror-python27
           - post-mirror-python33
-      - hook-savanna-rtfd
-      - savanna-merge-release-tags
+      - hook-sahara-rtfd
+      - sahara-merge-release-tags
     periodic:
-      - savanna-propose-translation-update
+      - sahara-propose-translation-update
 
   - name: openstack/stevedore
     check:
@@ -1515,30 +1515,30 @@ projects:
           - post-mirror-python27
           - post-mirror-python33
 
-  - name: openstack/python-savannaclient
+  - name: openstack/python-saharaclient
     template:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
     check:
-      - check-tempest-dsvm-savanna-full
-      - check-tempest-dsvm-savanna-postgres
-      - check-tempest-dsvm-savanna-neutron
+      - check-tempest-dsvm-sahara-full
+      - check-tempest-dsvm-sahara-postgres
+      - check-tempest-dsvm-sahara-neutron
     gate:
-      - gate-tempest-dsvm-savanna-full
-      - gate-tempest-dsvm-savanna-postgres
-      - gate-tempest-dsvm-savanna-neutron
+      - gate-tempest-dsvm-sahara-full
+      - gate-tempest-dsvm-sahara-postgres
+      - gate-tempest-dsvm-sahara-neutron
     pre-release:
-       - python-savannaclient-tarball
+       - python-saharaclient-tarball
     release:
-       - python-savannaclient-tarball:
-         - python-savannaclient-pypi-upload:
+       - python-saharaclient-tarball:
+         - python-saharaclient-pypi-upload:
            - post-mirror-python26
            - post-mirror-python27
            - post-mirror-python33
     experimental:
-       - gate-python-savannaclient-python33
-       - gate-python-savannaclient-pypy
+       - gate-python-saharaclient-python33
+       - gate-python-saharaclient-pypy
 
   - name: openstack/python-swiftclient
     template:
@@ -2067,59 +2067,59 @@ projects:
       - periodic-mirror-python33
 
 # TODO: add docs
-  - name: openstack/savanna-dashboard
+  - name: openstack/sahara-dashboard
     template:
       - name: check-requirements
     check:
-      - gate-savanna-dashboard-pep8
-      - gate-savanna-dashboard-python26
-      - gate-savanna-dashboard-python27
+      - gate-sahara-dashboard-pep8
+      - gate-sahara-dashboard-python26
+      - gate-sahara-dashboard-python27
     gate:
-      - gate-savanna-dashboard-pep8
-      - gate-savanna-dashboard-python26
-      - gate-savanna-dashboard-python27
+      - gate-sahara-dashboard-pep8
+      - gate-sahara-dashboard-python26
+      - gate-sahara-dashboard-python27
     post:
-      - savanna-dashboard-branch-tarball
-      - savanna-dashboard-coverage
+      - sahara-dashboard-branch-tarball
+      - sahara-dashboard-coverage
     pre-release:
-      - savanna-dashboard-tarball
+      - sahara-dashboard-tarball
     release:
-      - savanna-dashboard-tarball:
-        - savanna-dashboard-pypi-upload:
+      - sahara-dashboard-tarball:
+        - sahara-dashboard-pypi-upload:
           - post-mirror-python26
           - post-mirror-python27
           - post-mirror-python33
 
 # TODO: add docs
-  - name: openstack/savanna-extra
+  - name: openstack/sahara-extra
     template:
       - name: check-requirements
     check:
-      - gate-savanna-extra-pep8
+      - gate-sahara-extra-pep8
     gate:
-      - gate-savanna-extra-pep8
+      - gate-sahara-extra-pep8
     post:
-      - savanna-extra-branch-tarball
+      - sahara-extra-branch-tarball
     pre-release:
-      - savanna-extra-tarball
+      - sahara-extra-tarball
     release:
-      - savanna-extra-tarball
+      - sahara-extra-tarball
 
 # TODO: add docs
-  - name: openstack/savanna-image-elements
+  - name: openstack/sahara-image-elements
     template:
       - name: check-requirements
     check:
-      - gate-savanna-image-elements-pep8
+      - gate-sahara-image-elements-pep8
     gate:
-      - gate-savanna-image-elements-pep8
+      - gate-sahara-image-elements-pep8
     post:
-      - savanna-image-elements-branch-tarball
+      - sahara-image-elements-branch-tarball
     pre-release:
-      - savanna-image-elements-tarball
+      - sahara-image-elements-tarball
     release:
-      - savanna-image-elements-tarball:
-        - savanna-image-elements-pypi-upload:
+      - sahara-image-elements-tarball:
+        - sahara-image-elements-pypi-upload:
           - post-mirror-python26
           - post-mirror-python27
           - post-mirror-python33
@@ -2180,9 +2180,9 @@ projects:
       - check-grenade-dsvm-partial-ncpu
       - check-tempest-dsvm-ironic-nv
       - check-tempest-dsvm-ironic-postgres-nv
-      - check-tempest-dsvm-savanna-full-nv
-      - check-tempest-dsvm-savanna-postgres-nv
-      - check-tempest-dsvm-savanna-neutron-nv
+      - check-tempest-dsvm-sahara-full-nv
+      - check-tempest-dsvm-sahara-postgres-nv
+      - check-tempest-dsvm-sahara-neutron-nv
     gate:
       - gate-tempest-pep8
       - gate-tempest-docs
@@ -2421,9 +2421,9 @@ projects:
       - check-devstack-dsvm-neutron
       - check-tempest-dsvm-ironic-nv
       - check-tempest-dsvm-ironic-postgres-nv
-      - check-tempest-dsvm-savanna-full-nv
-      - check-tempest-dsvm-savanna-postgres-nv
-      - check-tempest-dsvm-savanna-neutron-nv
+      - check-tempest-dsvm-sahara-full-nv
+      - check-tempest-dsvm-sahara-postgres-nv
+      - check-tempest-dsvm-sahara-neutron-nv
     gate:
       - gate-devstack-bash8
       - gate-devstack-dsvm-cells
@@ -2626,9 +2626,9 @@ projects:
       - check-devstack-dsvm-cells-havana
       - check-tempest-dsvm-ironic-nv
       - check-tempest-dsvm-ironic-postgres-nv
-      - check-tempest-dsvm-savanna-full-nv
-      - check-tempest-dsvm-savanna-postgres-nv
-      - check-tempest-dsvm-savanna-neutron-nv
+      - check-tempest-dsvm-sahara-full-nv
+      - check-tempest-dsvm-sahara-postgres-nv
+      - check-tempest-dsvm-sahara-neutron-nv
     gate:
       - gate-devstack-gate-unittests
       - gate-devstack-dsvm-cells
@@ -4083,39 +4083,39 @@ projects:
     gate:
       - gate-noop
 
-  - name: stackforge/puppet-savanna
+  - name: stackforge/puppet-sahara
     check:
-      - gate-puppet-savanna-puppet-lint
-      - gate-puppet-savanna-puppet-syntax
-      - gate-puppet-savanna-puppet-unit-2.7
-      - gate-puppet-savanna-puppet-unit-3.1
-      - gate-puppet-savanna-puppet-unit-3.2
-      - gate-puppet-savanna-puppet-unit-3.3
-      - gate-puppet-savanna-puppet-unit-3.4
+      - gate-puppet-sahara-puppet-lint
+      - gate-puppet-sahara-puppet-syntax
+      - gate-puppet-sahara-puppet-unit-2.7
+      - gate-puppet-sahara-puppet-unit-3.1
+      - gate-puppet-sahara-puppet-unit-3.2
+      - gate-puppet-sahara-puppet-unit-3.3
+      - gate-puppet-sahara-puppet-unit-3.4
     gate:
-      - gate-puppet-savanna-puppet-lint
-      - gate-puppet-savanna-puppet-syntax
-      - gate-puppet-savanna-puppet-unit-2.7
-      - gate-puppet-savanna-puppet-unit-3.1
-      - gate-puppet-savanna-puppet-unit-3.2
-      - gate-puppet-savanna-puppet-unit-3.3
-      - gate-puppet-savanna-puppet-unit-3.4
+      - gate-puppet-sahara-puppet-lint
+      - gate-puppet-sahara-puppet-syntax
+      - gate-puppet-sahara-puppet-unit-2.7
+      - gate-puppet-sahara-puppet-unit-3.1
+      - gate-puppet-sahara-puppet-unit-3.2
+      - gate-puppet-sahara-puppet-unit-3.3
+      - gate-puppet-sahara-puppet-unit-3.4
 
-  - name: stackforge/savanna-ci-config
+  - name: stackforge/sahara-ci-config
     check:
-      - gate-savanna-ci-config-pep8
+      - gate-sahara-ci-config-pep8
     gate:
-      - gate-savanna-ci-config-pep8
+      - gate-sahara-ci-config-pep8
 
-  - name: stackforge/savanna-guestagent
+  - name: stackforge/sahara-guestagent
     template:
       - name: python-jobs
       - name: check-requirements
     pre-release:
-      - savanna-guestagent-tarball
+      - sahara-guestagent-tarball
     release:
-      - savanna-guestagent-tarball:
-        - savanna-guestagent-pypi-upload:
+      - sahara-guestagent-tarball:
+        - sahara-guestagent-pypi-upload:
           - post-mirror-python26
           - post-mirror-python27
           - post-mirror-python33