diff --git a/lib/submitters/normalize_values.rb b/lib/submitters/normalize_values.rb
index 86f35ab0..024a4704 100644
--- a/lib/submitters/normalize_values.rb
+++ b/lib/submitters/normalize_values.rb
@@ -17,7 +17,7 @@ module Submitters
       fields = template.fields.select { |e| e['submitter_uuid'] == submitter['uuid'] }
 
       fields_uuid_index = fields.index_by { |e| e['uuid'] }
-      fields_name_index = fields.index_by { |e| e['name'] }
+      fields_name_index = build_fields_index(fields)
 
       attachments = []
 
@@ -40,6 +40,10 @@ module Submitters
       [normalized_values, attachments]
     end
 
+    def build_fields_index(fields)
+      fields.index_by { |e| e['name'] }.merge(fields.index_by { |e| e['name'].parameterize.underscore })
+    end
+
     def normalize_attachment_value(value, account)
       if value.is_a?(Array)
         new_attachments = value.map { |v| build_attachment(v, account) }