diff --git a/README b/README
index ff1eb55..ba9cd7c 100644
--- a/README
+++ b/README
@@ -16,15 +16,15 @@ In your migrations:
 
   class AddAvatarColumnsToUser < ActiveRecord::Migration
     def self.up
-      add_column :users, :avatar_file_name, :string
+      add_column :users, :avatar_name, :string
       add_column :users, :avatar_content_type, :string
-      add_column :users, :avatar_file_size, :integer
+      add_column :users, :avatar_size, :integer
     end
 
     def self.down
-      remove_column :users, :avatar_file_name
+      remove_column :users, :avatar_name
       remove_column :users, :avatar_content_type
-      remove_column :users, :avatar_file_size
+      remove_column :users, :avatar_size
     end
   end
 
diff --git a/README.rdoc b/README.rdoc
index ff1eb55..ba9cd7c 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -16,15 +16,15 @@ In your migrations:
 
   class AddAvatarColumnsToUser < ActiveRecord::Migration
     def self.up
-      add_column :users, :avatar_file_name, :string
+      add_column :users, :avatar_name, :string
       add_column :users, :avatar_content_type, :string
-      add_column :users, :avatar_file_size, :integer
+      add_column :users, :avatar_size, :integer
     end
 
     def self.down
-      remove_column :users, :avatar_file_name
+      remove_column :users, :avatar_name
       remove_column :users, :avatar_content_type
-      remove_column :users, :avatar_file_size
+      remove_column :users, :avatar_size
     end
   end
 
diff --git a/generators/paperclip/paperclip_generator.rb b/generators/paperclip/paperclip_generator.rb
diff --git a/generators/paperclip/templates/paperclip_migration.rb b/generators/paperclip/templates/paperclip_migration.rb
index 5afb11f..27ceb9d 100644
--- a/generators/paperclip/templates/paperclip_migration.rb
+++ b/generators/paperclip/templates/paperclip_migration.rb
@@ -1,17 +1,17 @@
 class <%= migration_name %> < ActiveRecord::Migration
   def self.up
 <% attachments.each do |attachment| -%>
-    add_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_file_name, :string
+    add_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_name, :string
     add_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_content_type, :string
-    add_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_file_size, :integer
+    add_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_size, :integer
 <% end -%>
   end
 
   def self.down
 <% attachments.each do |attachment| -%>
-    remove_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_file_name
+    remove_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_name
     remove_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_content_type
-    remove_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_file_size
+    remove_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_size
 <% end -%>
   end
 end
diff --git a/lib/paperclip.rb b/lib/paperclip.rb
index 1f5f62b..3b9e4d7 100644
--- a/lib/paperclip.rb
+++ b/lib/paperclip.rb
@@ -151,7 +151,7 @@ module Paperclip
         unless options[:less_than].nil?
           options[:in] = (0..options[:less_than])
         end
-        unless attachment.original_filename.blank? || options[:in].include?(instance[:"#{name}_file_size"].to_i)
+        unless attachment.original_filename.blank? || options[:in].include?(instance[:"#{name}_size"].to_i)
           min = options[:in].first
           max = options[:in].last
           
diff --git a/lib/paperclip/attachment.rb b/lib/paperclip/attachment.rb
index c0fd228..415ae4f 100644
--- a/lib/paperclip/attachment.rb
+++ b/lib/paperclip/attachment.rb
@@ -58,9 +58,9 @@ module Paperclip
       return nil if uploaded_file.nil?
 
       @queued_for_write[:original]        = uploaded_file.to_tempfile
-      @instance[:"#{@name}_file_name"]    = uploaded_file.original_filename.strip.gsub /[^\w\d\.\-]+/, '_'
+      @instance[:"#{@name}_name"]    = uploaded_file.original_filename.strip.gsub /[^\w\d\.\-]+/, '_'
       @instance[:"#{@name}_content_type"] = uploaded_file.content_type.strip
-      @instance[:"#{@name}_file_size"]    = uploaded_file.size.to_i
+      @instance[:"#{@name}_size"]    = uploaded_file.size.to_i
 
       @dirty = true
 
@@ -121,9 +121,9 @@ module Paperclip
     end
 
     # Returns the name of the file as originally assigned, and as lives in the
-    # <attachment>_file_name attribute of the model.
+    # <attachment>_name attribute of the model.
     def original_filename
-      instance[:"#{name}_file_name"]
+      instance[:"#{name}_name"]
     end
 
     # A hash of procs that are run during the interpolation of a path or url.
@@ -227,9 +227,9 @@ module Paperclip
       @queued_for_delete += [:original, *@styles.keys].uniq.map do |style|
         path(style) if exists?(style)
       end.compact
-      @instance[:"#{@name}_file_name"]    = nil
+      @instance[:"#{@name}_name"]    = nil
       @instance[:"#{@name}_content_type"] = nil
-      @instance[:"#{@name}_file_size"]    = nil
+      @instance[:"#{@name}_size"]    = nil
     end
 
     def flush_errors #:nodoc:
diff --git a/test/helper.rb b/test/helper.rb
index c24040b..c2b2ae6 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -29,9 +29,9 @@ ActiveRecord::Base.establish_connection(config[ENV['RAILS_ENV'] || 'test'])
 def rebuild_model options = {}
   ActiveRecord::Base.connection.create_table :dummies, :force => true do |table|
     table.column :other, :string
-    table.column :avatar_file_name, :string
+    table.column :avatar_name, :string
     table.column :avatar_content_type, :string
-    table.column :avatar_file_size, :integer
+    table.column :avatar_size, :integer
   end
 
   ActiveRecord::Base.send(:include, Paperclip)
diff --git a/test/test_attachment.rb b/test/test_attachment.rb
index 71e63e1..f66bad3 100644
--- a/test/test_attachment.rb
+++ b/test/test_attachment.rb
@@ -151,9 +151,9 @@ class AttachmentTest < Test::Unit::TestCase
       @instance = stub
       @instance.stubs(:id).returns(41)
       @instance.stubs(:class).returns(Dummy)
-      @instance.stubs(:[]).with(:test_file_name).returns(nil)
+      @instance.stubs(:[]).with(:test_name).returns(nil)
       @instance.stubs(:[]).with(:test_content_type).returns(nil)
-      @instance.stubs(:[]).with(:test_file_size).returns(nil)
+      @instance.stubs(:[]).with(:test_size).returns(nil)
       @attachment = Paperclip::Attachment.new(:test,
                                               @instance)
       @file = File.new(File.join(File.dirname(__FILE__),
@@ -169,9 +169,9 @@ class AttachmentTest < Test::Unit::TestCase
     
     context "with a file assigned in the database" do
       setup do
-        @instance.stubs(:[]).with(:test_file_name).returns("5k.png")
+        @instance.stubs(:[]).with(:test_name).returns("5k.png")
         @instance.stubs(:[]).with(:test_content_type).returns("image/png")
-        @instance.stubs(:[]).with(:test_file_size).returns(12345)
+        @instance.stubs(:[]).with(:test_size).returns(12345)
       end
 
       should "return a correct url even if the file does not exist" do
@@ -184,7 +184,7 @@ class AttachmentTest < Test::Unit::TestCase
       end
 
       should "return the proper path when filename has multiple .'s" do
-        @instance.stubs(:[]).with(:test_file_name).returns("5k.old.png")      
+        @instance.stubs(:[]).with(:test_name).returns("5k.old.png")      
         assert_equal "./test/../tmp/tests/dummies/original/41/5k.old.png", @attachment.path
       end
 
@@ -200,13 +200,13 @@ class AttachmentTest < Test::Unit::TestCase
 
         context "and assigned a file" do
           setup do
-            @instance.expects(:[]=).with(:test_file_name,
+            @instance.expects(:[]=).with(:test_name,
                                          File.basename(@file.path))
             @instance.expects(:[]=).with(:test_content_type, "image/png")
-            @instance.expects(:[]=).with(:test_file_size, @file.size)
-            @instance.expects(:[]=).with(:test_file_name, nil)
+            @instance.expects(:[]=).with(:test_size, @file.size)
+            @instance.expects(:[]=).with(:test_name, nil)
             @instance.expects(:[]=).with(:test_content_type, nil)
-            @instance.expects(:[]=).with(:test_file_size, nil)
+            @instance.expects(:[]=).with(:test_size, nil)
             @attachment.assign(@file)
           end
 
@@ -256,9 +256,9 @@ class AttachmentTest < Test::Unit::TestCase
                 @existing_names = @attachment.styles.keys.collect do |style|
                   @attachment.path(style)
                 end
-                @instance.expects(:[]=).with(:test_file_name, nil)
+                @instance.expects(:[]=).with(:test_name, nil)
                 @instance.expects(:[]=).with(:test_content_type, nil)
-                @instance.expects(:[]=).with(:test_file_size, nil)
+                @instance.expects(:[]=).with(:test_size, nil)
                 @attachment.assign nil
                 @attachment.save
               end
diff --git a/test/test_integration.rb b/test/test_integration.rb
index 8531c18..73dcaad 100644
--- a/test/test_integration.rb
+++ b/test/test_integration.rb
@@ -128,7 +128,7 @@ class IntegrationTest < Test::Unit::TestCase
       assert_equal "32x32",  `identify -format "%wx%h" #{@d2.avatar.to_file(:thumb).path}`.chomp
 
       @dummy.avatar = "not a valid file but not nil"
-      assert_equal File.basename(@file.path), @dummy.avatar_file_name
+      assert_equal File.basename(@file.path), @dummy.avatar_name
       assert @dummy.valid?
       assert @dummy.save
 
@@ -137,7 +137,7 @@ class IntegrationTest < Test::Unit::TestCase
       end
 
       @dummy.avatar = nil
-      assert_nil @dummy.avatar_file_name
+      assert_nil @dummy.avatar_name
       assert @dummy.valid?
       assert @dummy.save
 
@@ -146,13 +146,13 @@ class IntegrationTest < Test::Unit::TestCase
       end
 
       @d2 = Dummy.find(@dummy.id)
-      assert_nil @d2.avatar_file_name
+      assert_nil @d2.avatar_name
     end
 
     should "work exactly the same when new as when reloaded" do
       @d2 = Dummy.find(@dummy.id)
 
-      assert_equal @dummy.avatar_file_name, @d2.avatar_file_name
+      assert_equal @dummy.avatar_name, @d2.avatar_name
       [:thumb, :medium, :large, :original].each do |style|
         assert_equal @dummy.avatar.to_file(style).path, @d2.avatar.to_file(style).path
       end
@@ -194,9 +194,9 @@ class IntegrationTest < Test::Unit::TestCase
       @dummy.avatar = @file
       assert @dummy.save
       @dummy.avatar = nil
-      assert_nil @dummy.avatar_file_name
+      assert_nil @dummy.avatar_name
       @dummy.reload
-      assert_equal "5k.png", @dummy.avatar_file_name
+      assert_equal "5k.png", @dummy.avatar_name
     end
   end
 
@@ -255,7 +255,7 @@ class IntegrationTest < Test::Unit::TestCase
         end
 
         @dummy.avatar = "not a valid file but not nil"
-        assert_equal File.basename(@file.path), @dummy.avatar_file_name
+        assert_equal File.basename(@file.path), @dummy.avatar_name
         assert @dummy.valid?
         assert @dummy.save
 
@@ -266,7 +266,7 @@ class IntegrationTest < Test::Unit::TestCase
         end
 
         @dummy.avatar = nil
-        assert_nil @dummy.avatar_file_name
+        assert_nil @dummy.avatar_name
         assert @dummy.valid?
         assert @dummy.save
 
@@ -275,13 +275,13 @@ class IntegrationTest < Test::Unit::TestCase
         end
 
         @d2 = Dummy.find(@dummy.id)
-        assert_nil @d2.avatar_file_name
+        assert_nil @d2.avatar_name
       end
 
       should "work exactly the same when new as when reloaded" do
         @d2 = Dummy.find(@dummy.id)
 
-        assert_equal @dummy.avatar_file_name, @d2.avatar_file_name
+        assert_equal @dummy.avatar_name, @d2.avatar_name
         [:thumb, :medium, :large, :original].each do |style|
           assert_equal @dummy.avatar.to_file(style).to_s, @d2.avatar.to_file(style).to_s
         end
@@ -321,9 +321,9 @@ class IntegrationTest < Test::Unit::TestCase
         @dummy.avatar = @file
         assert @dummy.save
         @dummy.avatar = nil
-        assert_nil @dummy.avatar_file_name
+        assert_nil @dummy.avatar_name
         @dummy.reload
-        assert_equal "5k.png", @dummy.avatar_file_name
+        assert_equal "5k.png", @dummy.avatar_name
       end
     end
   end