diff --git a/spec/features/admin/custom_fields/shared_custom_field_expectations.rb b/spec/features/admin/custom_fields/shared_custom_field_expectations.rb
index 8628576adad..348426ca31d 100644
--- a/spec/features/admin/custom_fields/shared_custom_field_expectations.rb
+++ b/spec/features/admin/custom_fields/shared_custom_field_expectations.rb
@@ -29,7 +29,7 @@
 # ++
 
 RSpec.shared_examples_for "list custom fields" do |type|
-  let(:cf_page) { Pages::CustomFields::IndexPage.new }
+  let(:cf_page) { Pages::CustomFields::Index.new }
   let(:user) { create(:admin) }
 
   current_user { user }
@@ -94,7 +94,7 @@ RSpec.shared_examples_for "list custom fields" do |type|
 end
 
 RSpec.shared_examples_for "hierarchy custom fields on index page" do |type|
-  let(:cf_page) { Pages::CustomFields::IndexPage.new }
+  let(:cf_page) { Pages::CustomFields::Index.new }
   let(:user) { create(:admin) }
 
   current_user { user }
@@ -126,7 +126,7 @@ RSpec.shared_examples_for "hierarchy custom fields on index page" do |type|
 end
 
 RSpec.shared_examples_for "expected fields for the custom field's format" do |type, format|
-  let(:cf_page) { Pages::CustomFields::IndexPage.new }
+  let(:cf_page) { Pages::CustomFields::Index.new }
   let(:user) { create(:admin) }
 
   current_user { user }
diff --git a/spec/features/admin/custom_fields/time_entries/list_spec.rb b/spec/features/admin/custom_fields/time_entries/list_spec.rb
index 0ffd856c69a..6eeeae1a23d 100644
--- a/spec/features/admin/custom_fields/time_entries/list_spec.rb
+++ b/spec/features/admin/custom_fields/time_entries/list_spec.rb
@@ -34,8 +34,8 @@ require_relative "../shared_custom_field_expectations"
 RSpec.describe "List custom fields edit", :js do
   shared_let(:admin) { create(:admin) }
 
-  let(:index_cf_page) { Pages::CustomFields::IndexPage.new }
-  let(:new_cf_page) { Pages::CustomFields::NewPage.new }
+  let(:index_cf_page) { Pages::CustomFields::Index.new }
+  let(:new_cf_page) { Pages::CustomFields::New.new }
 
   current_user { admin }
 
diff --git a/spec/features/admin/custom_fields/work_packages/boolean_spec.rb b/spec/features/admin/custom_fields/work_packages/boolean_spec.rb
index b0aab4f1a33..120884564e1 100644
--- a/spec/features/admin/custom_fields/work_packages/boolean_spec.rb
+++ b/spec/features/admin/custom_fields/work_packages/boolean_spec.rb
@@ -33,7 +33,7 @@ require "support/pages/custom_fields/index_page"
 
 RSpec.describe "custom fields", :js do
   shared_let(:user) { create(:admin) }
-  let(:cf_page) { Pages::CustomFields::IndexPage.new }
+  let(:cf_page) { Pages::CustomFields::Index.new }
 
   current_user { user }
 
diff --git a/spec/features/admin/custom_fields/work_packages/date_spec.rb b/spec/features/admin/custom_fields/work_packages/date_spec.rb
index 0da7288c894..3f5a4aef7b7 100644
--- a/spec/features/admin/custom_fields/work_packages/date_spec.rb
+++ b/spec/features/admin/custom_fields/work_packages/date_spec.rb
@@ -33,7 +33,7 @@ require "support/pages/custom_fields/index_page"
 
 RSpec.describe "custom fields", :js do
   let(:user) { create(:admin) }
-  let(:cf_page) { Pages::CustomFields::IndexPage.new }
+  let(:cf_page) { Pages::CustomFields::Index.new }
 
   current_user { user }
 
diff --git a/spec/features/admin/custom_fields/work_packages/float_spec.rb b/spec/features/admin/custom_fields/work_packages/float_spec.rb
index c5a371dfd8a..e6658560574 100644
--- a/spec/features/admin/custom_fields/work_packages/float_spec.rb
+++ b/spec/features/admin/custom_fields/work_packages/float_spec.rb
@@ -33,7 +33,7 @@ require "support/pages/custom_fields/index_page"
 
 RSpec.describe "custom fields", :js do
   let(:user) { create(:admin) }
-  let(:cf_page) { Pages::CustomFields::IndexPage.new }
+  let(:cf_page) { Pages::CustomFields::Index.new }
 
   current_user { user }
 
diff --git a/spec/features/admin/custom_fields/work_packages/hierarchy_spec.rb b/spec/features/admin/custom_fields/work_packages/hierarchy_spec.rb
index 24904b71eeb..a35d120c44b 100644
--- a/spec/features/admin/custom_fields/work_packages/hierarchy_spec.rb
+++ b/spec/features/admin/custom_fields/work_packages/hierarchy_spec.rb
@@ -33,9 +33,9 @@ require_relative "../shared_custom_field_expectations"
 
 RSpec.describe "work package custom fields of type hierarchy", :js do
   shared_let(:admin) { create(:admin) }
-  let(:custom_field_index_page) { Pages::CustomFields::IndexPage.new }
-  let(:new_custom_field_page) { Pages::CustomFields::NewPage.new }
-  let(:hierarchy_page) { Pages::CustomFields::HierarchyPage.new }
+  let(:custom_field_index_page) { Pages::CustomFields::Index.new }
+  let(:new_custom_field_page) { Pages::CustomFields::New.new }
+  let(:hierarchy_page) { Pages::CustomFields::Hierarchy.new }
 
   current_user { admin }
 
diff --git a/spec/features/admin/custom_fields/work_packages/int_spec.rb b/spec/features/admin/custom_fields/work_packages/int_spec.rb
index 19a48e0999f..4939d11854c 100644
--- a/spec/features/admin/custom_fields/work_packages/int_spec.rb
+++ b/spec/features/admin/custom_fields/work_packages/int_spec.rb
@@ -33,7 +33,7 @@ require "support/pages/custom_fields/index_page"
 
 RSpec.describe "custom fields", :js do
   let(:user) { create(:admin) }
-  let(:cf_page) { Pages::CustomFields::IndexPage.new }
+  let(:cf_page) { Pages::CustomFields::Index.new }
 
   current_user { user }
 
diff --git a/spec/features/admin/custom_fields/work_packages/link_spec.rb b/spec/features/admin/custom_fields/work_packages/link_spec.rb
index b09bd8f37d7..aa6db1b2246 100644
--- a/spec/features/admin/custom_fields/work_packages/link_spec.rb
+++ b/spec/features/admin/custom_fields/work_packages/link_spec.rb
@@ -32,7 +32,7 @@ require "spec_helper"
 
 RSpec.describe "Link custom fields edit", :js do
   shared_let(:admin) { create(:admin) }
-  let(:cf_page) { Pages::CustomFields::IndexPage.new }
+  let(:cf_page) { Pages::CustomFields::Index.new }
 
   current_user { admin }
 
diff --git a/spec/features/admin/custom_fields/work_packages/list_spec.rb b/spec/features/admin/custom_fields/work_packages/list_spec.rb
index d931766d75c..2ab99fd0104 100644
--- a/spec/features/admin/custom_fields/work_packages/list_spec.rb
+++ b/spec/features/admin/custom_fields/work_packages/list_spec.rb
@@ -33,7 +33,7 @@ require "support/pages/custom_fields/index_page"
 
 RSpec.describe "work package list custom fields", :js do
   let(:user) { create(:admin) }
-  let(:cf_page) { Pages::CustomFields::IndexPage.new }
+  let(:cf_page) { Pages::CustomFields::Index.new }
 
   before do
     login_as user
diff --git a/spec/features/admin/custom_fields/work_packages/long_text_spec.rb b/spec/features/admin/custom_fields/work_packages/long_text_spec.rb
index d8c8ccd018a..2683fab5fa9 100644
--- a/spec/features/admin/custom_fields/work_packages/long_text_spec.rb
+++ b/spec/features/admin/custom_fields/work_packages/long_text_spec.rb
@@ -5,7 +5,7 @@ require "support/pages/custom_fields/index_page"
 
 RSpec.describe "custom fields", :js do
   let(:user) { create(:admin) }
-  let(:cf_page) { Pages::CustomFields::IndexPage.new }
+  let(:cf_page) { Pages::CustomFields::Index.new }
   let(:editor) { Components::WysiwygEditor.new "#custom_field_form" }
   let(:type) { create(:type_task) }
   let!(:project) { create(:project, enabled_module_names: %i[work_package_tracking], types: [type]) }
diff --git a/spec/features/admin/custom_fields/work_packages/multi_value_list_spec.rb b/spec/features/admin/custom_fields/work_packages/multi_value_list_spec.rb
index 69bc59c2aeb..678b6bace72 100644
--- a/spec/features/admin/custom_fields/work_packages/multi_value_list_spec.rb
+++ b/spec/features/admin/custom_fields/work_packages/multi_value_list_spec.rb
@@ -33,7 +33,7 @@ require "spec_helper"
 RSpec.describe "Multi-value custom fields creation", :js, :selenium do
   shared_let(:admin) { create(:admin) }
 
-  let(:index_cf_page) { Pages::CustomFields::IndexPage.new }
+  let(:index_cf_page) { Pages::CustomFields::Index.new }
 
   current_user { admin }
 
diff --git a/spec/features/admin/custom_fields/work_packages/user_spec.rb b/spec/features/admin/custom_fields/work_packages/user_spec.rb
index 7d9b9e3b4eb..d067627fbdb 100644
--- a/spec/features/admin/custom_fields/work_packages/user_spec.rb
+++ b/spec/features/admin/custom_fields/work_packages/user_spec.rb
@@ -32,8 +32,8 @@ require "spec_helper"
 
 RSpec.describe "User custom fields edit", :js do
   shared_let(:admin) { create(:admin) }
-  let(:index_cf_page) { Pages::CustomFields::IndexPage.new }
-  let(:new_cf_page) { Pages::CustomFields::NewPage.new }
+  let(:index_cf_page) { Pages::CustomFields::Index.new }
+  let(:new_cf_page) { Pages::CustomFields::New.new }
 
   current_user { admin }
 
diff --git a/spec/features/custom_fields/activate_in_project_spec.rb b/spec/features/custom_fields/activate_in_project_spec.rb
index dcf248eeb3b..87081e14dc2 100644
--- a/spec/features/custom_fields/activate_in_project_spec.rb
+++ b/spec/features/custom_fields/activate_in_project_spec.rb
@@ -33,7 +33,7 @@ require "support/pages/custom_fields/index_page"
 
 RSpec.describe "custom fields", :js do
   let(:user) { create(:admin) }
-  let(:cf_page) { Pages::CustomFields::IndexPage.new }
+  let(:cf_page) { Pages::CustomFields::Index.new }
   let(:for_all_cf) { create(:list_wp_custom_field, is_for_all: true) }
   let(:project_specific_cf) { create(:integer_wp_custom_field) }
   let(:work_package) do
diff --git a/spec/features/custom_fields/reorder_options_spec.rb b/spec/features/custom_fields/reorder_options_spec.rb
index b3b9654c03d..d094bfe69bb 100644
--- a/spec/features/custom_fields/reorder_options_spec.rb
+++ b/spec/features/custom_fields/reorder_options_spec.rb
@@ -17,7 +17,7 @@ end
 
 RSpec.describe "Reordering custom options of a list custom field", :js, :selenium do
   let(:user) { create(:admin) }
-  let(:cf_page) { Pages::CustomFields::IndexPage.new }
+  let(:cf_page) { Pages::CustomFields::Index.new }
 
   let!(:custom_field) do
     create(
diff --git a/spec/features/users/password_change_spec.rb b/spec/features/users/password_change_spec.rb
index 0f8462ff1b1..93e0c4c1d11 100644
--- a/spec/features/users/password_change_spec.rb
+++ b/spec/features/users/password_change_spec.rb
@@ -166,7 +166,7 @@ RSpec.describe "random password generation", :js do
   end
 
   context "as a user on his my page" do
-    let(:user_page) { Pages::My::PasswordPage.new }
+    let(:user_page) { Pages::My::Password.new }
     let(:third_password) { "third_Password!123" }
 
     before do
diff --git a/spec/support/pages/admin/settings/project_custom_fields/index.rb b/spec/support/pages/admin/settings/project_custom_fields/index.rb
index aafa65b4d01..35dcd02385c 100644
--- a/spec/support/pages/admin/settings/project_custom_fields/index.rb
+++ b/spec/support/pages/admin/settings/project_custom_fields/index.rb
@@ -28,13 +28,13 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-require "support/pages/custom_fields/index_page"
+require "support/pages/custom_fields/index"
 
 module Pages
   module Admin
     module Settings
       module ProjectCustomFields
-        class Index < ::Pages::CustomFields::IndexPage
+        class Index < ::Pages::CustomFields::Index
           def path
             "/admin/settings/project_custom_fields"
           end
diff --git a/spec/support/pages/custom_fields/hierarchy_page.rb b/spec/support/pages/custom_fields/hierarchy.rb
similarity index 98%
rename from spec/support/pages/custom_fields/hierarchy_page.rb
rename to spec/support/pages/custom_fields/hierarchy.rb
index 1e9860fd5aa..1ef9de48665 100644
--- a/spec/support/pages/custom_fields/hierarchy_page.rb
+++ b/spec/support/pages/custom_fields/hierarchy.rb
@@ -32,7 +32,7 @@ require "support/pages/page"
 
 module Pages
   module CustomFields
-    class HierarchyPage < Page
+    class Hierarchy < Page
       def path
         case @tab
         when "items"
diff --git a/spec/support/pages/custom_fields/index_page.rb b/spec/support/pages/custom_fields/index.rb
similarity index 98%
rename from spec/support/pages/custom_fields/index_page.rb
rename to spec/support/pages/custom_fields/index.rb
index 54bfebb2b24..ec56acdf9e9 100644
--- a/spec/support/pages/custom_fields/index_page.rb
+++ b/spec/support/pages/custom_fields/index.rb
@@ -32,7 +32,7 @@ require "support/pages/page"
 
 module Pages
   module CustomFields
-    class IndexPage < Page
+    class Index < Page
       def path
         "/custom_fields"
       end
diff --git a/spec/support/pages/custom_fields/new_page.rb b/spec/support/pages/custom_fields/new.rb
similarity index 98%
rename from spec/support/pages/custom_fields/new_page.rb
rename to spec/support/pages/custom_fields/new.rb
index 4f74040d6ae..c76e8ec1dcd 100644
--- a/spec/support/pages/custom_fields/new_page.rb
+++ b/spec/support/pages/custom_fields/new.rb
@@ -32,7 +32,7 @@ require "support/pages/page"
 
 module Pages
   module CustomFields
-    class NewPage < Page
+    class New < Page
       def path
         "/custom_fields/new?type=#{@type}"
       end
diff --git a/spec/support/pages/my/password_page.rb b/spec/support/pages/my/password.rb
similarity index 98%
rename from spec/support/pages/my/password_page.rb
rename to spec/support/pages/my/password.rb
index 4a49df82b68..5b5797ead9f 100644
--- a/spec/support/pages/my/password_page.rb
+++ b/spec/support/pages/my/password.rb
@@ -32,7 +32,7 @@ require "support/pages/page"
 
 module Pages
   module My
-    class PasswordPage < ::Pages::Page
+    class Password < ::Pages::Page
       def path
         "/my/password"
       end