diff --git a/NEWS.md b/NEWS.md
index 29334088f..ffbcd6a04 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -18,9 +18,9 @@ Unreleased
 * Introduce `suspenders:prerequisites` generator
 * Introduce `suspenders:ci` generator
 * Introduce `suspenders:cleanup:organize_gemfile` task
-* Introduce `suspenders:production:environment` generator
-* Introduce `suspenders:test:environment` generator
-* Introduce `suspenders:development:environment` generator
+* Introduce `suspenders:environments:production` generator
+* Introduce `suspenders:environments:test` generator
+* Introduce `suspenders:environments:development` generator
 
 20230113.0 (January, 13, 2023)
 
diff --git a/README.md b/README.md
index f524a07fd..211ade75a 100644
--- a/README.md
+++ b/README.md
@@ -203,7 +203,11 @@ bin/rails g suspenders:ci
 
 Configures the production environment.
 
- - Enables [require_master_key][]
+```
+bin/rails g suspenders:evironments:production
+```
+
+- Enables [require_master_key][]
 
 [require_master_key]: https://guides.rubyonrails.org/configuring.html#config-require-master-key
 
@@ -213,7 +217,7 @@ Configures the production environment.
 Configures test environment.
 
 ```
-bin/rails g suspenders:test:environment
+bin/rails g suspenders:environments:test
 ```
 
 - Enables [raise_on_missing_translations][]
@@ -227,7 +231,7 @@ bin/rails g suspenders:test:environment
 Configures the development environment.
 
 ```
-bin/rails g suspenders:development:evironment
+bin/rails g suspenders:evironments:development
 ```
 
 - Enables [raise_on_missing_translations][]
diff --git a/lib/generators/suspenders/development/environment_generator.rb b/lib/generators/suspenders/environments/development_generator.rb
similarity index 96%
rename from lib/generators/suspenders/development/environment_generator.rb
rename to lib/generators/suspenders/environments/development_generator.rb
index 4985b100b..95a8ddb80 100644
--- a/lib/generators/suspenders/development/environment_generator.rb
+++ b/lib/generators/suspenders/environments/development_generator.rb
@@ -1,7 +1,7 @@
 module Suspenders
   module Generators
-    module Development
-      class EnvironmentGenerator < Rails::Generators::Base
+    module Environments
+      class DevelopmentGenerator < Rails::Generators::Base
         desc <<~MARKDOWN
           Configures the development environment.
 
diff --git a/lib/generators/suspenders/production/environment_generator.rb b/lib/generators/suspenders/environments/production_generator.rb
similarity index 90%
rename from lib/generators/suspenders/production/environment_generator.rb
rename to lib/generators/suspenders/environments/production_generator.rb
index ee5309e99..f9ed7cd4c 100644
--- a/lib/generators/suspenders/production/environment_generator.rb
+++ b/lib/generators/suspenders/environments/production_generator.rb
@@ -1,7 +1,7 @@
 module Suspenders
   module Generators
-    module Production
-      class EnvironmentGenerator < Rails::Generators::Base
+    module Environments
+      class ProductionGenerator < Rails::Generators::Base
         desc <<~MARKDOWN
           Configures the production environment.
 
diff --git a/lib/generators/suspenders/test/environment_generator.rb b/lib/generators/suspenders/environments/test_generator.rb
similarity index 95%
rename from lib/generators/suspenders/test/environment_generator.rb
rename to lib/generators/suspenders/environments/test_generator.rb
index 8cbba471c..80dc6bff6 100644
--- a/lib/generators/suspenders/test/environment_generator.rb
+++ b/lib/generators/suspenders/environments/test_generator.rb
@@ -1,7 +1,7 @@
 module Suspenders
   module Generators
-    module Test
-      class EnvironmentGenerator < Rails::Generators::Base
+    module Environments
+      class TestGenerator < Rails::Generators::Base
         desc <<~MARKDOWN
           Configures test environment.
 
diff --git a/test/generators/suspenders/development/environment_generator_test.rb b/test/generators/suspenders/environments/development_generator_test.rb
similarity index 92%
rename from test/generators/suspenders/development/environment_generator_test.rb
rename to test/generators/suspenders/environments/development_generator_test.rb
index c4065c208..ef594657a 100644
--- a/test/generators/suspenders/development/environment_generator_test.rb
+++ b/test/generators/suspenders/environments/development_generator_test.rb
@@ -1,13 +1,13 @@
 require "test_helper"
-require "generators/suspenders/development/environment_generator"
+require "generators/suspenders/environments/development_generator"
 
 module Suspenders
   module Generators
-    module Development
-      class EnvironmentGenerator::DefaultTest < Rails::Generators::TestCase
+    module Environments
+      class DevelopmentGenerator::DefaultTest < Rails::Generators::TestCase
         include Suspenders::TestHelpers
 
-        tests Suspenders::Generators::Development::EnvironmentGenerator
+        tests Suspenders::Generators::Environments::DevelopmentGenerator
         destination Rails.root
         setup :prepare_destination
         teardown :restore_destination
diff --git a/test/generators/suspenders/production/environment_generator_test.rb b/test/generators/suspenders/environments/production_generator_test.rb
similarity index 83%
rename from test/generators/suspenders/production/environment_generator_test.rb
rename to test/generators/suspenders/environments/production_generator_test.rb
index 1e69714e7..79082ca4e 100644
--- a/test/generators/suspenders/production/environment_generator_test.rb
+++ b/test/generators/suspenders/environments/production_generator_test.rb
@@ -1,13 +1,13 @@
 require "test_helper"
-require "generators/suspenders/production/environment_generator"
+require "generators/suspenders/environments/production_generator"
 
 module Suspenders
   module Generators
-    module Production
-      class EnvironmentGeneratorTest < Rails::Generators::TestCase
+    module Environments
+      class ProductionGeneratorTest < Rails::Generators::TestCase
         include Suspenders::TestHelpers
 
-        tests Suspenders::Generators::Production::EnvironmentGenerator
+        tests Suspenders::Generators::Environments::ProductionGenerator
         destination Rails.root
         setup :prepare_destination
         teardown :restore_destination
diff --git a/test/generators/suspenders/test/environment_generator_test.rb b/test/generators/suspenders/environments/test_generator_test.rb
similarity index 91%
rename from test/generators/suspenders/test/environment_generator_test.rb
rename to test/generators/suspenders/environments/test_generator_test.rb
index ba294c56f..6e31e48e0 100644
--- a/test/generators/suspenders/test/environment_generator_test.rb
+++ b/test/generators/suspenders/environments/test_generator_test.rb
@@ -1,13 +1,13 @@
 require "test_helper"
-require "generators/suspenders/test/environment_generator"
+require "generators/suspenders/environments/test_generator"
 
 module Suspenders
   module Generators
-    module Test
-      class EnvironmentGeneratorTest < Rails::Generators::TestCase
+    module Environments
+      class TestGeneratorTest < Rails::Generators::TestCase
         include Suspenders::TestHelpers
 
-        tests Suspenders::Generators::Test::EnvironmentGenerator
+        tests Suspenders::Generators::Environments::TestGenerator
         destination Rails.root
         setup :prepare_destination
         teardown :restore_destination