Merge remote branch 'origin/master' into oxfordshire-header

1 files changed, 4 insertions, 4 deletions

diff --git a/bin/open311-populate-service-list b/bin/open311-populate-service-list
index dc8fa3f7b..be1ace3b9 100755
--- a/bin/open311-populate-service-list
+++ b/bin/open311-populate-service-list
@@ -14,13 +14,13 @@ my ($opt, $usage) = describe_options(
 );
 print($usage->text), exit if $opt->help;
 
-my $council_list = FixMyStreet::App->model('DB::Open311conf')->search( {
-    area_id => { '!=', 2237 }, # XXX Until Oxfordshire does do so
+my $bodies = FixMyStreet::App->model('DB::Body')->search( {
+    id => { '!=', 2237 }, # XXX Until Oxfordshire does do so
     send_method => 'Open311'
 } );
 my $verbose = 0;
 $verbose = 1 if $opt->warn;
 $verbose = 2 if $opt->verbose;
-my $p = Open311::PopulateServiceList->new( council_list => $council_list, verbose => $verbose );
+my $p = Open311::PopulateServiceList->new( bodies => $bodies, verbose => $verbose );
 
-$p->process_councils;
+$p->process_bodies;