5 files changed, 8 insertions, 8 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index e1244346d4..d3d0e2e2f8 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -655,7 +655,7 @@ module ActionView
       #     'Accept <a href="/terms">Terms</a>.'.html_safe
       #   end
       def label(object_name, method, content_or_options = nil, options = nil, &block)
-        ActionView::Helpers::Tags::LabelTag.new(object_name, method, self, content_or_options, options).render(&block)
+        ActionView::Helpers::Tags::Label.new(object_name, method, self, content_or_options, options).render(&block)
       end
 
       # Returns an input tag of the "text" type tailored for accessing a specified attribute (identified by +method+) on an object
@@ -677,7 +677,7 @@ module ActionView
       #   # => <input type="text" id="snippet_code" name="snippet[code]" size="20" value="#{@snippet.code}" class="code_input" />
       #
       def text_field(object_name, method, options = {})
-        ActionView::Helpers::Tags::TextFieldTag.new(object_name, method, self, options).render
+        ActionView::Helpers::Tags::TextField.new(object_name, method, self, options).render
       end
 
       # Returns an input tag of the "password" type tailored for accessing a specified attribute (identified by +method+) on an object
diff --git a/actionpack/lib/action_view/helpers/tags.rb b/actionpack/lib/action_view/helpers/tags.rb
index cff5b0220c..bc2fb34deb 100644
--- a/actionpack/lib/action_view/helpers/tags.rb
+++ b/actionpack/lib/action_view/helpers/tags.rb
@@ -1,9 +1,9 @@
 module ActionView
   module Helpers
     module Tags
-      autoload :BaseTag,      'action_view/helpers/tags/base_tag'
-      autoload :LabelTag,     'action_view/helpers/tags/label_tag'
-      autoload :TextFieldTag, 'action_view/helpers/tags/text_field_tag'
+      autoload :Base,      'action_view/helpers/tags/base'
+      autoload :Label,     'action_view/helpers/tags/label'
+      autoload :TextField, 'action_view/helpers/tags/text_field'
     end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/tags/base_tag.rb b/actionpack/lib/action_view/helpers/tags/base.rb
index b9cb5f1a93..24f66f764e 100644
--- a/actionpack/lib/action_view/helpers/tags/base_tag.rb
+++ b/actionpack/lib/action_view/helpers/tags/base.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
     module Tags
-      class BaseTag
+      class Base #:nodoc:
         include Helpers::ActiveModelInstanceTag, Helpers::TagHelper, Helpers::FormTagHelper
 
         DEFAULT_FIELD_OPTIONS = { "size" => 30 }
diff --git a/actionpack/lib/action_view/helpers/tags/label_tag.rb b/actionpack/lib/action_view/helpers/tags/label.rb
index 8a7b15de59..74ac92ee18 100644
--- a/actionpack/lib/action_view/helpers/tags/label_tag.rb
+++ b/actionpack/lib/action_view/helpers/tags/label.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
     module Tags
-      class LabelTag < BaseTag
+      class Label < Base #:nodoc:
         def initialize(object_name, method_name, template_object, content_or_options = nil, options = nil)
           content_is_options = content_or_options.is_a?(Hash)
           if content_is_options
diff --git a/actionpack/lib/action_view/helpers/tags/text_field_tag.rb b/actionpack/lib/action_view/helpers/tags/text_field.rb
index 1dee28203f..4e745061db 100644
--- a/actionpack/lib/action_view/helpers/tags/text_field_tag.rb
+++ b/actionpack/lib/action_view/helpers/tags/text_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
     module Tags
-      class TextFieldTag < BaseTag
+      class TextField < Base #:nodoc:
         def render
           options = @options.stringify_keys
           options["size"] = options["maxlength"] || DEFAULT_FIELD_OPTIONS["size"] unless options.key?("size")