1 files changed, 3 insertions, 1 deletions
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")