diff --git a/development.ini b/development.ini
--- a/development.ini
+++ b/development.ini
@@ -1,6 +1,6 @@
 ################################################################################
 ################################################################################
-# RhodeCode - Pylons environment configuration                                 #
+# Kallithea - Pylons environment configuration                                 #
 #                                                                              #
 # The %(here)s variable will be replaced with the parent directory of this file#
 ################################################################################
@@ -11,13 +11,13 @@ pdebug = false
 ################################################################################
 ## Uncomment and replace with the address which should receive                ##
 ## any error reports after application crash                                  ##
-## Additionally those settings will be used by RhodeCode mailing system       ##
+## Additionally those settings will be used by Kallithea mailing system       ##
 ################################################################################
 #email_to = admin@localhost
 #error_email_from = paste_error@localhost
 #app_email_from = kallithea-noreply@localhost
 #error_message =
-#email_prefix = [RhodeCode]
+#email_prefix = [Kallithea]
 
 #smtp_server = mail.server.com
 #smtp_username =
@@ -161,7 +161,7 @@ cut_off_limit = 256000
 ## use cache version of scm repo everywhere
 vcs_full_cache = true
 
-## force https in RhodeCode, fixes https redirects, assumes it's always https
+## force https in Kallithea, fixes https redirects, assumes it's always https
 force_https = false
 
 ## use Strict-Transport-Security headers
@@ -192,7 +192,7 @@ show_revision_number = true
 ## gist URL alias, used to create nicer urls for gist. This should be an
 ## url that does rewrites to _admin/gists/<gistid>.
 ## example: http://gist.kallithea.server/{gistid}. Empty means use the internal
-## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid>
+## Kallithea url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid>
 gist_alias_url =
 
 ## white list of API enabled controllers. This allows to add list of
@@ -212,8 +212,8 @@ api_access_controllers_whitelist =
 ## {email}        user email
 ## {md5email}     md5 hash of the user email (like at gravatar.com)
 ## {size}         size of the image that is expected from the server application
-## {scheme}       http/https from RhodeCode server
-## {netloc}       network location from RhodeCode server
+## {scheme}       http/https from Kallithea server
+## {netloc}       network location from Kallithea server
 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
 
@@ -236,7 +236,7 @@ default_encoding = utf8
 
 #clone_uri = {scheme}://{user}{pass}{netloc}{path}
 
-## issue tracker for RhodeCode (leave blank to disable, absent for default)
+## issue tracker for Kallithea (leave blank to disable, absent for default)
 #bugtracker = https://bitbucket.org/conservancy/kallithea/issues
 
 ## issue tracking mapping for commits messages
@@ -400,7 +400,7 @@ beaker.session.auto = False
 ### [errormator] ###
 ####################
 
-## Errormator is tailored to work with RhodeCode, see
+## Errormator is tailored to work with Kallithea, see
 ## http://errormator.com for details how to obtain an account
 ## you must install python package `errormator_client` to make it work