3 files changed, 10 insertions, 6 deletions
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index d8a4f15b4b..4ae8756ed0 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -99,13 +99,17 @@ module Rails
       end
 
       def index_name
-        @index_name ||= if reference?
-          polymorphic? ? %w(id type).map { |t| "#{name}_#{t}" } : "#{name}_id"
+        @index_name ||= if polymorphic?
+          %w(id type).map { |t| "#{name}_#{t}" }
         else
-          name
+          column_name
         end
       end
 
+      def column_name
+        @column_name ||= reference? ? "#{name}_id" : name
+      end
+
       def foreign_key?
         !!(name =~ /_id$/)
       end
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index 25d3f5518f..9965db98de 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -162,7 +162,7 @@ module Rails
 
         def attributes_names
           @attributes_names ||= attributes.each_with_object([]) do |a, names|
-            names << (a.reference? ? "#{a.name}_id" : a.name)
+            names << a.column_name
             names << "#{a.name}_type" if a.polymorphic?
           end
         end
diff --git a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
index 7f29932ceb..b2bcaf63be 100644
--- a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
+++ b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
@@ -3,13 +3,13 @@
 <% unless attributes.empty? -%>
 one:
 <% attributes.each do |attribute| -%>
-  <%= attribute.reference? ? "#{attribute.name}_id" : attribute.name %>: <%= attribute.default %>
+  <%= attribute.column_name %>: <%= attribute.default %>
   <%= "#{attribute.name}_type: #{attribute.human_name}" if attribute.polymorphic? %>
 <% end -%>
 
 two:
 <% attributes.each do |attribute| -%>
-  <%= attribute.reference? ? "#{attribute.name}_id" : attribute.name %>: <%= attribute.default %>
+  <%= attribute.column_name %>: <%= attribute.default %>
   <%= "#{attribute.name}_type: #{attribute.human_name}" if attribute.polymorphic? %>
 <% end -%>
 <% else -%>