8 files changed, 11 insertions, 11 deletions
diff --git a/app/views/general/_footer.html.erb b/app/views/general/_footer.html.erb
index ab5ab2c47..3ec4f40e6 100644
--- a/app/views/general/_footer.html.erb
+++ b/app/views/general/_footer.html.erb
@@ -1,6 +1,6 @@
 <div id="footer">
     <%= link_to _("Contact {{site_name}}", :site_name => site_name), help_contact_url %>
-| <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="https://twitter.com/<%= Configuration::twitter_username %>"><%= _("Follow us on twitter") %></a>
+| <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="https://twitter.com/<%= AlaveteliConfiguration::twitter_username %>"><%= _("Follow us on twitter") %></a>
 <%= render :partial => 'general/credits' %>
 </div>
 <div class="after-footer">&nbsp;</div>
diff --git a/app/views/general/_stylesheet_includes.html.erb b/app/views/general/_stylesheet_includes.html.erb
index 7a03680f8..5b6e12258 100644
--- a/app/views/general/_stylesheet_includes.html.erb
+++ b/app/views/general/_stylesheet_includes.html.erb
@@ -16,6 +16,6 @@
         <![endif]-->
         <!-- the following method for customising CSS is deprecated; see `doc/THEMES.md` for detail -->
         <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet"  %>
-        <% if Configuration::force_registration_on_new_request %>
+        <% if AlaveteliConfiguration::force_registration_on_new_request %>
         <%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet"  %>
         <% end %>
diff --git a/app/views/general/blog.html.erb b/app/views/general/blog.html.erb
index 07d6d2f14..707eadebb 100644
--- a/app/views/general/blog.html.erb
+++ b/app/views/general/blog.html.erb
@@ -7,9 +7,9 @@
     <img src="/images/twitter-16.png" alt="twitter icon"  class="twitter-icon"> <a href="https://twitter.com/<%= @twitter_user %>"><%= _("Follow us on twitter") %></a><br/><br/>
     <img src="/images/feed-16.png" alt="RSS icon" valign="middle"> <a href="<%= @feed_url %>"><%= _("Subscribe to blog") %></a>
   </div>
-  <% if Configuration::twitter_widget_id %>
+  <% if AlaveteliConfiguration::twitter_widget_id %>
   <div id="twitter">
-    <a class="twitter-timeline" data-dnt=true href="https://twitter.com/<%= Configuration::twitter_username %>" data-widget-id="<%= Configuration::twitter_widget_id %>">Tweets by @<%= Configuration::twitter_username %></a>
+    <a class="twitter-timeline" data-dnt=true href="https://twitter.com/<%= AlaveteliConfiguration::twitter_username %>" data-widget-id="<%= AlaveteliConfiguration::twitter_widget_id %>">Tweets by @<%= AlaveteliConfiguration::twitter_username %></a>
     <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
   </div>
   <% end %>
diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index 28d099984..da9bed4b3 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -42,7 +42,7 @@
         <%= render :partial => 'general/before_head_end' %>
     </head>
     <body class="<%= 'front' if params[:action] == 'frontpage' %>">
-    <% if Configuration::force_registration_on_new_request && !@user %>
+    <% if AlaveteliConfiguration::force_registration_on_new_request && !@user %>
     <%= javascript_include_tag 'jquery.fancybox-1.3.4.pack' %>
     <script type="text/javascript">
         $(document).ready(function() {
@@ -139,13 +139,13 @@
 <input type="text">
 </div>
     <%
-      unless Configuration::ga_code.empty? || (@user && @user.super?) %>
+      unless AlaveteliConfiguration::ga_code.empty? || (@user && @user.super?) %>
         <script type="text/javascript">
           var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
           document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
         </script>
         <script type="text/javascript">
-          var pageTracker = _gat._getTracker("<%= Configuration::ga_code %>");
+          var pageTracker = _gat._getTracker("<%= AlaveteliConfiguration::ga_code %>");
           pageTracker._trackPageview();
         </script>
 
diff --git a/app/views/request/_sidebar.html.erb b/app/views/request/_sidebar.html.erb
index 781671529..6fac1e808 100644
--- a/app/views/request/_sidebar.html.erb
+++ b/app/views/request/_sidebar.html.erb
@@ -31,7 +31,7 @@
     <h2><%= _("Act on what you've learnt") %></h2>
 
     <div class="act_link">
-     <% tweet_link = "https://twitter.com/share?url=#{h(request.url)}&via=#{h(Configuration::twitter_username)}&text='#{h(@info_request.title)}'&related=#{_('alaveteli_foi:The software that runs {{site_name}}', :site_name => h(site_name))}" %>
+     <% tweet_link = "https://twitter.com/share?url=#{h(request.url)}&via=#{h(AlaveteliConfiguration::twitter_username)}&text='#{h(@info_request.title)}'&related=#{_('alaveteli_foi:The software that runs {{site_name}}', :site_name => h(site_name))}" %>
         <%= link_to tweet_link do %>
           <%= image_tag "twitter-16.png", :alt => "twitter icon" %>
         <% end %>
diff --git a/app/views/request/simple_correspondence.html.erb b/app/views/request/simple_correspondence.html.erb
index 0da9ef172..461fa3912 100644
--- a/app/views/request/simple_correspondence.html.erb
+++ b/app/views/request/simple_correspondence.html.erb
@@ -1,4 +1,4 @@
-<%= _('This is a plain-text version of the Freedom of Information request "{{request_title}}".  The latest, full version is available online at {{full_url}}', :request_title => @info_request.title, :full_url => "http://#{Configuration::domain}#{show_request_path(:url_title=>@info_request.url_title)}") %>.
+<%= _('This is a plain-text version of the Freedom of Information request "{{request_title}}".  The latest, full version is available online at {{full_url}}', :request_title => @info_request.title, :full_url => "http://#{AlaveteliConfiguration::domain}#{show_request_path(:url_title=>@info_request.url_title)}") %>.
 
 <% for info_request_event in @info_request_events %>
 <%
diff --git a/app/views/user/rate_limited.html.erb b/app/views/user/rate_limited.html.erb
index d52deebab..54a4e0461 100644
--- a/app/views/user/rate_limited.html.erb
+++ b/app/views/user/rate_limited.html.erb
@@ -2,7 +2,7 @@
 
 <h1><%=@title%></h1>
 
-<p><%= _("You have hit the rate limit on new requests. Users are ordinarily limited to {{max_requests_per_user_per_day}} requests in any rolling 24-hour period. You will be able to make another request in {{can_make_another_request}}.", :max_requests_per_user_per_day => Configuration::max_requests_per_user_per_day, :can_make_another_request => distance_of_time_in_words(Time.now, @next_request_permitted_at))%></p>
+<p><%= _("You have hit the rate limit on new requests. Users are ordinarily limited to {{max_requests_per_user_per_day}} requests in any rolling 24-hour period. You will be able to make another request in {{can_make_another_request}}.", :max_requests_per_user_per_day => AlaveteliConfiguration::max_requests_per_user_per_day, :can_make_another_request => distance_of_time_in_words(Time.now, @next_request_permitted_at))%></p>
 
 <p><%= _("There is a limit on the number of requests you can make in a day, because we don’t want public authorities to be bombarded with large numbers of inappropriate requests. If you feel you have a good reason to ask for the limit to be lifted in your case, please <a href='{{help_contact_path}}'>get in touch</a>.", :help_contact_path => help_contact_path) %></p>
 
diff --git a/app/views/user/set_profile_about_me.html.erb b/app/views/user/set_profile_about_me.html.erb
index c4b760307..fb7de7e97 100644
--- a/app/views/user/set_profile_about_me.html.erb
+++ b/app/views/user/set_profile_about_me.html.erb
@@ -26,7 +26,7 @@
            <%= _(' Include relevant links, such as to a campaign page, your blog or a
             twitter account. They will be made clickable. 
             e.g.')%>
-            <a href="https://twitter.com/<%= Configuration::twitter_username %>">https://twitter.com/<%= Configuration::twitter_username %></a>
+            <a href="https://twitter.com/<%= AlaveteliConfiguration::twitter_username %>">https://twitter.com/<%= AlaveteliConfiguration::twitter_username %></a>
         </p>
     </div>