7 files changed, 13 insertions, 27 deletions
diff --git a/railties/lib/generators/rails/helper/helper_generator.rb b/railties/lib/generators/rails/helper/helper_generator.rb
index 6f741b0978..2b84581025 100644
--- a/railties/lib/generators/rails/helper/helper_generator.rb
+++ b/railties/lib/generators/rails/helper/helper_generator.rb
@@ -1,9 +1,7 @@
 module Rails
   module Generators
     class HelperGenerator < NamedBase
-      def check_class_collisions
-        class_collisions "#{class_name}Helper"
-      end
+      check_class_collision :suffix => "Helper"
 
       def create_helper_files
         template 'helper.rb', File.join('app/helpers', class_path, "#{file_name}_helper.rb")
diff --git a/railties/lib/generators/rails/integration_test/integration_test_generator.rb b/railties/lib/generators/rails/integration_test/integration_test_generator.rb
index 00afaf70ab..7071d5ec50 100644
--- a/railties/lib/generators/rails/integration_test/integration_test_generator.rb
+++ b/railties/lib/generators/rails/integration_test/integration_test_generator.rb
@@ -1,9 +1,7 @@
 module Rails
   module Generators
     class IntegrationTestGenerator < NamedBase
-      def check_class_collisions
-        class_collisions "#{class_name}Test"
-      end
+      check_class_collisions :suffix => "Test"
 
       def create_test_files
         template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
diff --git a/railties/lib/generators/rails/mailer/mailer_generator.rb b/railties/lib/generators/rails/mailer/mailer_generator.rb
index 6e7e6e811e..1753166af5 100644
--- a/railties/lib/generators/rails/mailer/mailer_generator.rb
+++ b/railties/lib/generators/rails/mailer/mailer_generator.rb
@@ -2,10 +2,7 @@ module Rails
   module Generators
     class MailerGenerator < NamedBase
       argument :actions, :type => :array, :default => [], :banner => "method method"
-
-      def check_class_collision
-        class_collisions class_name
-      end
+      check_class_collision
 
       def create_mailer_file
         template "mailer.rb", File.join('app/models', class_path, "#{file_name}.rb")
diff --git a/railties/lib/generators/rails/metal/metal_generator.rb b/railties/lib/generators/rails/metal/metal_generator.rb
index f8833ecec3..d814b6c38b 100644
--- a/railties/lib/generators/rails/metal/metal_generator.rb
+++ b/railties/lib/generators/rails/metal/metal_generator.rb
@@ -1,9 +1,7 @@
 module Rails
   module Generators
     class MetalGenerator < NamedBase
-      def check_class_collision
-        class_collisions class_name
-      end
+      check_class_collision
 
       def create_file
         template "metal.rb", "app/metal/#{file_name}.rb"
diff --git a/railties/lib/generators/rails/observer/observer_generator.rb b/railties/lib/generators/rails/observer/observer_generator.rb
index 205ffc8064..ad058a3172 100644
--- a/railties/lib/generators/rails/observer/observer_generator.rb
+++ b/railties/lib/generators/rails/observer/observer_generator.rb
@@ -1,9 +1,7 @@
 module Rails
   module Generators
     class ObserverGenerator < NamedBase
-      def check_class_collision
-        class_collisions "#{class_name}Observer"
-      end
+      check_class_collision :suffix => "Observer"
 
       def create_observer_file
         template 'observer.rb', File.join('app/models', class_path, "#{file_name}_observer.rb")
diff --git a/railties/lib/generators/rails/performance_test/performance_test_generator.rb b/railties/lib/generators/rails/performance_test/performance_test_generator.rb
index bf83b354a8..b8efda8df3 100644
--- a/railties/lib/generators/rails/performance_test/performance_test_generator.rb
+++ b/railties/lib/generators/rails/performance_test/performance_test_generator.rb
@@ -1,12 +1,11 @@
 module Rails
   module Generators
-    class PerformanceTestGenerator < NamedBase
-      def check_class_collisions
-        class_collisions "#{class_name}Test"
-      end
+    class PerformanceTestGenerator < NamedBase
+      check_class_collision :suffix => "Test"
 
-      def create_test_files
-        template 'performance_test.rb', File.join('test/performance', class_path, "#{file_name}_test.rb")
-      end
-    end
-  end
+      def create_test_files
+        template 'performance_test.rb', File.join('test/performance', class_path, "#{file_name}_test.rb")
+      end
+    end
+  end
 end
diff --git a/railties/lib/generators/rails/plugin/plugin_generator.rb b/railties/lib/generators/rails/plugin/plugin_generator.rb
index c3042afa94..30618bdca0 100644
--- a/railties/lib/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/generators/rails/plugin/plugin_generator.rb
@@ -7,9 +7,7 @@ module Rails
       class_option :with_generator, :type => :boolean, :aliases => "-g", :default => false,
                                     :desc => "When supplied creates generator base files."
 
-      def check_class_collision
-        class_collisions class_name
-      end
+      check_class_collision
 
       def create_root
         self.root = File.expand_path("vendor/plugins/#{file_name}", root)