diff --git a/.gitignore b/.gitignore
index cecf6e0..32067f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,9 +32,6 @@ doc/build
 nosetests.xml
 pylint-report.txt
 etc/local.cfg
-etc/savanna/*.conf
-etc/savanna/*.topology
-etc/savanna.conf
 etc/sahara/*.conf
 etc/sahara/*.topology
 etc/sahara.conf
diff --git a/setup.cfg b/setup.cfg
index 96d5fac..a417f02 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,17 +25,13 @@ packages =
     sahara
 
 data_files =
-    share/savanna = etc/savanna/*
+    share/sahara = etc/sahara/*
 
 [entry_points]
 console_scripts =
-    savanna-api = sahara.cli.savanna_api:main
-    savanna-db-manage = sahara.db.migration.cli:main
-    _savanna-subprocess = sahara.cli.savanna_subprocess:main
-
-    # TODO(slukjanov): remove this code (temp to migrate to the new name)
-    sahara-api = sahara.cli.savanna_api:main
+    sahara-api = sahara.cli.sahara_api:main
     sahara-db-manage = sahara.db.migration.cli:main
+    _sahara-subprocess = sahara.cli.sahara_subprocess:main
 
 savanna.cluster.plugins =
     vanilla = sahara.plugins.vanilla.plugin:VanillaProvider
@@ -59,7 +55,7 @@ source-dir = doc/source
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = sahara/locale/savanna.pot
+output_file = sahara/locale/sahara.pot
 
 [compile_catalog]
 directory = sahara/locale