8 files changed, 13 insertions, 13 deletions
diff --git a/templates/web/default/admin/list_updates.html b/templates/web/default/admin/list_updates.html
index 0a05ba4ac..33b53770f 100644
--- a/templates/web/default/admin/list_updates.html
+++ b/templates/web/default/admin/list_updates.html
@@ -29,7 +29,7 @@
         <td>[% PROCESS format_time time=update.created %]</td> 
         <td>[% IF update.anonymous %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> 
         <td>[% IF update.user.id == update.problem.user_id %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
-        <td>[% IF update.user.belongs_to_council( update.problem.council ) %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
+        <td>[% IF update.user.belongs_to_body( update.problem.council ) %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
         <td>[% update.cobrand %]<br>[% update.cobrand_data | html %]</td> 
         <td>[% update.text | html %]</td> 
         <td><a href="[% c.uri_for( 'update_edit', update.id ) %]">[% loc('Edit') %]</a></td>
diff --git a/templates/web/default/admin/search_users.html b/templates/web/default/admin/search_users.html
index 0b4ba88e7..258fd9adf 100644
--- a/templates/web/default/admin/search_users.html
+++ b/templates/web/default/admin/search_users.html
@@ -19,7 +19,7 @@
     <tr>
         <td>[% PROCESS value_or_nbsp value=user.name %]</td> 
         <td><a href="[% c.uri_for( 'search_reports', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> 
-        <td>[% PROCESS value_or_nbsp value=user.from_council %]</td> 
+        <td>[% PROCESS value_or_nbsp value=user.from_body %]</td> 
         <td>[% user.flagged == 2 ? loc('(Email in abuse table)') : user.flagged ? loc('Yes') : '&nbsp;' %]</td>
         <td>[% IF user.id %]<a href="[% c.uri_for( 'user_edit', user.id ) %]">[% loc('Edit') %]</a>[% END %]</td>
     </tr>
diff --git a/templates/web/default/admin/update_edit.html b/templates/web/default/admin/update_edit.html
index 1d5ee80b4..b56ceeae3 100644
--- a/templates/web/default/admin/update_edit.html
+++ b/templates/web/default/admin/update_edit.html
@@ -22,8 +22,8 @@
 </select></li>
 <li>[% loc('Name:') %] <input type='text' name='name' id='name' value='[% update.name | html %]'></li>
 <li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% update.user.email | html %]'>
-[%- IF update.user.from_council && update.user.from_council == update.problem.council %]
-[% ' (' _ tprintf(loc('user is from same council as problem - %d'), update.user.from_council ) _')' %]
+[%- IF update.user.from_body && update.user.from_body == update.problem.council %]
+[% ' (' _ tprintf(loc('user is from same council as problem - %d'), update.user.from_body ) _')' %]
 [% END -%]
 [%- IF update.user.id == update.problem.user.id %]
 [% ' (' _ loc('user is problem owner') _')' %]
diff --git a/templates/web/default/admin/user_edit.html b/templates/web/default/admin/user_edit.html
index a03a4b734..f6d3be3e3 100644
--- a/templates/web/default/admin/user_edit.html
+++ b/templates/web/default/admin/user_edit.html
@@ -12,7 +12,7 @@
 <li>[% loc('Council:') %] <select id='council' name='council'>
     <option value=''>[% loc('No council') %]</option>
 [% FOR council IN council_ids %]
-    <option value="[% council %]"[% ' selected' IF council == user.from_council %]>[% council_details.$council.name %]</option>
+    <option value="[% council %]"[% ' selected' IF council == user.from_body %]>[% council_details.$council.name %]</option>
 [% END %]
 </select>
 <li>[% loc('Flagged:') %] <input type="checkbox" id="flagged" name="flagged"[% user.flagged ? ' checked' : '' %]></li>
diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html
index d50009299..85f89e130 100755
--- a/templates/web/default/around/display_location.html
+++ b/templates/web/default/around/display_location.html
@@ -35,7 +35,7 @@
         bodyclass => 'mappage',
         robots => 'noindex,nofollow';
 
-    allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_council);
+    allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_body);
 %]
 
 [% IF allow_creation %]
diff --git a/templates/web/default/report/_support.html b/templates/web/default/report/_support.html
index e8b958940..f4bdb8c20 100644
--- a/templates/web/default/report/_support.html
+++ b/templates/web/default/report/_support.html
@@ -1,7 +1,7 @@
 [% IF c.cobrand.can_support_problems %]
 <p id="supporter"><small>
     [% IF !problem.interest_count %][% text=loc('No supporters') %][% ELSIF problem.interest_count == 1 %][% text = loc('1 supporter') %][% ELSE %][% text = tprintf( loc('%d supporters' ), problem.interest_count ) %][% END %]
-    [% IF c.user && c.user.from_council %]<form action="[% c.uri_for( '/report/support' ) %]">
+    [% IF c.user && c.user.from_body %]<form action="[% c.uri_for( '/report/support' ) %]">
         [% text %] <input type="hidden" name="id" value="[% problem.id %]"><input type="submit" class="green-btn" value="Add support">
     </form>
     [% ELSE %]
diff --git a/templates/web/default/report/update-form.html b/templates/web/default/report/update-form.html
index 721e6d4b5..48eb60fcb 100644
--- a/templates/web/default/report/update-form.html
+++ b/templates/web/default/report/update-form.html
@@ -23,7 +23,7 @@
             <textarea name="update" id="form_update" rows="7" cols="30" required>[% update.text | html %]</textarea>
         </div>
 
-        [% IF c.user && c.user.belongs_to_council( problem.council ) %]
+        [% IF c.user && c.user.belongs_to_body( problem.council ) %]
         <div class="form-field">
             <label for="form_state">[% loc( 'State:' ) %]</label>
             <select name="state" id="form_state">
diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html
index eaf5209ff..cfe2b3ab8 100644
--- a/templates/web/default/report/updates.html
+++ b/templates/web/default/report/updates.html
@@ -12,13 +12,13 @@
 
     [% IF update.anonymous || update.name == '' %]
         [% tprintf( loc( 'Posted anonymously at %s' ), prettify_epoch( update.confirmed_local.epoch ) ) -%]
-    [%- ELSIF update.user.from_council;
+    [%- ELSIF update.user.from_body;
         user_name = update.user.name | html;
-        council = update.user.council;
-        IF council == 'Bromley Council';
-            council = "$council <img src='/cobrands/bromley/favicon.png' alt=''>";
+        body = update.user.body;
+        IF body == 'Bromley Council';
+            body = "$body <img src='/cobrands/bromley/favicon.png' alt=''>";
         END %]
-        [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, council, prettify_epoch( update.confirmed_local.epoch ) ) -%]
+        [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, body, prettify_epoch( update.confirmed_local.epoch ) ) -%]
     [%- ELSE %]
         [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_epoch( update.confirmed_local.epoch ) ) | html -%]
     [%- END -%]