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>