diff --git a/app/components/officing/results/form_component.html.erb b/app/components/officing/results/form_component.html.erb
index cbe4b2b92..5747876e6 100644
--- a/app/components/officing/results/form_component.html.erb
+++ b/app/components/officing/results/form_component.html.erb
@@ -15,7 +15,7 @@
       </div>
       <% question.question_options.each_with_index do |option, i| %>
         <div class="small-12 medium-6 large-3 column end">
-          <label><%= option.title %></label>
+          <%= label_tag "questions_#{question.id}_#{i}", option.title %>
           <%= text_field_tag "questions[#{question.id}][#{i}]", answer_result_value(question.id, i), placeholder: "0" %>
         </div>
       <% end %>
@@ -25,17 +25,17 @@
 
   <div class="row">
     <div class="small-12 medium-6 large-3 column">
-      <h3><%= t("officing.results.new.ballots_white") %></h3>
+      <%= label_tag :whites, t("officing.results.new.ballots_white") %>
       <%= text_field_tag :whites, params[:whites].presence, placeholder: "0" %>
     </div>
 
     <div class="small-12 medium-6 large-3 column end">
-      <h3><%= t("officing.results.new.ballots_null") %></h3>
+      <%= label_tag :nulls, t("officing.results.new.ballots_null") %>
       <%= text_field_tag :nulls, params[:nulls].presence, placeholder: "0" %>
     </div>
 
     <div class="small-12 medium-6 large-3 column end">
-      <h3><%= t("officing.results.new.ballots_total") %></h3>
+      <%= label_tag :total, t("officing.results.new.ballots_total") %>
       <%= text_field_tag :total, params[:total].presence, placeholder: "0" %>
     </div>
   </div>
diff --git a/spec/system/officing/results_spec.rb b/spec/system/officing/results_spec.rb
index 59abe9497..7b9ebce80 100644
--- a/spec/system/officing/results_spec.rb
+++ b/spec/system/officing/results_spec.rb
@@ -59,15 +59,15 @@ describe "Officing Results", :with_frozen_time do
 
     select booth.name, from: "Booth"
 
-    fill_in "questions[#{question_1.id}][0]", with: "100"
-    fill_in "questions[#{question_1.id}][1]", with: "200"
+    fill_in "Yes", with: "100"
+    fill_in "No", with: "200"
 
-    fill_in "questions[#{question_2.id}][0]", with: "333"
-    fill_in "questions[#{question_2.id}][1]", with: "444"
+    fill_in "Today", with: "333"
+    fill_in "Tomorrow", with: "444"
 
-    fill_in "whites", with: "66"
-    fill_in "nulls",  with: "77"
-    fill_in "total",  with: "88"
+    fill_in "Totally blank ballots", with: "66"
+    fill_in "Invalid ballots", with: "77"
+    fill_in "Valid ballots", with: "88"
 
     click_button "Save"
 
@@ -102,11 +102,11 @@ describe "Officing Results", :with_frozen_time do
     booth_name = partial_result.booth_assignment.booth.name
     select booth_name, from: "Booth"
 
-    fill_in "questions[#{question_1.id}][0]", with: "5555"
-    fill_in "questions[#{question_1.id}][1]", with: "200"
-    fill_in "whites", with: "6"
-    fill_in "nulls",  with: "7"
-    fill_in "total",  with: "8"
+    fill_in "Yes", with: "5555"
+    fill_in "No", with: "200"
+    fill_in "Totally blank ballots", with: "6"
+    fill_in "Invalid ballots", with: "7"
+    fill_in "Valid ballots", with: "8"
 
     click_button "Save"