6 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb
index ac53b6c10d..f28f364af0 100644
--- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb
+++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb
@@ -5,7 +5,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     @<%= table_name %> = <%= class_name %>.find(:all)
 
     respond_to do |format|
-      format.html # index.erb
+      format.html # index.html.erb
       format.xml  { render :xml => @<%= table_name %> }
     end
   end
@@ -16,7 +16,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     @<%= file_name %> = <%= class_name %>.find(params[:id])
 
     respond_to do |format|
-      format.html # show.erb
+      format.html # show.html.erb
       format.xml  { render :xml => @<%= file_name %> }
     end
   end
@@ -27,7 +27,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     @<%= file_name %> = <%= class_name %>.new
 
     respond_to do |format|
-      format.html # new.erb
+      format.html # new.html.erb
       format.xml  { render :xml => @<%= file_name %> }
     end
   end
diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.html.erb
index 5c1f304232..5c1f304232 100644
--- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.html.erb
diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.html.erb
index bf165e02be..bf165e02be 100644
--- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.html.erb
diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.html.erb
index 9ad899465c..9ad899465c 100644
--- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.html.erb
diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.html.erb
index b3b6f91453..b3b6f91453 100644
--- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.html.erb
diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.html.erb
index adecaf70c6..adecaf70c6 100644
--- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.html.erb