diff --git a/features/generator_specs/generator_specs.feature b/features/generator_specs/generator_specs.feature
index 2f9da13e5e..c5a00c40b4 100644
--- a/features/generator_specs/generator_specs.feature
+++ b/features/generator_specs/generator_specs.feature
@@ -12,7 +12,7 @@ Feature: Generator spec
             create  lib/generators/my_generator/USAGE
             create  lib/generators/my_generator/templates
             invoke  rspec
-            create    spec/generator/my_generators_generator_spec.rb
+            create    spec/generator/my_generator_generator_spec.rb
       """
 
   Scenario: Use custom generator with customized `default-path`
@@ -29,5 +29,5 @@ Feature: Generator spec
             create  lib/generators/my_generator/USAGE
             create  lib/generators/my_generator/templates
             invoke  rspec
-            create    behaviour/generator/my_generators_generator_spec.rb
+            create    behaviour/generator/my_generator_generator_spec.rb
       """
diff --git a/lib/generators/rspec/generator/generator_generator.rb b/lib/generators/rspec/generator/generator_generator.rb
index 40118e83a2..76228ee185 100644
--- a/lib/generators/rspec/generator/generator_generator.rb
+++ b/lib/generators/rspec/generator/generator_generator.rb
@@ -4,7 +4,7 @@ module Rspec
   module Generators
     # @private
     class GeneratorGenerator < Base
-      class_option :generator_specs, type: :boolean, default: true,  desc: "Generate generator specs"
+      class_option :generator_specs, type: :boolean, default: true, desc: 'Generate generator specs'
 
       def generate_generator_spec
         return unless options[:generator_specs]
@@ -17,7 +17,7 @@ def template_name
       end
 
       def filename
-        "#{table_name}_generator_spec.rb"
+        "#{file_name}_generator_spec.rb"
       end
     end
   end
diff --git a/lib/generators/rspec/generator/templates/generator_spec.rb b/lib/generators/rspec/generator/templates/generator_spec.rb
index 146713908d..e755cddf7b 100644
--- a/lib/generators/rspec/generator/templates/generator_spec.rb
+++ b/lib/generators/rspec/generator/templates/generator_spec.rb
@@ -1,6 +1,5 @@
 require 'rails_helper'
 
-RSpec.describe "<%= class_name.pluralize %>", <%= type_metatag(:generator) %> do
-
+RSpec.describe "<%= class_name %>Generator", <%= type_metatag(:generator) %> do
   pending "add some scenarios (or delete) #{__FILE__}"
 end
diff --git a/spec/generators/rspec/generator/generator_generator_spec.rb b/spec/generators/rspec/generator/generator_generator_spec.rb
index 79ea4b51b8..090fc00fdb 100644
--- a/spec/generators/rspec/generator/generator_generator_spec.rb
+++ b/spec/generators/rspec/generator/generator_generator_spec.rb
@@ -11,7 +11,7 @@
     end
 
     it "include the standard boilerplate" do
-      expect(generator_spec).to contain(/require 'rails_helper'/).and(contain(/^RSpec.describe "Posts", #{type_metatag(:generator)}/))
+      expect(generator_spec).to contain(/require 'rails_helper'/).and(contain(/^RSpec.describe "PostsGenerator", #{type_metatag(:generator)}/))
     end
   end
 end