diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index e44b43300dcc617f1488d82f35b3c75926963f58..45f41edcac3b49536f81b4e0b89e30e18415dc07 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -300,16 +300,16 @@ def form_for(record_or_name_or_array, *args, &proc)
 
         case record_or_name_or_array
         when String, Symbol
-          ActiveSupport::Deprecation.warn("Use the option :object_name => ... instead of a Symbol or String as a the first argument", caller)
+          ActiveSupport::Deprecation.warn("Using form_for(:name, @resource) is deprecated. Please use form_for(@resource, :as => :name) instead.", caller) unless args.empty?
           object_name = record_or_name_or_array
         when Array
           object = record_or_name_or_array.last
-          object_name = options[:object_name] || ActionController::RecordIdentifier.singular_class_name(object)
+          object_name = options[:as] || ActionController::RecordIdentifier.singular_class_name(object)
           apply_form_for_options!(record_or_name_or_array, options)
           args.unshift object
         else
           object = record_or_name_or_array
-          object_name = options[:object_name] || ActionController::RecordIdentifier.singular_class_name(object)
+          object_name = options[:as] || ActionController::RecordIdentifier.singular_class_name(object)
           apply_form_for_options!([object], options)
           args.unshift object
         end
@@ -327,12 +327,12 @@ def apply_form_for_options!(object_or_array, options) #:nodoc:
 
         html_options =
           if object.respond_to?(:persisted?) && object.persisted?
-            { :class  => options[:object_name] ? "#{options[:object_name]}_edit" : dom_class(object, :edit),
-              :id => options[:object_name] ? "#{options[:object_name]}_edit" : dom_id(object, :edit),
+            { :class  => options[:as] ? "#{options[:as]}_edit" : dom_class(object, :edit),
+              :id => options[:as] ? "#{options[:as]}_edit" : dom_id(object, :edit),
               :method => :put }
           else
-            { :class  => options[:object_name] ? "#{options[:object_name]}_new" : dom_class(object, :new),
-              :id => options[:object_name] ? "#{options[:object_name]}_new" : dom_id(object),
+            { :class  => options[:as] ? "#{options[:as]}_new" : dom_class(object, :new),
+              :id => options[:as] ? "#{options[:as]}_new" : dom_id(object),
               :method => :post }
           end
 
diff --git a/actionpack/test/template/erb/form_for_test.rb b/actionpack/test/template/erb/form_for_test.rb
index 482dbb0287739400e4eb3165f08f43f27806259a..ec6e8727356593b9029a2809bea3ff0ec899b873 100644
--- a/actionpack/test/template/erb/form_for_test.rb
+++ b/actionpack/test/template/erb/form_for_test.rb
@@ -8,4 +8,4 @@ class TagHelperTest < BlockTestCase
       assert_equal "<form action=\"/blah/update\" method=\"post\"></form>", output
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index f6401985cc6364d523d463453f2e21592af34d39..88014a65647a3d3c7b20ca8a1eb8d46b6370fcdd 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -440,7 +440,7 @@ def test_form_for
   end
 
   def test_form_for_with_symbol_object_name
-    form_for(@post, :object_name => "other_name", :html => { :id => 'create-post' }) do |f|
+    form_for(@post, :as => "other_name", :html => { :id => 'create-post' }) do |f|
       concat f.label(:title)
       concat f.text_field(:title)
       concat f.text_area(:body)
@@ -504,12 +504,10 @@ def test_form_for_with_remote
   end
 
   def test_form_for_without_object
-    assert_deprecated do
-      form_for(:post, :html => { :id => 'create-post' }) do |f|
-        concat f.text_field(:title)
-        concat f.text_area(:body)
-        concat f.check_box(:secret)
-      end
+    form_for(:post, :html => { :id => 'create-post' }) do |f|
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
     end
 
     expected =
@@ -603,10 +601,8 @@ def test_submit_with_object_as_existing_record_and_locale_strings
   def test_submit_without_object_and_locale_strings
     old_locale, I18n.locale = I18n.locale, :submit
 
-    assert_deprecated do
-      form_for(:post) do |f|
-        concat f.submit :class => "extra"
-      end
+    form_for(:post) do |f|
+      concat f.submit :class => "extra"
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +