diff --git a/kallithea/controllers/error.py b/kallithea/controllers/error.py
--- a/kallithea/controllers/error.py
+++ b/kallithea/controllers/error.py
@@ -53,7 +53,7 @@ class ErrorController(BaseController):
 
     def document(self):
         resp = request.environ.get('pylons.original_response')
-        c.rhodecode_name = config.get('rhodecode_title')
+        c.site_name = config.get('rhodecode_title')
 
         log.debug('### %s ###' % resp.status)
 
diff --git a/kallithea/controllers/feed.py b/kallithea/controllers/feed.py
--- a/kallithea/controllers/feed.py
+++ b/kallithea/controllers/feed.py
@@ -51,7 +51,7 @@ class FeedController(BaseRepoController)
         super(FeedController, self).__before__()
         #common values for feeds
         self.description = _('Changes on %s repository')
-        self.title = self.title = _('%s %s feed') % (c.rhodecode_name, '%s')
+        self.title = self.title = _('%s %s feed') % (c.site_name, '%s')
         self.language = 'en-us'
         self.ttl = "5"
         import kallithea
diff --git a/kallithea/controllers/journal.py b/kallithea/controllers/journal.py
--- a/kallithea/controllers/journal.py
+++ b/kallithea/controllers/journal.py
@@ -109,11 +109,11 @@ class JournalController(BaseController):
         journal = self._get_journal_data(repos)
         if public:
             _link = url('public_journal_atom', qualified=True)
-            _desc = '%s %s %s' % (c.rhodecode_name, _('public journal'),
+            _desc = '%s %s %s' % (c.site_name, _('public journal'),
                                   'atom feed')
         else:
             _link = url('journal_atom', qualified=True)
-            _desc = '%s %s %s' % (c.rhodecode_name, _('journal'), 'atom feed')
+            _desc = '%s %s %s' % (c.site_name, _('journal'), 'atom feed')
 
         feed = Atom1Feed(title=_desc,
                          link=_link,
@@ -152,11 +152,11 @@ class JournalController(BaseController):
         journal = self._get_journal_data(repos)
         if public:
             _link = url('public_journal_atom', qualified=True)
-            _desc = '%s %s %s' % (c.rhodecode_name, _('public journal'),
+            _desc = '%s %s %s' % (c.site_name, _('public journal'),
                                   'rss feed')
         else:
             _link = url('journal_atom', qualified=True)
-            _desc = '%s %s %s' % (c.rhodecode_name, _('journal'), 'rss feed')
+            _desc = '%s %s %s' % (c.site_name, _('journal'), 'rss feed')
 
         feed = Rss201rev2Feed(title=_desc,
                          link=_link,
diff --git a/kallithea/lib/base.py b/kallithea/lib/base.py
--- a/kallithea/lib/base.py
+++ b/kallithea/lib/base.py
@@ -300,7 +300,7 @@ class BaseController(WSGIController):
         c.visual.gravatar_url = rc_config.get('rhodecode_gravatar_url')
 
         c.ga_code = rc_config.get('rhodecode_ga_code')
-        c.rhodecode_name = rc_config.get('rhodecode_title')
+        c.site_name = rc_config.get('rhodecode_title')
         c.clone_uri_tmpl = rc_config.get('rhodecode_clone_uri_tmpl')
 
         ## INI stored
diff --git a/kallithea/templates/admin/admin.html b/kallithea/templates/admin/admin.html
--- a/kallithea/templates/admin/admin.html
+++ b/kallithea/templates/admin/admin.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Admin journal')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/auth/auth_settings.html b/kallithea/templates/admin/auth/auth_settings.html
--- a/kallithea/templates/admin/auth/auth_settings.html
+++ b/kallithea/templates/admin/auth/auth_settings.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Authentication Settings')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/defaults/defaults.html b/kallithea/templates/admin/defaults/defaults.html
--- a/kallithea/templates/admin/defaults/defaults.html
+++ b/kallithea/templates/admin/defaults/defaults.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Repositories defaults')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/gists/edit.html b/kallithea/templates/admin/gists/edit.html
--- a/kallithea/templates/admin/gists/edit.html
+++ b/kallithea/templates/admin/gists/edit.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Edit Gist')} &middot; ${c.gist.gist_access_id}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/gists/index.html b/kallithea/templates/admin/gists/index.html
--- a/kallithea/templates/admin/gists/index.html
+++ b/kallithea/templates/admin/gists/index.html
@@ -9,8 +9,8 @@
     %else:
         ${_('Public Gists')}
     %endif
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/gists/new.html b/kallithea/templates/admin/gists/new.html
--- a/kallithea/templates/admin/gists/new.html
+++ b/kallithea/templates/admin/gists/new.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('New Gist')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/gists/show.html b/kallithea/templates/admin/gists/show.html
--- a/kallithea/templates/admin/gists/show.html
+++ b/kallithea/templates/admin/gists/show.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Gist')} &middot; ${c.gist.gist_access_id}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/my_account/my_account.html b/kallithea/templates/admin/my_account/my_account.html
--- a/kallithea/templates/admin/my_account/my_account.html
+++ b/kallithea/templates/admin/my_account/my_account.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('My account')} ${c.authuser.username}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/notifications/notifications.html b/kallithea/templates/admin/notifications/notifications.html
--- a/kallithea/templates/admin/notifications/notifications.html
+++ b/kallithea/templates/admin/notifications/notifications.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('My Notifications')} ${c.authuser.username}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/notifications/show_notification.html b/kallithea/templates/admin/notifications/show_notification.html
--- a/kallithea/templates/admin/notifications/show_notification.html
+++ b/kallithea/templates/admin/notifications/show_notification.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Show notification')} ${c.authuser.username}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/permissions/permissions.html b/kallithea/templates/admin/permissions/permissions.html
--- a/kallithea/templates/admin/permissions/permissions.html
+++ b/kallithea/templates/admin/permissions/permissions.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Permissions administration')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/repo_groups/repo_group_add.html b/kallithea/templates/admin/repo_groups/repo_group_add.html
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html
+++ b/kallithea/templates/admin/repo_groups/repo_group_add.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Add repository group')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit.html b/kallithea/templates/admin/repo_groups/repo_group_edit.html
--- a/kallithea/templates/admin/repo_groups/repo_group_edit.html
+++ b/kallithea/templates/admin/repo_groups/repo_group_edit.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('%s Repository group settings') % c.repo_group.name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/repo_groups/repo_group_show.html b/kallithea/templates/admin/repo_groups/repo_group_show.html
--- a/kallithea/templates/admin/repo_groups/repo_group_show.html
+++ b/kallithea/templates/admin/repo_groups/repo_group_show.html
@@ -2,8 +2,8 @@
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('%s Repository group dashboard') % c.group.group_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/repo_groups/repo_groups.html b/kallithea/templates/admin/repo_groups/repo_groups.html
--- a/kallithea/templates/admin/repo_groups/repo_groups.html
+++ b/kallithea/templates/admin/repo_groups/repo_groups.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Repository groups administration')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/repos/repo_add.html b/kallithea/templates/admin/repos/repo_add.html
--- a/kallithea/templates/admin/repos/repo_add.html
+++ b/kallithea/templates/admin/repos/repo_add.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Add repository')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/repos/repo_creating.html b/kallithea/templates/admin/repos/repo_creating.html
--- a/kallithea/templates/admin/repos/repo_creating.html
+++ b/kallithea/templates/admin/repos/repo_creating.html
@@ -7,8 +7,8 @@
 
 <%def name="title()">
     ${_('%s Creating repository') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/repos/repo_edit.html b/kallithea/templates/admin/repos/repo_edit.html
--- a/kallithea/templates/admin/repos/repo_edit.html
+++ b/kallithea/templates/admin/repos/repo_edit.html
@@ -6,8 +6,8 @@
 
 <%def name="title()">
     ${_('%s repository settings') % c.repo_info.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/repos/repos.html b/kallithea/templates/admin/repos/repos.html
--- a/kallithea/templates/admin/repos/repos.html
+++ b/kallithea/templates/admin/repos/repos.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Repositories administration')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/settings/settings.html b/kallithea/templates/admin/settings/settings.html
--- a/kallithea/templates/admin/settings/settings.html
+++ b/kallithea/templates/admin/settings/settings.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Settings administration')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/user_groups/user_group_add.html b/kallithea/templates/admin/user_groups/user_group_add.html
--- a/kallithea/templates/admin/user_groups/user_group_add.html
+++ b/kallithea/templates/admin/user_groups/user_group_add.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Add user group')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 <%def name="breadcrumbs_links()">
diff --git a/kallithea/templates/admin/user_groups/user_group_edit.html b/kallithea/templates/admin/user_groups/user_group_edit.html
--- a/kallithea/templates/admin/user_groups/user_group_edit.html
+++ b/kallithea/templates/admin/user_groups/user_group_edit.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('%s user group settings') % c.user_group.users_group_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/user_groups/user_groups.html b/kallithea/templates/admin/user_groups/user_groups.html
--- a/kallithea/templates/admin/user_groups/user_groups.html
+++ b/kallithea/templates/admin/user_groups/user_groups.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('User groups administration')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/users/user_add.html b/kallithea/templates/admin/users/user_add.html
--- a/kallithea/templates/admin/users/user_add.html
+++ b/kallithea/templates/admin/users/user_add.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Add user')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 <%def name="breadcrumbs_links()">
diff --git a/kallithea/templates/admin/users/user_edit.html b/kallithea/templates/admin/users/user_edit.html
--- a/kallithea/templates/admin/users/user_edit.html
+++ b/kallithea/templates/admin/users/user_edit.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('%s user settings') % c.user.username}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/admin/users/users.html b/kallithea/templates/admin/users/users.html
--- a/kallithea/templates/admin/users/users.html
+++ b/kallithea/templates/admin/users/users.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Users administration')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/base/base.html b/kallithea/templates/base/base.html
--- a/kallithea/templates/base/base.html
+++ b/kallithea/templates/base/base.html
@@ -8,8 +8,8 @@
             <div class="header">
                 <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
             </div>
-            %if c.rhodecode_name:
-             <div class="branding">- ${c.rhodecode_name}</div>
+            %if c.site_name:
+             <div class="branding">- ${c.site_name}</div>
             %endif
         </div>
         <!-- MENU -->
diff --git a/kallithea/templates/bookmarks/bookmarks.html b/kallithea/templates/bookmarks/bookmarks.html
--- a/kallithea/templates/bookmarks/bookmarks.html
+++ b/kallithea/templates/bookmarks/bookmarks.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('%s Bookmarks') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/branches/branches.html b/kallithea/templates/branches/branches.html
--- a/kallithea/templates/branches/branches.html
+++ b/kallithea/templates/branches/branches.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('%s Branches') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/changelog/changelog.html b/kallithea/templates/changelog/changelog.html
--- a/kallithea/templates/changelog/changelog.html
+++ b/kallithea/templates/changelog/changelog.html
@@ -7,8 +7,8 @@
     %if c.changelog_for_path:
       /${c.changelog_for_path}
     %endif
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/changeset/changeset.html b/kallithea/templates/changeset/changeset.html
--- a/kallithea/templates/changeset/changeset.html
+++ b/kallithea/templates/changeset/changeset.html
@@ -4,8 +4,8 @@
 
 <%def name="title()">
     ${_('%s Changeset') % c.repo_name} - ${h.show_id(c.changeset)}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/changeset/changeset_range.html b/kallithea/templates/changeset/changeset_range.html
--- a/kallithea/templates/changeset/changeset_range.html
+++ b/kallithea/templates/changeset/changeset_range.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('%s Changesets') % c.repo_name} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} &gt; r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/compare/compare_diff.html b/kallithea/templates/compare/compare_diff.html
--- a/kallithea/templates/compare/compare_diff.html
+++ b/kallithea/templates/compare/compare_diff.html
@@ -7,8 +7,8 @@
     %else:
         ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} &gt; ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)}
     %endif
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/errors/error_document.html b/kallithea/templates/errors/error_document.html
--- a/kallithea/templates/errors/error_document.html
+++ b/kallithea/templates/errors/error_document.html
@@ -38,7 +38,7 @@
         <div id="login">
             <div class="table">
                 <div id="main_div">
-                    <div style="font-size:2.0em;margin: 10px">${c.rhodecode_name}</div>
+                    <div style="font-size:2.0em;margin: 10px">${c.site_name}</div>
                     <h1 class="error_message">${c.error_message}</h1>
 
                     <p>${c.error_explanation}</p>
diff --git a/kallithea/templates/files/diff_2way.html b/kallithea/templates/files/diff_2way.html
--- a/kallithea/templates/files/diff_2way.html
+++ b/kallithea/templates/files/diff_2way.html
@@ -13,8 +13,8 @@
 
 <%def name="title()">
     ${_('%s File side-by-side diff') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/files/file_diff.html b/kallithea/templates/files/file_diff.html
--- a/kallithea/templates/files/file_diff.html
+++ b/kallithea/templates/files/file_diff.html
@@ -2,8 +2,8 @@
 
 <%def name="title()">
     ${_('%s File Diff') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/files/files.html b/kallithea/templates/files/files.html
--- a/kallithea/templates/files/files.html
+++ b/kallithea/templates/files/files.html
@@ -6,8 +6,8 @@
         &middot; ${h.safe_unicode(c.file.path) or '\\'}
     %endif
 
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
@@ -81,7 +81,7 @@ var ypjax_links = function(){
         var f_path = parts2.join('/');
 
         //page title make this consistent with title() mako function on top
-        var title = "${_('%s Files') % c.repo_name}" + " &middot; " + (f_path || '\\') + " &middot; " + "${c.rhodecode_name}";
+        var title = "${_('%s Files') % c.repo_name}" + " &middot; " + (f_path || '\\') + " &middot; " + "${c.site_name}";
 
         var _node_list_url = node_list_url.replace('__REV__',rev).replace('__FPATH__', f_path);
         var _url_base = url_base.replace('__REV__',rev);
diff --git a/kallithea/templates/files/files_add.html b/kallithea/templates/files/files_add.html
--- a/kallithea/templates/files/files_add.html
+++ b/kallithea/templates/files/files_add.html
@@ -2,8 +2,8 @@
 
 <%def name="title()">
     ${_('%s Files Add') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/files/files_delete.html b/kallithea/templates/files/files_delete.html
--- a/kallithea/templates/files/files_delete.html
+++ b/kallithea/templates/files/files_delete.html
@@ -2,8 +2,8 @@
 
 <%def name="title()">
     ${_('%s Files Delete') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/files/files_edit.html b/kallithea/templates/files/files_edit.html
--- a/kallithea/templates/files/files_edit.html
+++ b/kallithea/templates/files/files_edit.html
@@ -2,8 +2,8 @@
 
 <%def name="title()">
     ${_('%s File Edit') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/followers/followers.html b/kallithea/templates/followers/followers.html
--- a/kallithea/templates/followers/followers.html
+++ b/kallithea/templates/followers/followers.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('%s Followers') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/forks/fork.html b/kallithea/templates/forks/fork.html
--- a/kallithea/templates/forks/fork.html
+++ b/kallithea/templates/forks/fork.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Fork repository %s') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/forks/forks.html b/kallithea/templates/forks/forks.html
--- a/kallithea/templates/forks/forks.html
+++ b/kallithea/templates/forks/forks.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('%s Forks') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/index.html b/kallithea/templates/index.html
--- a/kallithea/templates/index.html
+++ b/kallithea/templates/index.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Dashboard')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/index_base.html b/kallithea/templates/index_base.html
--- a/kallithea/templates/index_base.html
+++ b/kallithea/templates/index_base.html
@@ -72,7 +72,7 @@
             <div style="height: 20px"></div>
             % endif
             <div id="welcome" style="display:none;text-align:center">
-                <h1><a href="${h.url('home')}">${c.rhodecode_name} ${c.rhodecode_version}</a></h1>
+                <h1><a href="${h.url('home')}">${c.site_name} ${c.rhodecode_version}</a></h1>
             </div>
             <%cnt=0%>
             <%namespace name="dt" file="/data_table/_dt_elements.html"/>
diff --git a/kallithea/templates/journal/journal.html b/kallithea/templates/journal/journal.html
--- a/kallithea/templates/journal/journal.html
+++ b/kallithea/templates/journal/journal.html
@@ -2,8 +2,8 @@
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Journal')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 <%def name="breadcrumbs()">
diff --git a/kallithea/templates/journal/public_journal.html b/kallithea/templates/journal/public_journal.html
--- a/kallithea/templates/journal/public_journal.html
+++ b/kallithea/templates/journal/public_journal.html
@@ -2,12 +2,12 @@
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Public Journal')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 <%def name="breadcrumbs()">
-    ${c.rhodecode_name}
+    ${c.site_name}
 </%def>
 <%def name="page_nav()">
     ${self.menu('journal')}
diff --git a/kallithea/templates/login.html b/kallithea/templates/login.html
--- a/kallithea/templates/login.html
+++ b/kallithea/templates/login.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Log In')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
@@ -15,8 +15,8 @@
             <div class="header">
                 <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
             </div>
-            %if c.rhodecode_name:
-             <div class="branding">- ${c.rhodecode_name}</div>
+            %if c.site_name:
+             <div class="branding">- ${c.site_name}</div>
             %endif
         </div>
     </div>
@@ -26,8 +26,8 @@
     <%include file="/base/flash_msg.html"/>
     <!-- login -->
     <div class="title withlogo">
-        %if c.rhodecode_name:
-            <h5>${_('Log In to %s') % c.rhodecode_name}</h5>
+        %if c.site_name:
+            <h5>${_('Log In to %s') % c.site_name}</h5>
         %else:
             <h5>${_('Log In')}</h5>
         %endif
diff --git a/kallithea/templates/password_reset.html b/kallithea/templates/password_reset.html
--- a/kallithea/templates/password_reset.html
+++ b/kallithea/templates/password_reset.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Password Reset')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
@@ -15,8 +15,8 @@
             <div class="header">
                 <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
             </div>
-            %if c.rhodecode_name:
-             <div class="branding">- ${c.rhodecode_name}</div>
+            %if c.site_name:
+             <div class="branding">- ${c.site_name}</div>
             %endif
         </div>
     </div>
@@ -25,8 +25,8 @@
 <div id="register">
     <%include file="/base/flash_msg.html"/>
     <div class="title withlogo">
-        %if c.rhodecode_name:
-            <h5>${_('Reset your Password to %s') % c.rhodecode_name}</h5>
+        %if c.site_name:
+            <h5>${_('Reset your Password to %s') % c.site_name}</h5>
         %else:
             <h5>${_('Reset your Password')}</h5>
         %endif
diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html
--- a/kallithea/templates/pullrequests/pullrequest_show.html
+++ b/kallithea/templates/pullrequests/pullrequest_show.html
@@ -2,8 +2,8 @@
 
 <%def name="title()">
     ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/pullrequests/pullrequest_show_all.html b/kallithea/templates/pullrequests/pullrequest_show_all.html
--- a/kallithea/templates/pullrequests/pullrequest_show_all.html
+++ b/kallithea/templates/pullrequests/pullrequest_show_all.html
@@ -2,8 +2,8 @@
 
 <%def name="title()">
     ${_('%s Pull Requests') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/register.html b/kallithea/templates/register.html
--- a/kallithea/templates/register.html
+++ b/kallithea/templates/register.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('Sign Up')}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 <div id="header">
@@ -13,8 +13,8 @@
             <div class="header">
                 <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
             </div>
-            %if c.rhodecode_name:
-             <div class="branding">- ${c.rhodecode_name}</div>
+            %if c.site_name:
+             <div class="branding">- ${c.site_name}</div>
             %endif
         </div>
     </div>
@@ -24,8 +24,8 @@
 <div id="register">
     <%include file="/base/flash_msg.html"/>
     <div class="title withlogo">
-        %if c.rhodecode_name:
-            <h5>${_('Sign Up to %s') % c.rhodecode_name}</h5>
+        %if c.site_name:
+            <h5>${_('Sign Up to %s') % c.site_name}</h5>
         %else:
             <h5>${_('Sign Up')}</h5>
         %endif
diff --git a/kallithea/templates/search/search.html b/kallithea/templates/search/search.html
--- a/kallithea/templates/search/search.html
+++ b/kallithea/templates/search/search.html
@@ -7,8 +7,8 @@
     %else:
         ${_('Search in all repositories')}
     %endif
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/summary/statistics.html b/kallithea/templates/summary/statistics.html
--- a/kallithea/templates/summary/statistics.html
+++ b/kallithea/templates/summary/statistics.html
@@ -2,8 +2,8 @@
 
 <%def name="title()">
     ${_('%s Statistics') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/summary/summary.html b/kallithea/templates/summary/summary.html
--- a/kallithea/templates/summary/summary.html
+++ b/kallithea/templates/summary/summary.html
@@ -2,8 +2,8 @@
 
 <%def name="title()">
     ${_('%s Summary') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>
 
diff --git a/kallithea/templates/tags/tags.html b/kallithea/templates/tags/tags.html
--- a/kallithea/templates/tags/tags.html
+++ b/kallithea/templates/tags/tags.html
@@ -3,8 +3,8 @@
 
 <%def name="title()">
     ${_('%s Tags') % c.repo_name}
-    %if c.rhodecode_name:
-        &middot; ${c.rhodecode_name}
+    %if c.site_name:
+        &middot; ${c.site_name}
     %endif
 </%def>