9 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/body_controller.rb b/app/controllers/public_body_controller.rb
index cd72356d1..b668cb576 100644
--- a/app/controllers/body_controller.rb
+++ b/app/controllers/public_body_controller.rb
@@ -4,9 +4,9 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: body_controller.rb,v 1.26 2009-06-16 22:21:13 francis Exp $
+# $Id: public_body_controller.rb,v 1.1 2009-06-22 12:54:44 francis Exp $
 
-class BodyController < ApplicationController
+class PublicBodyController < ApplicationController
     # XXX tidy this up with better error messages, and a more standard infrastructure for the redirect to canonical URL
     def show
         if MySociety::Format.simplify_url_part(params[:url_name]) != params[:url_name]
@@ -47,12 +47,12 @@ class BodyController < ApplicationController
         if params[:submitted_view_email]
             if verify_recaptcha
                 flash.discard(:error)
-                render :template => "body/view_email"
+                render :template => "public_body/view_email"
                 return
             end
             flash.now[:error] = "There was an error with the words you entered, please try again."
         end
-        render :template => "body/view_email_captcha"
+        render :template => "public_body/view_email_captcha"
     end
 
     def list
diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml
index 3bca4677e..402232be4 100644
--- a/app/views/general/search.rhtml
+++ b/app/views/general/search.rhtml
@@ -70,7 +70,7 @@
         <h1><%= "Public authorities " + ((@page-1)*@bodies_per_page+1).to_s + "-" + [@page*@bodies_per_page, @xapian_bodies.matches_estimated].min.to_s + " of " + @xapian_bodies.matches_estimated.to_s + " for '" + h(@query) + "'" %></h1>
 
         <% for result in @xapian_bodies.results %>
-            <%= render :partial => 'body/body_listing_single', :locals => { :public_body => result[:model] }  %>
+            <%= render :partial => 'public_body/body_listing_single', :locals => { :public_body => result[:model] }  %>
         <% end %>
 
         <%= will_paginate WillPaginate::Collection.new(@page, @bodies_per_page, @xapian_bodies.matches_estimated) %>
diff --git a/app/views/body/_alphabet.rhtml b/app/views/public_body/_alphabet.rhtml
index 92674b8aa..92674b8aa 100644
--- a/app/views/body/_alphabet.rhtml
+++ b/app/views/public_body/_alphabet.rhtml
diff --git a/app/views/body/_body_listing.rhtml b/app/views/public_body/_body_listing.rhtml
index 7d673a552..48eb649c2 100644
--- a/app/views/body/_body_listing.rhtml
+++ b/app/views/public_body/_body_listing.rhtml
@@ -2,6 +2,6 @@
     None found.
 <% else %>
     <% for public_body in public_bodies %>
-        <%= render :partial => 'body/body_listing_single', :locals => { :public_body => public_body } %>
+        <%= render :partial => 'public_body/body_listing_single', :locals => { :public_body => public_body } %>
     <% end %>
 <% end %>
diff --git a/app/views/body/_body_listing_single.rhtml b/app/views/public_body/_body_listing_single.rhtml
index c3c1c6730..c3c1c6730 100644
--- a/app/views/body/_body_listing_single.rhtml
+++ b/app/views/public_body/_body_listing_single.rhtml
diff --git a/app/views/body/list.rhtml b/app/views/public_body/list.rhtml
index 8496fdd35..8496fdd35 100644
--- a/app/views/body/list.rhtml
+++ b/app/views/public_body/list.rhtml
diff --git a/app/views/body/show.rhtml b/app/views/public_body/show.rhtml
index 4c9df8646..4c9df8646 100644
--- a/app/views/body/show.rhtml
+++ b/app/views/public_body/show.rhtml
diff --git a/app/views/body/view_email.rhtml b/app/views/public_body/view_email.rhtml
index 9c61ff0fa..9c61ff0fa 100644
--- a/app/views/body/view_email.rhtml
+++ b/app/views/public_body/view_email.rhtml
diff --git a/app/views/body/view_email_captcha.rhtml b/app/views/public_body/view_email_captcha.rhtml
index 13741c292..13741c292 100644
--- a/app/views/body/view_email_captcha.rhtml
+++ b/app/views/public_body/view_email_captcha.rhtml