diff --git a/development.ini b/development.ini
--- a/development.ini
+++ b/development.ini
@@ -15,7 +15,7 @@ pdebug = false
 ################################################################################
 #email_to = admin@localhost
 #error_email_from = paste_error@localhost
-#app_email_from = rhodecode-noreply@localhost
+#app_email_from = kallithea-noreply@localhost
 #error_message =
 #email_prefix = [RhodeCode]
 
@@ -54,7 +54,7 @@ max_request_body_size = 107374182400
 ## is set to more than one worker
 #workers = 1
 ## process name
-#proc_name = rhodecode
+#proc_name = kallithea
 ## type of worker class, one of sync, eventlet, gevent, tornado
 ## recommended for bigger setup is using of of other than sync one
 #worker_class = sync
@@ -71,10 +71,10 @@ max_request_body_size = 107374182400
 #http = 0.0.0.0:5000
 
 ## set as deamon and redirect all output to file
-#daemonize = ./uwsgi_rhodecode.log
+#daemonize = ./uwsgi_kallithea.log
 
 ## master process PID
-#pidfile = ./uwsgi_rhodecode.pid
+#pidfile = ./uwsgi_kallithea.pid
 
 ## stats server with workers statistics, use uwsgitop
 ## for monitoring, `uwsgitop 127.0.0.1:1717`
@@ -271,8 +271,8 @@ issue_prefix = #
 
 ## instance-id prefix
 ## a prefix key for this instance used for cache invalidation when running
-## multiple instances of rhodecode, make sure it's globally unique for
-## all running rhodecode instances. Leave empty if you don't use it
+## multiple instances of kallithea, make sure it's globally unique for
+## all running kallithea instances. Leave empty if you don't use it
 instance_id =
 
 ## alternative return HTTP header for failed authentication. Default HTTP
@@ -360,7 +360,7 @@ beaker.cache.sql_cache_long.key_length =
 
 ## db session ##
 #beaker.session.type = ext:database
-#beaker.session.sa.url = postgresql://postgres:qwe@localhost/rhodecode
+#beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea
 #beaker.session.table_name = db_session
 
 ## encrypted cookie client side session, good for many instances ##
@@ -369,7 +369,7 @@ beaker.cache.sql_cache_long.key_length =
 ## file based cookies (default) ##
 #beaker.session.type = file
 
-beaker.session.key = rhodecode
+beaker.session.key = kallithea
 beaker.session.secret = develop-rc-uytcxaz
 
 ## Secure encrypted cookie. Requires AES and AES python libraries
@@ -490,9 +490,9 @@ logview.pylons.util = #eee
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
-#sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
-sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
-#sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
+#sqlalchemy.db1.url = sqlite:///%(here)s/kallithea.db?timeout=30
+sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/kallithea
+#sqlalchemy.db1.url = mysql://root:qweqwe@localhost/kallithea
 sqlalchemy.db1.echo = false
 sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.db1.convert_unicode = true