diff --git a/railties/lib/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/generators/erb/scaffold/templates/_form.html.erb
index 473ebe14fb35b8dda615f7a83cb8b684244a62b9..d02028d9839d48d1c29b5ff0a6523c837e21b4d7 100644
--- a/railties/lib/generators/erb/scaffold/templates/_form.html.erb
+++ b/railties/lib/generators/erb/scaffold/templates/_form.html.erb
@@ -2,12 +2,12 @@
   <%%= f.error_messages %>
 
 <% for attribute in attributes -%>
-  <div class="attribute">
+  <div class="field">
     <%%= f.label :<%= attribute.name %> %><br />
     <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
   </div>
 <% end -%>
-  <div class="action">
+  <div class="actions">
     <%% if @<%= singular_name %>.new_record? %>
       <%%= f.submit 'Create' %>
     <%% else %>
diff --git a/railties/lib/generators/rails/stylesheets/templates/scaffold.css b/railties/lib/generators/rails/stylesheets/templates/scaffold.css
index a3fdd11f6dc50699f10f87c19aa1f9fee3b99581..d9fa2cf2dc8ef4c69325b0c2849ca3aa403016cc 100644
--- a/railties/lib/generators/rails/stylesheets/templates/scaffold.css
+++ b/railties/lib/generators/rails/stylesheets/templates/scaffold.css
@@ -16,7 +16,7 @@ a { color: #000; }
 a:visited { color: #666; }
 a:hover { color: #fff; background-color:#000; }
 
-div.attribute, div.action {
+div.field, div.actions {
   margin-bottom: 10px;
 }
 
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index 05eadd3460eacb336bef3b5dbbe3325c2e40680b..63559a8a0150187d565c1a55ee5e2dee567de96d 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -75,6 +75,7 @@ def test_scaffold_on_invoke
       edit
       new
       show
+      _form
     ).each { |view| assert_file "app/views/product_lines/#{view}.html.erb" }
     assert_file "app/views/layouts/product_lines.html.erb"