2 files changed, 6 insertions, 4 deletions
diff --git a/railties/lib/generators/rails/resource/resource_generator.rb b/railties/lib/generators/rails/resource/resource_generator.rb
index 37aca18758..c8748aecf4 100644
--- a/railties/lib/generators/rails/resource/resource_generator.rb
+++ b/railties/lib/generators/rails/resource/resource_generator.rb
@@ -13,11 +13,11 @@ module Rails
       class_option :singleton,    :type => :boolean, :desc => "Supply to create a singleton controller"
       class_option :force_plural, :type => :boolean, :desc => "Forces the use of a plural ModelName"
 
-      def initialize(args=[], options={}, config={})
+      def initialize(*args)
         super
-        if args[0] == args[0].pluralize && !self.options[:force_plural]
+        if name == name.pluralize && !options[:force_plural]
           say "Plural version of the model detected, using singularized version. Override with --force-plural."
-          args[0] = args[0].singularize
+          name.replace name.singularize
         end
       end
 
diff --git a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb
index 3a6620ae70..e7f4fdde89 100644
--- a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+++ b/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb
@@ -1,8 +1,10 @@
 module Rails
   module Generators
     class ScaffoldControllerGenerator < NamedBase
-      class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
+      include ControllerNamedBase
+
       check_class_collision :suffix => "Controller"
+      class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
 
       def create_controller_files
         template 'controller.rb', File.join('app/controllers', class_path, "#{file_name}_controller.rb")