diff --git a/app/views/projects/form/_modules.html.erb b/app/views/projects/form/_modules.html.erb
index 2d6413b570..141d1130a4 100644
--- a/app/views/projects/form/_modules.html.erb
+++ b/app/views/projects/form/_modules.html.erb
@@ -45,9 +45,7 @@ See doc/COPYRIGHT.rdoc for more details.
       <%= form.collection_check_box :enabled_module_names,
                                     name,
                                     @project.module_enabled?(name),
-                                    l_or_humanize(name, :prefix => "project_module_"),
-                                    prefix: 'project_'
-                                    %>
+                                    l_or_humanize(name, :prefix => "project_module_") %>
 
     </div>
   <% end %>
diff --git a/lib/tabular_form_builder.rb b/lib/tabular_form_builder.rb
index d0a04d2e59..e9505bad44 100644
--- a/lib/tabular_form_builder.rb
+++ b/lib/tabular_form_builder.rb
@@ -72,7 +72,7 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
                            text = field.to_s + "_#{value}",
                            options = {})
 
-    label_for = "#{options[:prefix] || ''}#{field}_#{value}".to_sym
+    label_for = "#{object_name}_#{field}_#{value}".to_sym
 
     input_options = options.reverse_merge(multiple: true,
                                           checked: checked,