diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -18,7 +18,7 @@ syntax: regexp
 ^\.project$
 ^\.pydevproject$
 ^\.coverage$
-^rhodecode\.db$
+^kallithea\.db$
 ^test\.db$
 ^RhodeCode\.egg-info$
 ^rc.*\.ini$
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
diff --git a/kallithea/bin/template.ini.mako b/kallithea/bin/template.ini.mako
--- a/kallithea/bin/template.ini.mako
+++ b/kallithea/bin/template.ini.mako
@@ -20,7 +20,7 @@ pdebug = false
 </%text>
 #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]
 
@@ -62,7 +62,7 @@ use = egg:gunicorn#main
 <%text>## is set to more than one worker</%text>
 workers = 1
 <%text>## process name</%text>
-proc_name = rhodecode
+proc_name = kallithea
 <%text>## type of worker class, one of sync, eventlet, gevent, tornado</%text>
 <%text>## recommended for bigger setup is using of of other than sync one</%text>
 worker_class = sync
@@ -80,10 +80,10 @@ master = true
 http = 0.0.0.0:5000
 
 <%text>## set as deamon and redirect all output to file</%text>
-#daemonize = ./uwsgi_rhodecode.log
+#daemonize = ./uwsgi_kallithea.log
 
 <%text>## master process PID</%text>
-pidfile = ./uwsgi_rhodecode.pid
+pidfile = ./uwsgi_kallithea.pid
 
 <%text>## stats server with workers statistics, use uwsgitop</%text>
 <%text>## for monitoring</%text>
@@ -275,8 +275,8 @@ issue_prefix = #
 
 <%text>## instance-id prefix</%text>
 <%text>## a prefix key for this instance used for cache invalidation when running</%text>
-<%text>## multiple instances of rhodecode, make sure it's globally unique for</%text>
-<%text>## all running rhodecode instances. Leave empty if you don't use it</%text>
+<%text>## multiple instances of kallithea, make sure it's globally unique for</%text>
+<%text>## all running kallithea instances. Leave empty if you don't use it</%text>
 instance_id =
 
 <%text>## alternative return HTTP header for failed authentication. Default HTTP</%text>
@@ -366,7 +366,7 @@ beaker.cache.sql_cache_long.key_length =
 </%text>
 <%text>## db session ##</%text>
 #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
 
 <%text>## encrypted cookie client side session, good for many instances ##</%text>
@@ -375,7 +375,7 @@ beaker.cache.sql_cache_long.key_length =
 <%text>## file based cookies (default) ##</%text>
 #beaker.session.type = file
 
-beaker.session.key = rhodecode
+beaker.session.key = kallithea
 beaker.session.secret = ${uuid()}
 
 <%text>## Secure encrypted cookie. Requires AES and AES python libraries</%text>
@@ -502,13 +502,13 @@ logview.pylons.util = #eee
 </%text>
 %if database_engine == 'sqlite':
 # SQLITE [default]
-sqlalchemy.db1.url = sqlite:///${here}/rhodecode.db?timeout=60
+sqlalchemy.db1.url = sqlite:///${here}/kallithea.db?timeout=60
 %elif database_engine == 'postgres':
 # POSTGRESQL
-sqlalchemy.db1.url = postgresql://user:pass@localhost/rhodecode
+sqlalchemy.db1.url = postgresql://user:pass@localhost/kallithea
 %elif database_engine == 'mysql':
 # MySQL
-sqlalchemy.db1.url = mysql://user:pass@localhost/rhodecode
+sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea
 %endif
 # see sqlalchemy docs for others
 
diff --git a/kallithea/config/deployment.ini_tmpl b/kallithea/config/deployment.ini_tmpl
--- a/kallithea/config/deployment.ini_tmpl
+++ b/kallithea/config/deployment.ini_tmpl
@@ -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 = 127.0.0.1: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 = ${app_instance_uuid}
 
 ## Secure encrypted cookie. Requires AES and AES python libraries
@@ -492,13 +492,13 @@ logview.pylons.util = #eee
 #########################################################
 
 # SQLITE [default]
-sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
+sqlalchemy.db1.url = sqlite:///%(here)s/kallithea.db?timeout=30
 
 # POSTGRESQL
-# sqlalchemy.db1.url = postgresql://user:pass@localhost/rhodecode
+# sqlalchemy.db1.url = postgresql://user:pass@localhost/kallithea
 
 # MySQL
-# sqlalchemy.db1.url = mysql://user:pass@localhost/rhodecode
+# sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea
 
 # see sqlalchemy docs for others
 
diff --git a/kallithea/tests/scripts/create_rc.sh b/kallithea/tests/scripts/create_rc.sh
--- a/kallithea/tests/scripts/create_rc.sh
+++ b/kallithea/tests/scripts/create_rc.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-psql -U postgres -h localhost -c 'drop database if exists rhodecode;'
-psql -U postgres -h localhost -c 'create database rhodecode;'
-paster setup-db rc.ini --force-yes --user=marcink --password=qweqwe --email=marcin@python-blog.com --repos=/home/marcink/repos --no-public-access
-API_KEY=`psql -R " " -A -U postgres -h localhost -c "select api_key from users where admin=TRUE" -d rhodecode | awk '{print $2}'`
+psql -U postgres -h localhost -c 'drop database if exists kallithea;'
+psql -U postgres -h localhost -c 'create database kallithea;'
+paster setup-db rc.ini --force-yes --user=username --password=qweqwe --email=username@example.com --repos=/home/username/repos --no-public-access
+API_KEY=`psql -R " " -A -U postgres -h localhost -c "select api_key from users where admin=TRUE" -d kallithea | awk '{print $2}'`
 echo "run those after running server"
 paster serve rc.ini --pid-file=rc.pid --daemon
 sleep 3
diff --git a/production.ini b/production.ini
--- a/production.ini
+++ b/production.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 = 127.0.0.1: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 = production-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
diff --git a/test.ini b/test.ini
--- a/test.ini
+++ b/test.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]
 
@@ -177,8 +177,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
@@ -260,7 +260,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 ##
@@ -270,7 +270,7 @@ beaker.cache.sql_cache_long.key_length =
 #beaker.session.type = file
 
 
-beaker.session.key = rhodecode
+beaker.session.key = kallithea
 ## secure cookie requires AES python libraries
 #beaker.session.encrypt_key = <key_for_encryption>
 #beaker.session.validate_key = <validation_key>