Change variant name to display name

db/migrate/20140604051248_add_display_name_and_display_as_to_spree_variants.rb

@@ -0,0 +1,6 @@
+class AddDisplayNameAndDisplayAsToSpreeVariants < ActiveRecord::Migration
+  def change
+    add_column :spree_variants, :display_name, :string
+    add_column :spree_variants, :display_as, :string
+  end
+end

db/migrate/20140604051248_add_name_and_display_as_to_spree_variants.rb

@@ -1,6 +0,0 @@
-class AddNameAndDisplayAsToSpreeVariants < ActiveRecord::Migration
-  def change
-    add_column :spree_variants, :name, :string
-    add_column :spree_variants, :display_as, :string
-  end
-end

db/schema.rb

@@ -962,7 +962,7 @@ ActiveRecord::Schema.define(:version => 20140604051248) do
     t.string   "cost_currency"
     t.float    "unit_value"
     t.string   "unit_description",                               :default => ""
-    t.string   "name"
+    t.string   "display_name"
     t.string   "display_as"
   end