diff --git a/db/migrate/20170120153244_move_geozones_from_poll_questions_to_polls.rb b/db/migrate/20170120153244_move_geozones_from_poll_questions_to_polls.rb
new file mode 100644
index 000000000..a2606c370
--- /dev/null
+++ b/db/migrate/20170120153244_move_geozones_from_poll_questions_to_polls.rb
@@ -0,0 +1,10 @@
+class MoveGeozonesFromPollQuestionsToPolls < ActiveRecord::Migration
+  def change
+    drop_table :geozones_poll_questions
+
+    create_table :geozones_polls do |t|
+      t.references :geozone, index: true, foreign_key: true
+      t.references :poll, index: true, foreign_key: true
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5385ef19b..56ec117e7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170114154421) do
+ActiveRecord::Schema.define(version: 20170120153244) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -307,13 +307,13 @@ ActiveRecord::Schema.define(version: 20170114154421) do
     t.string   "census_code"
   end
 
-  create_table "geozones_poll_questions", force: :cascade do |t|
+  create_table "geozones_polls", force: :cascade do |t|
     t.integer "geozone_id"
-    t.integer "question_id"
+    t.integer "poll_id"
   end
 
-  add_index "geozones_poll_questions", ["geozone_id"], name: "index_geozones_poll_questions_on_geozone_id", using: :btree
-  add_index "geozones_poll_questions", ["question_id"], name: "index_geozones_poll_questions_on_question_id", using: :btree
+  add_index "geozones_polls", ["geozone_id"], name: "index_geozones_polls_on_geozone_id", using: :btree
+  add_index "geozones_polls", ["poll_id"], name: "index_geozones_polls_on_poll_id", using: :btree
 
   create_table "identities", force: :cascade do |t|
     t.integer  "user_id"
@@ -768,8 +768,8 @@ ActiveRecord::Schema.define(version: 20170114154421) do
   add_foreign_key "annotations", "users"
   add_foreign_key "failed_census_calls", "users"
   add_foreign_key "flags", "users"
-  add_foreign_key "geozones_poll_questions", "geozones"
-  add_foreign_key "geozones_poll_questions", "poll_questions", column: "question_id"
+  add_foreign_key "geozones_polls", "geozones"
+  add_foreign_key "geozones_polls", "polls"
   add_foreign_key "identities", "users"
   add_foreign_key "locks", "users"
   add_foreign_key "managers", "users"