diff --git a/TODO.md b/TODO.md
index f6ea79d3..9a88a19a 100644
--- a/TODO.md
+++ b/TODO.md
@@ -382,7 +382,6 @@ Collecting lxml==3.3.5 (from -r re (line 22))
 # Provide some fixtures with mocked data
 don't make hard dependencies strict dependencies, fail when needed.
 # on project_settings add debug settings but commented
-# rename context processes varbailes to its original name
 
 
 TODO http://wiki2.dovecot.org/HowTo/SimpleVirtualInstall
diff --git a/orchestra/core/context_processors.py b/orchestra/core/context_processors.py
index 6080166b..13a415d8 100644
--- a/orchestra/core/context_processors.py
+++ b/orchestra/core/context_processors.py
@@ -4,7 +4,7 @@ from orchestra import settings
 def site(request):
     """ Adds site-related context variables to the context """
     return {
-        'SITE_NAME': settings.ORCHESTRA_SITE_NAME,
-        'SITE_VERBOSE_NAME': settings.ORCHESTRA_SITE_VERBOSE_NAME
+        'ORCHESTRA_SITE_NAME': settings.ORCHESTRA_SITE_NAME,
+        'ORCHESTRA_SITE_VERBOSE_NAME': settings.ORCHESTRA_SITE_VERBOSE_NAME
     }
 
diff --git a/orchestra/templates/admin/base_site.html b/orchestra/templates/admin/base_site.html
index 06c19db4..989314b6 100644
--- a/orchestra/templates/admin/base_site.html
+++ b/orchestra/templates/admin/base_site.html
@@ -1,7 +1,7 @@
 {% extends "admin/base.html" %}
 {% load admin_tools_menu_tags utils static %}
 
-{% block title %}{% if header_title %}{{ header_title }}{% else %}{{ title }}{% endif %} | {{ SITE_VERBOSE_NAME }} {% endblock %}
+{% block title %}{% if header_title %}{{ header_title }}{% else %}{{ title }}{% endif %} | {{ ORCHESTRA_SITE_VERBOSE_NAME }} {% endblock %}
 
 {% block blockbots %}
 {{ block.super }}
@@ -19,7 +19,7 @@
 {% endblock %}
 
 {% block branding %}
-<!--<a href="{% url 'admin:index' %}"><h1 id="site-name">{{ SITE_VERBOSE_NAME }} <span class="version">{% version %}</span></a>-->
+<!--<a href="{% url 'admin:index' %}"><h1 id="site-name">{{ ORCHESTRA_SITE_VERBOSE_NAME }} <span class="version">{% version %}</span></a>-->
 {% endblock %}
 {% block nav-global %}
 {% if user.is_active and user.is_staff %}
diff --git a/orchestra/templates/admin/index.html b/orchestra/templates/admin/index.html
index 88b1faa7..d5cf9db5 100644
--- a/orchestra/templates/admin/index.html
+++ b/orchestra/templates/admin/index.html
@@ -6,7 +6,7 @@
 {% block dashboard_css %}{% admin_tools_render_dashboard_css %}{% endblock %}
 {% endblock %}
 
-{% block title %}{{ SITE_VERBOSE_NAME }}{% endblock %}
+{% block title %}{{ ORCHESTRA_SITE_VERBOSE_NAME }}{% endblock %}
 {% block bodyclass %}dashboard{% endblock %}
 
 {% block content_title %}{% endblock %}
diff --git a/orchestra/templates/admin/login.html b/orchestra/templates/admin/login.html
index 2f87fc48..1131e658 100644
--- a/orchestra/templates/admin/login.html
+++ b/orchestra/templates/admin/login.html
@@ -17,7 +17,7 @@
 {% block breadcrumbs %}{% endblock %}
 
 {% block branding %}
-<h1 id="site-name">{{ SITE_VERBOSE_NAME }} <span class="version">{% version %}</span>
+<h1 id="site-name">{{ ORCHESTRA_SITE_VERBOSE_NAME }} <span class="version">{% version %}</span>
 {% endblock %}
 
 {% block content %}
diff --git a/orchestra/templates/admin/orchestra/menu.html b/orchestra/templates/admin/orchestra/menu.html
index d6c1ad59..7a6ca971 100644
--- a/orchestra/templates/admin/orchestra/menu.html
+++ b/orchestra/templates/admin/orchestra/menu.html
@@ -46,7 +46,7 @@
 {% endif %}
 <ul id="navigation-menu">
     <div style="max-width: 1170px; margin:auto;">
-    <div id="branding"><a href="/admin/"></a><h1 id="site-name"><a href="/admin/">{{ SITE_VERBOSE_NAME }}<span class="version">0.0.1a1</span></a></h1></div>
+    <div id="branding"><a href="/admin/"></a><h1 id="site-name"><a href="/admin/">{{ ORCHESTRA_SITE_VERBOSE_NAME }}<span class="version">0.0.1a1</span></a></h1></div>
     {% for item in menu.children %}{% admin_tools_render_menu_item item forloop.counter %}{% endfor %}
     <span style="float:right;color:grey;padding:10px;font-size:11px;">{% trans 'Welcome' %},
         {% url 'admin:accounts_account_change' user.pk as user_change_url %}
diff --git a/orchestra/templates/rest_framework/api.html b/orchestra/templates/rest_framework/api.html
index 884ec278..f070bc05 100644
--- a/orchestra/templates/rest_framework/api.html
+++ b/orchestra/templates/rest_framework/api.html
@@ -5,8 +5,8 @@
     {{ block.super }}
     <link rel="icon" href="{% static "orchestra/images/favicon.png" %}" type="image/png" />
 {% endblock %}
-{% block title %}{{ SITE_VERBOSE_NAME }} REST API{% endblock %}
-{% block branding %}<a class='brand' href="{% url 'api-root' %}">{{ SITE_VERBOSE_NAME }} REST API <span class="version">{% version %}</span></a>{% endblock %}
+{% block title %}{{ ORCHESTRA_SITE_VERBOSE_NAME }} REST API{% endblock %}
+{% block branding %}<a class='brand' href="{% url 'api-root' %}">{{ ORCHESTRA_SITE_VERBOSE_NAME }} REST API <span class="version">{% version %}</span></a>{% endblock %}
 {% block userlinks %}
     <li><a href="{% admin_url %}">Admin</a></li>
     {% if user.is_authenticated %}