diff --git a/.gitignore b/.gitignore
index eb01ad65..c97beff3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,5 +34,5 @@ pylint-report.txt
 ChangeLog
 cscope.out
 horizon
-savannadashboard/tests/configs/config.conf
+saharadashboard/tests/configs/config.conf
 AUTHORS
diff --git a/openstack-common.conf b/openstack-common.conf
index abd9faa9..610937a4 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
 modules=importutils
-base=savannadashboard
+base=saharadashboard
 
diff --git a/saharadashboard/nodegroup_templates/urls.py b/saharadashboard/nodegroup_templates/urls.py
index 7e382973..23604484 100644
--- a/saharadashboard/nodegroup_templates/urls.py
+++ b/saharadashboard/nodegroup_templates/urls.py
@@ -23,7 +23,7 @@ patterns = urls.patterns
 url = urls.url
 
 
-urlpatterns = patterns('savanna.nodegroup_templates.views',
+urlpatterns = patterns('sahara.nodegroup_templates.views',
                        url(r'^$', views.NodegroupTemplatesView.as_view(),
                            name='index'),
                        url(r'^nodegroup-templates$',
diff --git a/saharadashboard/tests/cluster_tests/test_clusters.py b/saharadashboard/tests/cluster_tests/test_clusters.py
index 92e1bac2..c97c8037 100644
--- a/saharadashboard/tests/cluster_tests/test_clusters.py
+++ b/saharadashboard/tests/cluster_tests/test_clusters.py
@@ -120,9 +120,9 @@ class UICreateCluster(base.UITestCase):
                     for x in range(10000)))
 
             self.create_data_source(
-                'input', 'selenium-container.savanna/input')
+                'input', 'selenium-container.sahara/input')
             self.create_data_source(
-                'output', 'selenium-container.savanna/output')
+                'output', 'selenium-container.sahara/output')
 
             parameters_of_storage = {
                 'storage_type': 'Internal database',
diff --git a/saharadashboard/tests/configs/config.py b/saharadashboard/tests/configs/config.py
index bae2ffa1..f5acc984 100644
--- a/saharadashboard/tests/configs/config.py
+++ b/saharadashboard/tests/configs/config.py
@@ -90,7 +90,7 @@ VanillaGroup = [
                          "OZ": 3, "TT": 4, "JT": 5},
                 help='numbers of processes for vanilla in saharadashboard'),
     cfg.StrOpt('base_image',
-               default='ubuntu_savanna_latest',
+               default='ubuntu_sahara_latest',
                help="image name for start vanilla cluster")
 ]