diff --git a/modules/backlogs/spec/features/backlogs_in_backlog_view_spec.rb b/modules/backlogs/spec/features/backlogs_in_backlog_view_spec.rb
index b583338c3375..b1492fbfafd4 100644
--- a/modules/backlogs/spec/features/backlogs_in_backlog_view_spec.rb
+++ b/modules/backlogs/spec/features/backlogs_in_backlog_view_spec.rb
@@ -185,7 +185,7 @@
 
     click_button "Save"
 
-    expect_and_dismiss_primerized_flash(message: "Successful update.")
+    expect_and_dismiss_flash(message: "Successful update.")
 
     backlogs_page
       .expect_backlog(sprint)
@@ -205,7 +205,7 @@
 
     click_button "Save"
 
-    expect_and_dismiss_primerized_flash(message: "Successful update.")
+    expect_and_dismiss_flash(message: "Successful update.")
 
     # Now works as a sprint instead of a backlog
     backlogs_page
@@ -226,7 +226,7 @@
 
     click_button "Save"
 
-    expect_and_dismiss_primerized_flash(message: "Successful update.")
+    expect_and_dismiss_flash(message: "Successful update.")
 
     # the disabled backlog/sprint is no longer visible
     expect(page)
@@ -247,7 +247,7 @@
 
     click_button "Save"
 
-    expect_and_dismiss_primerized_flash(message: "Successful update.")
+    expect_and_dismiss_flash(message: "Successful update.")
 
     # the disabled backlog/sprint is no longer visible
     expect(page)
diff --git a/modules/bim/spec/features/bcf/api_authorization_spec.rb b/modules/bim/spec/features/bcf/api_authorization_spec.rb
index 620127b53262..735022ec53f5 100644
--- a/modules/bim/spec/features/bcf/api_authorization_spec.rb
+++ b/modules/bim/spec/features/bcf/api_authorization_spec.rb
@@ -61,7 +61,7 @@ def oauth_path(client_id)
     fill_in "application_redirect_uri", with: "urn:ietf:wg:oauth:2.0:oob\nhttps://localhost/my/callback"
     click_on "Create"
 
-    expect_primerized_flash(message: "Successful creation.")
+    expect_flash(message: "Successful creation.")
 
     expect(page).to have_css(".attributes-key-value--key",
                              text: "Client ID")
diff --git a/modules/bim/spec/features/card_view/bulk_actions_spec.rb b/modules/bim/spec/features/card_view/bulk_actions_spec.rb
index a861c3a40e95..58b66be2ef38 100644
--- a/modules/bim/spec/features/card_view/bulk_actions_spec.rb
+++ b/modules/bim/spec/features/card_view/bulk_actions_spec.rb
@@ -103,7 +103,7 @@
 
           select budget.subject, from: "work_package_budget_id"
           click_on "Submit"
-          expect_and_dismiss_primerized_flash message: "Successful update."
+          expect_and_dismiss_flash message: "Successful update."
 
           expect(work_package.reload.budget_id).to eq(budget.id)
           expect(work_package2.reload.budget_id).to eq(budget.id)
diff --git a/modules/bim/spec/features/model_management_spec.rb b/modules/bim/spec/features/model_management_spec.rb
index 919d9f9874a7..e484c9e9bd7a 100644
--- a/modules/bim/spec/features/model_management_spec.rb
+++ b/modules/bim/spec/features/model_management_spec.rb
@@ -130,7 +130,7 @@
 
     it "I can't see any models and perform no actions" do
       expected = "[Error 403] You are not authorized to access this page."
-      expect_primerized_flash(type: :error, message: expected)
+      expect_flash(type: :error, message: expected)
 
       index_page.add_model_allowed false
     end
diff --git a/modules/bim/spec/features/model_viewer_spec.rb b/modules/bim/spec/features/model_viewer_spec.rb
index 4229b29e9591..7fb1247de589 100644
--- a/modules/bim/spec/features/model_viewer_spec.rb
+++ b/modules/bim/spec/features/model_viewer_spec.rb
@@ -135,7 +135,7 @@
 
     it "shows no viewer" do
       expected = "[Error 403] You are not authorized to access this page."
-      expect_primerized_flash(type: :error, message: expected)
+      expect_flash(type: :error, message: expected)
 
       show_model_page.model_viewer_visible false
       show_model_page.model_viewer_shows_a_toolbar false
diff --git a/modules/boards/spec/features/board_management_spec.rb b/modules/boards/spec/features/board_management_spec.rb
index 2c1c691e1552..b9b2acf501c2 100644
--- a/modules/boards/spec/features/board_management_spec.rb
+++ b/modules/boards/spec/features/board_management_spec.rb
@@ -300,7 +300,7 @@
 
     it "does not allow viewing of boards" do
       visit project_work_package_board_path(project, board_view)
-      expect_primerized_flash(type: :error, message: I18n.t(:notice_not_authorized))
+      expect_flash(type: :error, message: I18n.t(:notice_not_authorized))
 
       board_index.expect_editable false
     end
@@ -311,7 +311,7 @@
 
     it "does not allow viewing of boards" do
       board_index.visit!
-      expect_primerized_flash(type: :error, message: I18n.t(:notice_not_authorized))
+      expect_flash(type: :error, message: I18n.t(:notice_not_authorized))
     end
   end
 end
diff --git a/modules/boards/spec/features/boards_global_create_spec.rb b/modules/boards/spec/features/boards_global_create_spec.rb
index 4f89197bfe8e..c0cee1e483c4 100644
--- a/modules/boards/spec/features/boards_global_create_spec.rb
+++ b/modules/boards/spec/features/boards_global_create_spec.rb
@@ -195,8 +195,8 @@
           it "renders a required attribute validation error" do
             expect(Boards::Grid.all).to be_empty
 
-            expect_primerized_flash message: "Project #{I18n.t('activerecord.errors.messages.blank')}",
-                                    type: :error
+            expect_flash message: "Project #{I18n.t('activerecord.errors.messages.blank')}",
+                         type: :error
 
             new_board_page.expect_project_dropdown
           end
diff --git a/modules/boards/spec/features/support/board_index_page.rb b/modules/boards/spec/features/support/board_index_page.rb
index a775e63c0a57..96083f2371c8 100644
--- a/modules/boards/spec/features/support/board_index_page.rb
+++ b/modules/boards/spec/features/support/board_index_page.rb
@@ -72,7 +72,7 @@ def create_board(action: "Basic", title: "#{action} Board", expect_empty: false,
       new_board_page.set_board_type action
       new_board_page.click_on_submit
 
-      expect_and_dismiss_primerized_flash(message: I18n.t(:notice_successful_create))
+      expect_and_dismiss_flash(message: I18n.t(:notice_successful_create))
 
       if expect_empty
         expect(page).to have_css(".boards-list--add-item-text", wait: 10)
diff --git a/modules/boards/spec/features/support/board_page.rb b/modules/boards/spec/features/support/board_page.rb
index 41dc462def96..9afae1daade3 100644
--- a/modules/boards/spec/features/support/board_page.rb
+++ b/modules/boards/spec/features/support/board_page.rb
@@ -284,7 +284,7 @@ def delete_board
       click_dropdown_entry "Delete"
 
       accept_alert_dialog!
-      expect_and_dismiss_primerized_flash message: I18n.t("js.notice_successful_delete")
+      expect_and_dismiss_flash message: I18n.t("js.notice_successful_delete")
     end
 
     def back_to_index
diff --git a/modules/budgets/spec/features/budgets/add_budget_spec.rb b/modules/budgets/spec/features/budgets/add_budget_spec.rb
index 31cb1db2ffea..683cd8c45ac5 100644
--- a/modules/budgets/spec/features/budgets/add_budget_spec.rb
+++ b/modules/budgets/spec/features/budgets/add_budget_spec.rb
@@ -122,7 +122,7 @@
         new_budget_page.add_labor_costs! "0,5", user_name: user.name, comment: "attendance", expected_costs: "12,50 EUR"
 
         page.find('[data-test-selector="budgets-create-button"]').click
-        expect_and_dismiss_primerized_flash(message: I18n.t(:notice_successful_create, locale: :de))
+        expect_and_dismiss_flash(message: I18n.t(:notice_successful_create, locale: :de))
 
         expect(new_budget_page.unit_costs_at(1)).to have_content "175,00 EUR"
         expect(new_budget_page.unit_costs_at(2)).to have_content "50.025,00 EUR"
diff --git a/modules/budgets/spec/features/budgets/attachment_upload_spec.rb b/modules/budgets/spec/features/budgets/attachment_upload_spec.rb
index cc39d82dd9f0..54b5f8068e79 100644
--- a/modules/budgets/spec/features/budgets/attachment_upload_spec.rb
+++ b/modules/budgets/spec/features/budgets/attachment_upload_spec.rb
@@ -59,7 +59,7 @@
 
     click_on "Create"
 
-    expect_and_dismiss_primerized_flash(message: "Successful creation.")
+    expect_and_dismiss_flash(message: "Successful creation.")
 
     expect(page).to have_css("#content img", count: 1)
     expect(page).to have_content("Image uploaded on creation")
@@ -98,7 +98,7 @@
 
     click_on "Create"
 
-    expect_and_dismiss_primerized_flash(message: "Successful creation.")
+    expect_and_dismiss_flash(message: "Successful creation.")
 
     attachments_list.expect_attached("image.png")
 
diff --git a/modules/budgets/spec/features/budgets/copy_budget_spec.rb b/modules/budgets/spec/features/budgets/copy_budget_spec.rb
index 6d327d4aef54..44022d90ad72 100644
--- a/modules/budgets/spec/features/budgets/copy_budget_spec.rb
+++ b/modules/budgets/spec/features/budgets/copy_budget_spec.rb
@@ -88,7 +88,7 @@
 
     click_button "Create"
 
-    expect_primerized_flash message: "Successful creation."
+    expect_flash message: "Successful creation."
 
     expect(page)
       .to have_css(".author", text: current_user.name)
diff --git a/modules/budgets/spec/features/budgets/update_budget_spec.rb b/modules/budgets/spec/features/budgets/update_budget_spec.rb
index 6f56ce8049a1..8958488a8d43 100644
--- a/modules/budgets/spec/features/budgets/update_budget_spec.rb
+++ b/modules/budgets/spec/features/budgets/update_budget_spec.rb
@@ -181,7 +181,7 @@
 
         # Update first element
         budget_page.edit_planned_costs! material_budget_item.id, type: :material, costs: 123
-        expect_and_dismiss_primerized_flash(message: "Successful update")
+        expect_and_dismiss_flash(message: "Successful update")
         expect(page).to have_css("tbody td.currency", text: "123.00 EUR")
 
         click_on "Update"
@@ -218,7 +218,7 @@
 
           # Update first element
           budget_page.edit_planned_costs! material_budget_item.id, type: :material, costs: 123
-          expect_and_dismiss_primerized_flash(message: "Successful update")
+          expect_and_dismiss_flash(message: "Successful update")
           expect(page).to have_css("tbody td.currency", text: "USD 123.00")
 
           click_on "Update"
@@ -258,7 +258,7 @@
 
         # Update first element
         budget_page.edit_planned_costs! labor_budget_item.id, type: :labor, costs: 456
-        expect_and_dismiss_primerized_flash(message: "Successful update")
+        expect_and_dismiss_flash(message: "Successful update")
         expect(page).to have_css("tbody td.currency", text: "456.00 EUR")
 
         click_on "Update"
@@ -295,7 +295,7 @@
 
           # Update first element
           budget_page.edit_planned_costs! labor_budget_item.id, type: :labor, costs: 456
-          expect_and_dismiss_primerized_flash(message: "Successful update")
+          expect_and_dismiss_flash(message: "Successful update")
           expect(page).to have_css("tbody td.currency", text: "USD 456.00")
 
           click_on "Update"
diff --git a/modules/costs/spec/features/cost_entries/add_cost_entry_spec.rb b/modules/costs/spec/features/cost_entries/add_cost_entry_spec.rb
index de2b07cffda5..ed6e6b39dd15 100644
--- a/modules/costs/spec/features/cost_entries/add_cost_entry_spec.rb
+++ b/modules/costs/spec/features/cost_entries/add_cost_entry_spec.rb
@@ -99,7 +99,7 @@
     click_on "Save"
 
     # Expect correct costs
-    expect_primerized_flash(message: I18n.t(:notice_cost_logged_successfully))
+    expect_flash(message: I18n.t(:notice_cost_logged_successfully))
     entry = CostEntry.last
     expect(entry.cost_type_id).to eq(cost_type2.id)
     expect(entry.units).to eq(2.0)
@@ -136,7 +136,7 @@
       click_on I18n.t(:button_save)
 
       # Expect correct costs
-      expect_primerized_flash(message: I18n.t(:notice_cost_logged_successfully))
+      expect_flash(message: I18n.t(:notice_cost_logged_successfully))
       entry = CostEntry.last
       expect(entry.cost_type_id).to eq(cost_type2.id)
       expect(entry.units).to eq(1.42)
diff --git a/modules/costs/spec/features/cost_entries/add_entry_without_rate_permission_spec.rb b/modules/costs/spec/features/cost_entries/add_entry_without_rate_permission_spec.rb
index ce5e0bc12dfa..2b1b59cd0ca5 100644
--- a/modules/costs/spec/features/cost_entries/add_entry_without_rate_permission_spec.rb
+++ b/modules/costs/spec/features/cost_entries/add_entry_without_rate_permission_spec.rb
@@ -77,7 +77,7 @@
     click_on "Save"
 
     # Expect correct costs
-    expect_primerized_flash(message: I18n.t(:notice_cost_logged_successfully))
+    expect_flash(message: I18n.t(:notice_cost_logged_successfully))
     entry = CostEntry.last
     expect(entry.cost_type_id).to eq(cost_type.id)
     expect(entry.units).to eq(1.0)
diff --git a/modules/ldap_groups/spec/features/administration_spec.rb b/modules/ldap_groups/spec/features/administration_spec.rb
index fa2110dbe21c..0f5b5eb6f703 100644
--- a/modules/ldap_groups/spec/features/administration_spec.rb
+++ b/modules/ldap_groups/spec/features/administration_spec.rb
@@ -35,7 +35,7 @@
       check "synchronized_group_sync_users"
 
       click_on "Create"
-      expect_primerized_flash(message: I18n.t(:notice_successful_create))
+      expect_flash(message: I18n.t(:notice_successful_create))
       expect(page).to have_css("td.dn", text: "cn=foo,ou=groups,dc=example,dc=com")
       expect(page).to have_css("td.ldap_auth_source", text: "ldap")
       expect(page).to have_css("td.group", text: "foo")
@@ -69,7 +69,7 @@
       SeleniumHubWaiter.wait
       click_on "Delete"
 
-      expect_primerized_flash(message: I18n.t(:notice_successful_delete))
+      expect_flash(message: I18n.t(:notice_successful_delete))
       expect(page).to have_css ".generic-table--empty-row"
 
       expect(LdapGroups::Membership.where(id: memberships)).to be_empty
diff --git a/modules/meeting/spec/features/meetings_new_spec.rb b/modules/meeting/spec/features/meetings_new_spec.rb
index 9a3fb9991685..27c78bcf99ff 100644
--- a/modules/meeting/spec/features/meetings_new_spec.rb
+++ b/modules/meeting/spec/features/meetings_new_spec.rb
@@ -97,7 +97,7 @@
 
           show_page = new_page.click_create
 
-          expect_primerized_flash(message: "Successful creation.")
+          expect_flash(message: "Successful creation.")
 
           show_page.expect_invited(user, other_user)
 
@@ -143,8 +143,8 @@
         it "renders a validation error" do
           new_page.click_create
 
-          expect_primerized_flash(type: :error,
-                                  message: "#{Project.model_name.human} #{I18n.t('activerecord.errors.messages.blank')}")
+          expect_flash(type: :error,
+                       message: "#{Project.model_name.human} #{I18n.t('activerecord.errors.messages.blank')}")
 
           new_page.expect_project_dropdown
         end
@@ -178,7 +178,7 @@
 
         show_page = new_page.click_create
 
-        expect_primerized_flash(message: "Successful creation.")
+        expect_flash(message: "Successful creation.")
 
         # Not sure if that is then intended behaviour but that is what is currently programmed
         show_page.expect_invited(admin)
@@ -194,7 +194,7 @@
         it "renders a validation error" do
           new_page.click_create
 
-          expect_primerized_flash(
+          expect_flash(
             message: "#{Project.model_name.human} #{I18n.t('activerecord.errors.messages.blank')}",
             type: :error
           )
@@ -256,7 +256,7 @@
 
           show_page = new_page.click_create
 
-          expect_primerized_flash(message: "Successful creation.")
+          expect_flash(message: "Successful creation.")
 
           show_page.expect_invited(user, other_user)
 
@@ -317,7 +317,7 @@
 
         show_page = new_page.click_create
 
-        expect_primerized_flash(message: "Successful creation.")
+        expect_flash(message: "Successful creation.")
 
         # Not sure if that is then intended behaviour but that is what is currently programmed
         show_page.expect_invited(admin)
@@ -346,7 +346,7 @@
 
         new_page.click_create
 
-        expect_primerized_flash(message: "Successful creation.")
+        expect_flash(message: "Successful creation.")
 
         meeting = Meeting.last
 
@@ -354,7 +354,7 @@
 
         field.submit_by_enter
 
-        expect_primerized_flash(message: "Successful update")
+        expect_flash(message: "Successful update")
 
         meeting.reload
 
diff --git a/modules/meeting/spec/features/meetings_participants_spec.rb b/modules/meeting/spec/features/meetings_participants_spec.rb
index fb368810e166..df46446df81a 100644
--- a/modules/meeting/spec/features/meetings_participants_spec.rb
+++ b/modules/meeting/spec/features/meetings_participants_spec.rb
@@ -64,7 +64,7 @@
 
     edit_page.invite(viewer_user)
     show_page = edit_page.click_save
-    expect_primerized_flash(message: "Successful update")
+    expect_flash(message: "Successful update")
 
     show_page.expect_invited(viewer_user)
 
diff --git a/modules/meeting/spec/features/meetings_show_spec.rb b/modules/meeting/spec/features/meetings_show_spec.rb
index 467abb62ed8c..b44313f9d6dd 100644
--- a/modules/meeting/spec/features/meetings_show_spec.rb
+++ b/modules/meeting/spec/features/meetings_show_spec.rb
@@ -126,7 +126,7 @@
 
           field.submit_by_enter
 
-          expect_and_dismiss_primerized_flash(message: "Successful update")
+          expect_and_dismiss_flash(message: "Successful update")
 
           meeting.reload
 
diff --git a/modules/meeting/spec/features/structured_meetings/history_spec.rb b/modules/meeting/spec/features/structured_meetings/history_spec.rb
index e2fb2aac8665..cebda965037d 100644
--- a/modules/meeting/spec/features/structured_meetings/history_spec.rb
+++ b/modules/meeting/spec/features/structured_meetings/history_spec.rb
@@ -355,6 +355,6 @@
     visit history_meeting_path(meeting)
 
     expected = "[Error 403] You are not authorized to access this page."
-    expect_primerized_flash(type: :error, message: expected)
+    expect_flash(type: :error, message: expected)
   end
 end
diff --git a/modules/reporting/spec/features/support/components/cost_reports_base_table.rb b/modules/reporting/spec/features/support/components/cost_reports_base_table.rb
index d2ce032bc978..88611e39871a 100644
--- a/modules/reporting/spec/features/support/components/cost_reports_base_table.rb
+++ b/modules/reporting/spec/features/support/components/cost_reports_base_table.rb
@@ -26,7 +26,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-require "support/primerized_flash/expectations"
+require "support/flash/expectations"
 
 module Components
   class CostReportsBaseTable
@@ -81,7 +81,7 @@ def edit_cost_entry(new_value, row, cost_entry_id)
       SeleniumHubWaiter.wait
       fill_in("cost_entry_units", with: new_value)
       click_button "Save"
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
     end
 
     def delete_entry(row)
diff --git a/modules/two_factor_authentication/spec/features/account_activation_spec.rb b/modules/two_factor_authentication/spec/features/account_activation_spec.rb
index 111c2bf10e2d..78c2a665a0a3 100644
--- a/modules/two_factor_authentication/spec/features/account_activation_spec.rb
+++ b/modules/two_factor_authentication/spec/features/account_activation_spec.rb
@@ -50,7 +50,7 @@ def activate!
 
       activate!
 
-      expect_primerized_flash(message: "Developer strategy generated the following one-time password:")
+      expect_flash(message: "Developer strategy generated the following one-time password:")
 
       SeleniumHubWaiter.wait
       fill_in I18n.t(:field_otp), with: sms_token
@@ -63,7 +63,7 @@ def activate!
     it "handles faulty user input on two factor authentication" do
       activate!
 
-      expect_primerized_flash(message: "Developer strategy generated the following one-time password:")
+      expect_flash(message: "Developer strategy generated the following one-time password:")
 
       fill_in I18n.t(:field_otp), with: "asdf" # faulty token
       click_button I18n.t(:button_login)
diff --git a/modules/two_factor_authentication/spec/features/admin_edit_two_factor_devices_spec.rb b/modules/two_factor_authentication/spec/features/admin_edit_two_factor_devices_spec.rb
index 68ad1f662a9d..1166c3987a9f 100644
--- a/modules/two_factor_authentication/spec/features/admin_edit_two_factor_devices_spec.rb
+++ b/modules/two_factor_authentication/spec/features/admin_edit_two_factor_devices_spec.rb
@@ -44,7 +44,7 @@
     click_button I18n.t(:button_continue)
 
     # Enter valid phone number
-    expect_primerized_flash(type: :error, message: "Phone number must be of format +XX XXXXXXXXX")
+    expect_flash(type: :error, message: "Phone number must be of format +XX XXXXXXXXX")
 
     SeleniumHubWaiter.wait
     fill_in "device_phone_number", with: "+49 123456789"
diff --git a/modules/two_factor_authentication/spec/features/backup_codes/login_with_backup_code_spec.rb b/modules/two_factor_authentication/spec/features/backup_codes/login_with_backup_code_spec.rb
index d678b2ea7830..3d97bc10120a 100644
--- a/modules/two_factor_authentication/spec/features/backup_codes/login_with_backup_code_spec.rb
+++ b/modules/two_factor_authentication/spec/features/backup_codes/login_with_backup_code_spec.rb
@@ -50,7 +50,7 @@
       click_on "Submit"
 
       # Expect failure
-      expect_primerized_flash(type: :error, message: I18n.t("two_factor_authentication.error_invalid_backup_code"))
+      expect_flash(type: :error, message: I18n.t("two_factor_authentication.error_invalid_backup_code"))
       expect(page).to have_current_path signin_path
 
       # Try again!
diff --git a/modules/two_factor_authentication/spec/features/login/login_enforced_2fa_spec.rb b/modules/two_factor_authentication/spec/features/login/login_enforced_2fa_spec.rb
index d09c7a613aeb..effabe6acc28 100644
--- a/modules/two_factor_authentication/spec/features/login/login_enforced_2fa_spec.rb
+++ b/modules/two_factor_authentication/spec/features/login/login_enforced_2fa_spec.rb
@@ -36,7 +36,7 @@
       first_login_step
       two_factor_step("whatever")
 
-      expect_primerized_flash(type: :error, message: I18n.t(:notice_account_otp_invalid))
+      expect_flash(type: :error, message: I18n.t(:notice_account_otp_invalid))
       expect(page).to have_current_path signin_path
     end
   end
diff --git a/modules/two_factor_authentication/spec/features/login/login_with_2fa_spec.rb b/modules/two_factor_authentication/spec/features/login/login_with_2fa_spec.rb
index dac190b49073..c1ea54731795 100644
--- a/modules/two_factor_authentication/spec/features/login/login_with_2fa_spec.rb
+++ b/modules/two_factor_authentication/spec/features/login/login_with_2fa_spec.rb
@@ -35,7 +35,7 @@
       first_login_step
       two_factor_step("whatever")
 
-      expect_primerized_flash(type: :error, message: I18n.t(:notice_account_otp_invalid))
+      expect_flash(type: :error, message: I18n.t(:notice_account_otp_invalid))
       expect(page).to have_current_path signin_path
     end
   end
diff --git a/modules/two_factor_authentication/spec/features/my_two_factor_devices_spec.rb b/modules/two_factor_authentication/spec/features/my_two_factor_devices_spec.rb
index 39ebe5139e5a..c7bb9cd65f3a 100644
--- a/modules/two_factor_authentication/spec/features/my_two_factor_devices_spec.rb
+++ b/modules/two_factor_authentication/spec/features/my_two_factor_devices_spec.rb
@@ -35,7 +35,7 @@
     click_button I18n.t(:button_continue)
 
     # Enter valid phone number
-    expect_primerized_flash(type: :error, message: "Phone number must be of format +XX XXXXXXXXX")
+    expect_flash(type: :error, message: "Phone number must be of format +XX XXXXXXXXX")
     fill_in "device_phone_number", with: "+49 123456789"
     click_button I18n.t(:button_continue)
 
@@ -56,7 +56,7 @@
     expect(page).to have_css("h2", text: I18n.t("two_factor_authentication.devices.confirm_device"))
     expect(page).to have_css("input#otp")
 
-    expect_primerized_flash(type: :error, message: I18n.t("two_factor_authentication.devices.registration_failed_token_invalid"))
+    expect_flash(type: :error, message: I18n.t("two_factor_authentication.devices.registration_failed_token_invalid"))
 
     # Fill in correct token
     fill_in "otp", with: sms_token
diff --git a/modules/two_factor_authentication/spec/features/remember_cookie/login_with_remember_cookie_spec.rb b/modules/two_factor_authentication/spec/features/remember_cookie/login_with_remember_cookie_spec.rb
index 1d53df292ee8..159404baa86a 100644
--- a/modules/two_factor_authentication/spec/features/remember_cookie/login_with_remember_cookie_spec.rb
+++ b/modules/two_factor_authentication/spec/features/remember_cookie/login_with_remember_cookie_spec.rb
@@ -60,7 +60,7 @@ def expect_no_autologin
       visit my_2fa_devices_path
 
       find(".two-factor-authentication--remove-remember-cookie-link").click
-      expect_primerized_flash(message: I18n.t("two_factor_authentication.remember.cookie_removed"))
+      expect_flash(message: I18n.t("two_factor_authentication.remember.cookie_removed"))
       expect(page).to have_no_css(".two-factor-authentication--remove-remember-cookie-link")
 
       # Log out and in again
diff --git a/modules/two_factor_authentication/spec/features/shared_2fa_examples.rb b/modules/two_factor_authentication/spec/features/shared_2fa_examples.rb
index d4d29eb0f8d8..65443b9b57cf 100644
--- a/modules/two_factor_authentication/spec/features/shared_2fa_examples.rb
+++ b/modules/two_factor_authentication/spec/features/shared_2fa_examples.rb
@@ -35,8 +35,8 @@ def expect_not_logged_in
 
 RSpec.shared_examples "create enforced sms device" do
   it do
-    expect_primerized_flash(type: :info,
-                            message: I18n.t("two_factor_authentication.forced_registration.required_to_add_device"))
+    expect_flash(type: :info,
+                 message: I18n.t("two_factor_authentication.forced_registration.required_to_add_device"))
 
     SeleniumHubWaiter.wait
     # Create SMS device
@@ -46,7 +46,7 @@ def expect_not_logged_in
     click_on "Continue"
 
     # Expect error on invalid phone
-    expect_primerized_flash(type: :error, message: "Phone number must be of format +XX XXXXXXXXX")
+    expect_flash(type: :error, message: "Phone number must be of format +XX XXXXXXXXX")
 
     SeleniumHubWaiter.wait
     fill_in "device_phone_number", with: "+49 123456789"
@@ -63,7 +63,7 @@ def expect_not_logged_in
     # Log token for next access
     sms_token = nil
     allow_any_instance_of(OpenProject::TwoFactorAuthentication::TokenStrategy::Developer)
-        .to receive(:create_mobile_otp).and_wrap_original do |m|
+      .to receive(:create_mobile_otp).and_wrap_original do |m|
       sms_token = m.call
     end
 
@@ -71,7 +71,7 @@ def expect_not_logged_in
 
     expect(page).to have_css("h2", text: I18n.t("two_factor_authentication.devices.confirm_device"))
     expect(page).to have_css("input#otp")
-    expect_primerized_flash(type: :error, message: I18n.t("two_factor_authentication.devices.registration_failed_token_invalid"))
+    expect_flash(type: :error, message: I18n.t("two_factor_authentication.devices.registration_failed_token_invalid"))
 
     SeleniumHubWaiter.wait
     # Fill in wrong token
diff --git a/modules/webhooks/spec/features/manage_webhooks_spec.rb b/modules/webhooks/spec/features/manage_webhooks_spec.rb
index 021974c191da..9df3b63b3488 100644
--- a/modules/webhooks/spec/features/manage_webhooks_spec.rb
+++ b/modules/webhooks/spec/features/manage_webhooks_spec.rb
@@ -40,7 +40,7 @@
       # 1st webhook created
       #
 
-      expect_primerized_flash(message: I18n.t(:notice_successful_create))
+      expect_flash(message: I18n.t(:notice_successful_create))
       expect(page).to have_css(".webhooks--outgoing-webhook-row .name", text: "My webhook")
       webhook = Webhooks::Webhook.last
       expect(webhook.event_names).to eq %w(work_package:created)
@@ -65,7 +65,7 @@
       find(".webhooks--selected-project-ids[value='#{project.id}']").set true
 
       click_on "Save"
-      expect_primerized_flash(message: I18n.t(:notice_successful_update))
+      expect_flash(message: I18n.t(:notice_successful_update))
       expect(page).to have_css(".webhooks--outgoing-webhook-row .name", text: "My webhook")
       webhook = Webhooks::Webhook.last
       expect(webhook.event_names).to eq %w(work_package:updated)
@@ -77,7 +77,7 @@
       find(".webhooks--outgoing-webhook-row-#{webhook.id} .icon-delete").click
       page.driver.browser.switch_to.alert.accept
 
-      expect_primerized_flash(message: I18n.t(:notice_successful_delete))
+      expect_flash(message: I18n.t(:notice_successful_delete))
       expect(page).to have_css(".generic-table--empty-row")
     end
 
diff --git a/spec/features/activities/wiki_activity_spec.rb b/spec/features/activities/wiki_activity_spec.rb
index 5fa22673c09c..a25c5eb82269 100644
--- a/spec/features/activities/wiki_activity_spec.rb
+++ b/spec/features/activities/wiki_activity_spec.rb
@@ -53,7 +53,7 @@
 
     click_button "Save"
 
-    expect_and_dismiss_primerized_flash(message: "Successful creation.")
+    expect_and_dismiss_flash(message: "Successful creation.")
 
     # We mock letting some time pass by altering the timestamps
     Journal.last.update_columns(created_at: Time.now - 5.days, updated_at: Time.now - 5.days)
diff --git a/spec/features/admin/attribute_help_texts_spec.rb b/spec/features/admin/attribute_help_texts_spec.rb
index fdbdf4f49e7f..76384e96855b 100644
--- a/spec/features/admin/attribute_help_texts_spec.rb
+++ b/spec/features/admin/attribute_help_texts_spec.rb
@@ -113,7 +113,7 @@
         click_button "Save"
 
         # Handle errors
-        expect_primerized_flash(type: :error, message: "Help text can't be blank.")
+        expect_flash(type: :error, message: "Help text can't be blank.")
         SeleniumHubWaiter.wait
         editor.set_markdown("New**help**text")
         click_button "Save"
diff --git a/spec/features/admin/enterprise/enterprise_spec.rb b/spec/features/admin/enterprise/enterprise_spec.rb
index 5c60ca726d8b..dc04edbdbde5 100644
--- a/spec/features/admin/enterprise/enterprise_spec.rb
+++ b/spec/features/admin/enterprise/enterprise_spec.rb
@@ -60,8 +60,8 @@
       submit_button.click
 
       # Error output
-      expect_primerized_flash(type: :error,
-                              message: "Enterprise support token can't be read. Are you sure it is a support token?")
+      expect_flash(type: :error,
+                   message: "Enterprise support token can't be read. Are you sure it is a support token?")
 
       within "span.errorSpan" do
         expect(page).to have_css("#enterprise_token_encoded_token")
@@ -77,7 +77,7 @@
         textarea.set "foobar"
         submit_button.click
 
-        expect_primerized_flash(message: I18n.t(:notice_successful_update))
+        expect_flash(message: I18n.t(:notice_successful_update))
         expect(page).to have_test_selector("op-enterprise--active-token")
 
         expect(page.all(".attributes-key-value--key").map(&:text))
@@ -100,7 +100,7 @@
 
         wait_for_reload
 
-        expect_primerized_flash(message: I18n.t(:notice_successful_update))
+        expect_flash(message: I18n.t(:notice_successful_update))
 
         # Assume next request
         RequestStore.clear!
@@ -114,7 +114,7 @@
 
         wait_for_reload
 
-        expect_primerized_flash(message: I18n.t(:notice_successful_delete))
+        expect_flash(message: I18n.t(:notice_successful_delete))
 
         # Assume next request
         RequestStore.clear!
diff --git a/spec/features/admin/enterprise/enterprise_trial_spec.rb b/spec/features/admin/enterprise/enterprise_trial_spec.rb
index 5781161e1928..4676affa9e76 100644
--- a/spec/features/admin/enterprise/enterprise_trial_spec.rb
+++ b/spec/features/admin/enterprise/enterprise_trial_spec.rb
@@ -276,7 +276,7 @@ def fill_out_modal(mail: "foo@foocorp.example")
       # advance to close
       click_on "Continue"
 
-      expect_and_dismiss_primerized_flash(message: "Successful update.")
+      expect_and_dismiss_flash(message: "Successful update.")
       expect(page).to have_css(".attributes-key-value--value-container", text: "OpenProject Test")
       expect(page).to have_css(".attributes-key-value--value-container", text: "01/01/2020")
       expect(page).to have_css(".attributes-key-value--value-container", text: "01/02/2020")
diff --git a/spec/features/admin/oauth/oauth_applications_management_spec.rb b/spec/features/admin/oauth/oauth_applications_management_spec.rb
index 30dddbbfa254..a6e1ad3a4adb 100644
--- a/spec/features/admin/oauth/oauth_applications_management_spec.rb
+++ b/spec/features/admin/oauth/oauth_applications_management_spec.rb
@@ -49,20 +49,20 @@
     fill_in "application_redirect_uri", with: "not a url!"
     click_on "Create"
 
-    expect_primerized_flash(type: :error, message: "Redirect URI must be an absolute URI.")
+    expect_flash(type: :error, message: "Redirect URI must be an absolute URI.")
 
     fill_in("application_redirect_uri", with: "")
     # Fill redirect_uri which does not provide a Secure Context
     fill_in "application_redirect_uri", with: "http://example.org"
     click_on "Create"
 
-    expect_primerized_flash(type: :error, message: 'Redirect URI is not providing a "Secure Context"')
+    expect_flash(type: :error, message: 'Redirect URI is not providing a "Secure Context"')
 
     # Can create localhost without https (https://community.openproject.com/wp/34025)
     fill_in "application_redirect_uri", with: "urn:ietf:wg:oauth:2.0:oob\nhttp://localhost/my/callback"
     click_on "Create"
 
-    expect_primerized_flash(message: "Successful creation.")
+    expect_flash(message: "Successful creation.")
 
     expect(page).to have_css(".attributes-key-value--key", text: "Client ID")
     expect(page).to have_css(".attributes-key-value--value", text: "urn:ietf:wg:oauth:2.0:oob\nhttp://localhost/my/callback")
diff --git a/spec/features/admin/progress_tracking_spec.rb b/spec/features/admin/progress_tracking_spec.rb
index 647455b45f25..b32ea6c739eb 100644
--- a/spec/features/admin/progress_tracking_spec.rb
+++ b/spec/features/admin/progress_tracking_spec.rb
@@ -51,7 +51,7 @@
     expect(page).to have_text(expected_warning_text)
 
     click_on "Save"
-    expect_and_dismiss_primerized_flash(message: "Successful update.")
+    expect_and_dismiss_flash(message: "Successful update.")
     expect(Setting.find_by(name: "work_package_done_ratio").value).to eq("status")
 
     # now change from status-based to work-based
@@ -65,7 +65,7 @@
     expect(page).to have_text(expected_warning_text)
 
     click_on "Save"
-    expect_and_dismiss_primerized_flash(message: "Successful update.")
+    expect_and_dismiss_flash(message: "Successful update.")
     expect(Setting.find_by(name: "work_package_done_ratio").value).to eq("field")
   end
 
diff --git a/spec/features/admin/test_mail_notification_spec.rb b/spec/features/admin/test_mail_notification_spec.rb
index 5cb2ceedb3dc..3acced02cf55 100644
--- a/spec/features/admin/test_mail_notification_spec.rb
+++ b/spec/features/admin/test_mail_notification_spec.rb
@@ -44,7 +44,7 @@
     click_link "Send a test email"
 
     expected = "An error occurred while sending mail (#{error_message})"
-    expect_primerized_flash(type: :error, message: expected)
+    expect_flash(type: :error, message: expected)
     expect(page).to have_no_css(".op-toast.-error strong")
   end
 end
diff --git a/spec/features/admin/working_days_spec.rb b/spec/features/admin/working_days_spec.rb
index 81b9d1724bcd..cfddfaad9ed1 100644
--- a/spec/features/admin/working_days_spec.rb
+++ b/spec/features/admin/working_days_spec.rb
@@ -101,7 +101,7 @@ def working_days_setting
         dialog.confirm
       end
 
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
       expect(page).to have_unchecked_field "Monday"
       expect(page).to have_unchecked_field "Friday"
       expect(page).to have_unchecked_field "Saturday"
@@ -141,7 +141,7 @@ def working_days_setting
         dialog.confirm
       end
 
-      expect_primerized_flash(type: :error, message: "At least one day of the week must be defined as a working day.")
+      expect_flash(type: :error, message: "At least one day of the week must be defined as a working day.")
       # Restore the checkboxes to their valid state
       expect(page).to have_checked_field "Monday"
       expect(page).to have_checked_field "Tuesday"
@@ -171,8 +171,8 @@ def working_days_setting
       # Not executing the background jobs
       dialog.confirm
 
-      expect_primerized_flash(type: :error,
-                              message: "The previous changes to the working days configuration have not been applied yet.")
+      expect_flash(type: :error,
+                   message: "The previous changes to the working days configuration have not been applied yet.")
     end
   end
 
@@ -229,7 +229,7 @@ def working_days_setting
       click_on "Apply changes"
       click_on "Save and reschedule"
 
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
 
       nwd1 = NonWorkingDay.find_by(name: "My holiday")
       expect(nwd1.date).to eq date1
@@ -309,6 +309,6 @@ def working_days_setting
     click_on "Apply changes"
 
     # No dialog and saved successfully
-    expect_primerized_flash(message: "Successful update.")
+    expect_flash(message: "Successful update.")
   end
 end
diff --git a/spec/features/auth/consent_auth_stage_spec.rb b/spec/features/auth/consent_auth_stage_spec.rb
index 04751d2e80f6..5839c19f4953 100644
--- a/spec/features/auth/consent_auth_stage_spec.rb
+++ b/spec/features/auth/consent_auth_stage_spec.rb
@@ -168,7 +168,7 @@ def expect_not_logged_in
       find_by_id("toggle_consent_time").set(true)
 
       click_on "Save"
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
 
       Setting.clear_cache
       expect(Setting.consent_time).to be_present
@@ -215,7 +215,7 @@ def expect_not_logged_in
       check "consent_check"
       click_on I18n.t(:button_create)
 
-      expect_primerized_flash(message: I18n.t(:notice_account_registered_and_logged_in))
+      expect_flash(message: I18n.t(:notice_account_registered_and_logged_in))
       expect_logged_in("/?first_time_user=true")
     end
 
@@ -256,7 +256,7 @@ def expect_not_logged_in
         # Decline the consent
         click_on I18n.t(:button_decline)
 
-        expect_primerized_flash(type: :error, message: "foo@example.org")
+        expect_flash(type: :error, message: "foo@example.org")
       end
     end
   end
diff --git a/spec/features/auth/lost_password_spec.rb b/spec/features/auth/lost_password_spec.rb
index 7bfd9be964d2..f7652f672074 100644
--- a/spec/features/auth/lost_password_spec.rb
+++ b/spec/features/auth/lost_password_spec.rb
@@ -39,14 +39,14 @@
     fill_in "mail", with: "invalid mail"
     click_on "Submit"
 
-    expect_primerized_flash(message: I18n.t(:notice_account_lost_email_sent))
+    expect_flash(message: I18n.t(:notice_account_lost_email_sent))
 
     perform_enqueued_jobs
     expect(ActionMailer::Base.deliveries.size).to be 0
 
     fill_in "mail", with: user.mail
     click_on "Submit"
-    expect_primerized_flash(message: I18n.t(:notice_account_lost_email_sent))
+    expect_flash(message: I18n.t(:notice_account_lost_email_sent))
 
     perform_enqueued_jobs
     expect(ActionMailer::Base.deliveries.size).to be 1
@@ -60,7 +60,7 @@
 
     click_button "Save"
 
-    expect_primerized_flash(type: :info, message: I18n.t(:notice_account_password_updated))
+    expect_flash(type: :info, message: I18n.t(:notice_account_password_updated))
 
     login_with user.login, new_password
 
@@ -79,7 +79,7 @@
       fill_in "mail", with: user.mail
       click_on "Submit"
 
-      expect_primerized_flash(message: I18n.t(:notice_account_lost_email_sent))
+      expect_flash(message: I18n.t(:notice_account_lost_email_sent))
 
       perform_enqueued_jobs
       expect(ActionMailer::Base.deliveries.size).to be 1
@@ -99,7 +99,7 @@
       fill_in "mail", with: user.mail
       click_on "Submit"
 
-      expect_primerized_flash(message: I18n.t(:notice_account_lost_email_sent))
+      expect_flash(message: I18n.t(:notice_account_lost_email_sent))
 
       perform_enqueued_jobs
       expect(ActionMailer::Base.deliveries.size).to be 1
diff --git a/spec/features/custom_fields/reorder_options_spec.rb b/spec/features/custom_fields/reorder_options_spec.rb
index dc396d030470..1ff0bc2e5416 100644
--- a/spec/features/custom_fields/reorder_options_spec.rb
+++ b/spec/features/custom_fields/reorder_options_spec.rb
@@ -38,7 +38,7 @@ def get_possible_values_reordered(amount)
 
     click_link "Reorder values alphabetically"
     cf_page.accept_alert_dialog!
-    expect_primerized_flash(message: I18n.t(:notice_successful_update))
+    expect_flash(message: I18n.t(:notice_successful_update))
     expect(custom_field.custom_options.order(:position).pluck(:value))
       .to eq get_possible_values_reordered(200)
   end
diff --git a/spec/features/custom_styles/tabs_navigation_spec.rb b/spec/features/custom_styles/tabs_navigation_spec.rb
index 98b0e1bcdd1b..40dc6ea58ba0 100644
--- a/spec/features/custom_styles/tabs_navigation_spec.rb
+++ b/spec/features/custom_styles/tabs_navigation_spec.rb
@@ -60,7 +60,7 @@
     it "selects a color theme and redirect to the interface tab" do
       select("OpenProject Gray", from: "theme")
       find("[data-test-selector='color-theme-button']").click
-      expect_primerized_flash(message: I18n.t(:notice_successful_update))
+      expect_flash(message: I18n.t(:notice_successful_update))
       expect(page).to have_current_path custom_style_path(tab: "interface")
     end
 
@@ -78,7 +78,7 @@
       # select a color theme and redirect to the branding tab
       select("OpenProject Navy Blue", from: "theme")
       find("[data-test-selector='color-theme-button']").click
-      expect_primerized_flash(message: I18n.t(:notice_successful_update))
+      expect_flash(message: I18n.t(:notice_successful_update))
       expect(page).to have_current_path custom_style_path(tab: "branding")
 
       # remove the logo and redirect to the branding tab
@@ -94,7 +94,7 @@
       # select a color theme and redirect to the PDF export styles tab
       select("OpenProject (default)", from: "theme")
       find("[data-test-selector='color-theme-button']").click
-      expect_primerized_flash(message: I18n.t(:notice_successful_update))
+      expect_flash(message: I18n.t(:notice_successful_update))
       expect(page).to have_current_path custom_style_path(tab: "pdf_export_styles")
 
       # change export cover text color and redirect to the PDF export styles tab
diff --git a/spec/features/groups/groups_spec.rb b/spec/features/groups/groups_spec.rb
index a7a74cb93d9c..7ecae788f247 100644
--- a/spec/features/groups/groups_spec.rb
+++ b/spec/features/groups/groups_spec.rb
@@ -45,7 +45,7 @@
 
       groups_page.delete_group! "Bob's Team"
 
-      expect_primerized_flash(type: :info, message: I18n.t(:notice_deletion_scheduled))
+      expect_flash(type: :info, message: I18n.t(:notice_deletion_scheduled))
       expect(groups_page).to have_group "Bob's Team"
 
       perform_enqueued_jobs
diff --git a/spec/features/homescreen/index_spec.rb b/spec/features/homescreen/index_spec.rb
index 451190d94b33..af7e97e83c7c 100644
--- a/spec/features/homescreen/index_spec.rb
+++ b/spec/features/homescreen/index_spec.rb
@@ -71,7 +71,7 @@
       welcome_text_editor.click_and_type_slowly("Hello! ")
 
       general_settings_page.press_save_button
-      expect_and_dismiss_primerized_flash(message: "Successful update.")
+      expect_and_dismiss_flash(message: "Successful update.")
 
       visit root_url
       expect(page)
diff --git a/spec/features/ldap_auth_sources/crud_spec.rb b/spec/features/ldap_auth_sources/crud_spec.rb
index aec5715ade1c..8cd3985fbfac 100644
--- a/spec/features/ldap_auth_sources/crud_spec.rb
+++ b/spec/features/ldap_auth_sources/crud_spec.rb
@@ -52,7 +52,7 @@
 
     click_on "Create"
 
-    expect_and_dismiss_primerized_flash message: "Successful creation."
+    expect_and_dismiss_flash message: "Successful creation."
     expect(page).to have_css("td.name", text: "My LDAP connection")
     expect(page).to have_css("td.host", text: "localhost")
 
@@ -71,7 +71,7 @@
       accept_prompt { click_on "Delete" }
     end
 
-    expect_and_dismiss_primerized_flash message: "Successful deletion."
+    expect_and_dismiss_flash message: "Successful deletion."
 
     expect(page).to have_no_text "My LDAP connection"
     expect(page).to have_text "Admin connection"
@@ -88,7 +88,7 @@
     fill_in "ldap_auth_source_name", with: "Updated Admin connection"
     click_on "Save"
 
-    expect_primerized_flash(message: "Successful update.")
+    expect_flash(message: "Successful update.")
     expect(page).to have_css("td.name", text: "Updated Admin connection")
   end
 
diff --git a/spec/features/members/pagination_spec.rb b/spec/features/members/pagination_spec.rb
index 9001110667ae..d9b972ed8c7d 100644
--- a/spec/features/members/pagination_spec.rb
+++ b/spec/features/members/pagination_spec.rb
@@ -84,7 +84,7 @@
       members_page.visit!
       SeleniumHubWaiter.wait
       members_page.remove_user! "Alice Alison"
-      expect_and_dismiss_primerized_flash message: "Removed Alice Alison from project"
+      expect_and_dismiss_flash message: "Removed Alice Alison from project"
       expect(members_page).to have_user "Bob Bobbit"
 
       SeleniumHubWaiter.wait
diff --git a/spec/features/oauth/authorization_code_flow_spec.rb b/spec/features/oauth/authorization_code_flow_spec.rb
index 0c00a5d7cdb7..84ffc46df8ef 100644
--- a/spec/features/oauth/authorization_code_flow_spec.rb
+++ b/spec/features/oauth/authorization_code_flow_spec.rb
@@ -101,7 +101,7 @@ def get_and_test_token(code)
     page.driver.browser.switch_to.alert.accept
 
     # Should be back on access_token path
-    expect_primerized_flash(message: "Revocation of application Cool API app! successful.")
+    expect_flash(message: "Revocation of application Cool API app! successful.")
     expect(page).to have_no_css("[id^=oauth-application-grant]")
 
     expect(page).to have_current_path /\/my\/access_token/
diff --git a/spec/features/placeholder_users/create_spec.rb b/spec/features/placeholder_users/create_spec.rb
index 2c0669b038a3..78df219f3d5e 100644
--- a/spec/features/placeholder_users/create_spec.rb
+++ b/spec/features/placeholder_users/create_spec.rb
@@ -40,7 +40,7 @@
 
         new_placeholder_user_page.submit!
 
-        expect_primerized_flash(message: "Successful creation.")
+        expect_flash(message: "Successful creation.")
 
         new_placeholder_user = PlaceholderUser.order(Arel.sql("id DESC")).first
 
diff --git a/spec/features/placeholder_users/delete_spec.rb b/spec/features/placeholder_users/delete_spec.rb
index 59bc17626334..d295b16dd02d 100644
--- a/spec/features/placeholder_users/delete_spec.rb
+++ b/spec/features/placeholder_users/delete_spec.rb
@@ -49,7 +49,7 @@
       expect(page).to have_css(".danger-zone--verification button:not([disabled])")
       click_on "Delete"
 
-      expect_primerized_flash(type: :info, message: I18n.t(:notice_deletion_scheduled))
+      expect_flash(type: :info, message: I18n.t(:notice_deletion_scheduled))
 
       # The user is still there
       placeholder_user.reload
diff --git a/spec/features/placeholder_users/edit_placeholder_users_spec.rb b/spec/features/placeholder_users/edit_placeholder_users_spec.rb
index 4d2fa380a893..4c3545e45ae1 100644
--- a/spec/features/placeholder_users/edit_placeholder_users_spec.rb
+++ b/spec/features/placeholder_users/edit_placeholder_users_spec.rb
@@ -41,7 +41,7 @@
 
       click_on "Save"
 
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
 
       placeholder_user.reload
 
diff --git a/spec/features/principals/shared_memberships_examples.rb b/spec/features/principals/shared_memberships_examples.rb
index 2dc6130e3747..0657a15bf0c3 100644
--- a/spec/features/principals/shared_memberships_examples.rb
+++ b/spec/features/principals/shared_memberships_examples.rb
@@ -30,7 +30,7 @@
     principal_page.expect_project(project.name)
     principal_page.edit_roles!(member, %w())
 
-    expect_primerized_flash(type: :error, message: "Roles need to be assigned.")
+    expect_flash(type: :error, message: "Roles need to be assigned.")
 
     # Remove the user from the project
     principal_page.remove_from_project!(project.name)
diff --git a/spec/features/projects/destroy_spec.rb b/spec/features/projects/destroy_spec.rb
index c666f4afe177..cc06c5b0a730 100644
--- a/spec/features/projects/destroy_spec.rb
+++ b/spec/features/projects/destroy_spec.rb
@@ -53,7 +53,7 @@
     expect(danger_zone).not_to be_disabled
     danger_zone.danger_button.click
 
-    expect_primerized_flash message: I18n.t("projects.delete.scheduled")
+    expect_flash message: I18n.t("projects.delete.scheduled")
     expect(project.reload).to eq(project)
 
     perform_enqueued_jobs
diff --git a/spec/features/projects/modules_spec.rb b/spec/features/projects/modules_spec.rb
index a15fcb1dee4f..f6df8dbcb020 100644
--- a/spec/features/projects/modules_spec.rb
+++ b/spec/features/projects/modules_spec.rb
@@ -65,7 +65,7 @@
     check "Calendar"
     click_button "Save"
 
-    expect_primerized_flash(type: :error, message:
+    expect_flash(type: :error, message:
       I18n.t(:"activerecord.errors.models.project.attributes.enabled_modules.dependency_missing",
              dependency: "Work packages",
              module: "Calendars"))
diff --git a/spec/features/projects/project_custom_fields/overview_page/dialog/permission_spec.rb b/spec/features/projects/project_custom_fields/overview_page/dialog/permission_spec.rb
index 97a901455c3a..df7bc3a8464c 100644
--- a/spec/features/projects/project_custom_fields/overview_page/dialog/permission_spec.rb
+++ b/spec/features/projects/project_custom_fields/overview_page/dialog/permission_spec.rb
@@ -117,7 +117,7 @@
       member_with_project_attributes_edit_permissions.reload
       dialog.submit
 
-      expect_primerized_flash(type: :error, message: I18n.t(:notice_not_authorized))
+      expect_flash(type: :error, message: I18n.t(:notice_not_authorized))
     end
   end
 end
diff --git a/spec/features/projects/projects_index_spec.rb b/spec/features/projects/projects_index_spec.rb
index d3635a0dc3c8..886d00deb450 100644
--- a/spec/features/projects/projects_index_spec.rb
+++ b/spec/features/projects/projects_index_spec.rb
@@ -274,9 +274,9 @@ def load_and_open_filters(user)
 
         error_text = "Orders ><script src='/foobar js'></script> is not set to one of the allowed values. and does not exist."
         error_html = "Orders &gt;&lt;script src='/foobar js'&gt;&lt;/script&gt; is not set to one of the allowed values. and does not exist."
-        expect_primerized_flash(type: :error, message: error_text)
+        expect_flash(type: :error, message: error_text)
 
-        error_container = find_primerized_flash(type: :error)
+        error_container = find_flash_element(type: :error)
         expect(error_container["innerHTML"]).to include error_html
       end
     end
diff --git a/spec/features/projects/projects_portfolio_spec.rb b/spec/features/projects/projects_portfolio_spec.rb
index 886c9fd62b5e..62ed2eeb5951 100644
--- a/spec/features/projects/projects_portfolio_spec.rb
+++ b/spec/features/projects/projects_portfolio_spec.rb
@@ -115,7 +115,7 @@
       # Save the page
       scroll_to_and_click(find(".button", text: "Save"))
 
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
 
       RequestStore.clear!
       query = JSON.parse Setting.project_gantt_query
diff --git a/spec/features/projects/template_spec.rb b/spec/features/projects/template_spec.rb
index 39a7be290d6d..50bb5b0bc2cb 100644
--- a/spec/features/projects/template_spec.rb
+++ b/spec/features/projects/template_spec.rb
@@ -44,7 +44,7 @@
 
       # Make a template
       find(".button", text: "Set as template").click
-      expect_and_dismiss_primerized_flash(message: "Successful update.")
+      expect_and_dismiss_flash(message: "Successful update.")
 
       expect(page).to have_css(".button", text: "Remove from templates")
       project.reload
diff --git a/spec/features/repositories/create_repository_spec.rb b/spec/features/repositories/create_repository_spec.rb
index 6a7ff5c21638..41d8d60cbc74 100644
--- a/spec/features/repositories/create_repository_spec.rb
+++ b/spec/features/repositories/create_repository_spec.rb
@@ -149,7 +149,7 @@
 
         click_button(I18n.t(:button_create))
 
-        expect_primerized_flash(message: I18n.t("repositories.create_successful"))
+        expect_flash(message: I18n.t("repositories.create_successful"))
         expect(page).to have_css("a.icon-delete", text: I18n.t(:button_delete))
       end
     end
@@ -161,7 +161,7 @@
 
         click_button(I18n.t(:button_create))
 
-        expect_primerized_flash(message: I18n.t("repositories.create_successful"))
+        expect_flash(message: I18n.t("repositories.create_successful"))
         expect(page).to have_css('button[type="submit"]', text: I18n.t(:button_save))
         expect(page).to have_css("a.icon-remove", text: I18n.t(:button_remove))
       end
diff --git a/spec/features/repositories/repository_settings_spec.rb b/spec/features/repositories/repository_settings_spec.rb
index d31182f23a77..4932ce5be88c 100644
--- a/spec/features/repositories/repository_settings_spec.rb
+++ b/spec/features/repositories/repository_settings_spec.rb
@@ -193,7 +193,7 @@
 
       click_button(I18n.t(:button_save))
       expect(page).to have_css('[name="repository[login]"][value="foobar"]')
-      expect_primerized_flash(message: I18n.t("repositories.update_settings_successful"))
+      expect_flash(message: I18n.t("repositories.update_settings_successful"))
     end
   end
 end
diff --git a/spec/features/roles/create_spec.rb b/spec/features/roles/create_spec.rb
index 0ceeb15f38e0..23bfe0afebf2 100644
--- a/spec/features/roles/create_spec.rb
+++ b/spec/features/roles/create_spec.rb
@@ -55,7 +55,7 @@
 
     click_button "Create"
 
-    expect_primerized_flash(type: :error, message: "Name has already been taken")
+    expect_flash(type: :error, message: "Name has already been taken")
 
     fill_in "Name", with: "New role name"
 
@@ -64,15 +64,15 @@
 
     click_button "Create"
 
-    expect_primerized_flash(type: :error,
-                            message: "Permissions need to also include 'View members' as 'Manage members' is selected.")
+    expect_flash(type: :error,
+                 message: "Permissions need to also include 'View members' as 'Manage members' is selected.")
 
     check "View members"
     select existing_role.name, from: "Copy workflow from"
 
     click_button "Create"
 
-    expect_and_dismiss_primerized_flash(message: "Successful creation.")
+    expect_and_dismiss_flash(message: "Successful creation.")
 
     expect(page)
       .to have_current_path(roles_path)
diff --git a/spec/features/types/crud_spec.rb b/spec/features/types/crud_spec.rb
index dd6b1f6f4c7a..ba957d2be9ec 100644
--- a/spec/features/types/crud_spec.rb
+++ b/spec/features/types/crud_spec.rb
@@ -52,7 +52,7 @@
 
     click_button "Create"
 
-    expect_primerized_flash(type: :error, message: "Name has already been taken.")
+    expect_flash(type: :error, message: "Name has already been taken.")
 
     # Values are retained
     expect(page)
@@ -122,7 +122,7 @@
       end
 
       it "renders an error message with links to the archived project in the projects list" do
-        expect_primerized_flash type: :error, message: project.name
+        expect_flash type: :error, message: project.name
       end
     end
   end
diff --git a/spec/features/types/form_configuration_query_spec.rb b/spec/features/types/form_configuration_query_spec.rb
index 4c178f1bb720..3ccc66207d8e 100644
--- a/spec/features/types/form_configuration_query_spec.rb
+++ b/spec/features/types/form_configuration_query_spec.rb
@@ -93,7 +93,7 @@
     it "can save an empty query group" do
       form.add_query_group("Empty test", :children)
       form.save_changes
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
       type_bug.reload
 
       query_group = type_bug.attribute_groups.detect { |x| x.is_a?(Type::QueryGroup) }
@@ -105,7 +105,7 @@
       form.add_query_group("Subtasks", :children)
       # Save changed query
       form.save_changes
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
 
       # Visit wp_table
       wp_table.visit!
@@ -131,7 +131,7 @@
         form.add_query_group("Subtasks", :children)
         # Save changed query
         form.save_changes
-        expect_primerized_flash(message: "Successful update.")
+        expect_flash(message: "Successful update.")
 
         # Visit new wp page
         visit new_project_work_packages_path(project)
@@ -156,7 +156,7 @@
         filters.save
 
         form.save_changes
-        expect_primerized_flash message: "Successful update."
+        expect_flash message: "Successful update."
 
         archived.update_attribute(:active, false)
 
@@ -184,7 +184,7 @@
 
       # Save changed query
       form.save_changes
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
 
       type_bug.reload
       query = type_bug.attribute_groups.detect { |x| x.key == "Columns Test" }
@@ -206,7 +206,7 @@
 
       # Save changed query
       form.save_changes
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
 
       type_bug.reload
       query = type_bug.attribute_groups.detect { |x| x.key == "Columns Test" }
@@ -253,7 +253,7 @@
         filters.save
 
         form.save_changes
-        expect_primerized_flash(message: "Successful update.")
+        expect_flash(message: "Successful update.")
 
         # Visit work package with that type
         wp_page.visit!
diff --git a/spec/features/types/form_configuration_spec.rb b/spec/features/types/form_configuration_spec.rb
index 75b6c930b7df..5e6fc5ed76fa 100644
--- a/spec/features/types/form_configuration_spec.rb
+++ b/spec/features/types/form_configuration_spec.rb
@@ -91,7 +91,7 @@
 
         # Save configuration
         form.save_changes
-        expect_primerized_flash(message: "Successful update.")
+        expect_flash(message: "Successful update.")
 
         form.expect_empty
 
@@ -171,7 +171,7 @@
 
         # Save configuration
         form.save_changes
-        expect_primerized_flash(message: "Successful update.")
+        expect_flash(message: "Successful update.")
 
         # Expect configuration to be correct now
         form.expect_no_attribute("assignee", "Cool Stuff")
@@ -269,7 +269,7 @@
         form.expect_attribute(key: cf_identifier)
 
         form.save_changes
-        expect_primerized_flash(message: "Successful update.")
+        expect_flash(message: "Successful update.")
       end
     end
 
@@ -299,7 +299,7 @@ def add_cf_to_group
         form.expect_attribute(key: cf_identifier)
 
         form.save_changes
-        expect_primerized_flash(message: "Successful update.")
+        expect_flash(message: "Successful update.")
       end
 
       context "if inactive in project" do
diff --git a/spec/features/types/reset_form_configuration_spec.rb b/spec/features/types/reset_form_configuration_spec.rb
index 43ac566757eb..93ee119f1a03 100644
--- a/spec/features/types/reset_form_configuration_spec.rb
+++ b/spec/features/types/reset_form_configuration_spec.rb
@@ -60,7 +60,7 @@
       form.expect_attribute(key: cf_identifier)
 
       form.save_changes
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
 
       SeleniumHubWaiter.wait
       form.reset_button.click
diff --git a/spec/features/users/create_spec.rb b/spec/features/users/create_spec.rb
index 2027c2eac682..b24ac2a4b4ad 100644
--- a/spec/features/users/create_spec.rb
+++ b/spec/features/users/create_spec.rb
@@ -45,7 +45,7 @@
 
   shared_examples_for "successful user creation" do |redirect_to_edit_page: true|
     it "creates the user" do
-      expect_primerized_flash(message: "Successful creation.")
+      expect_flash(message: "Successful creation.")
 
       new_user = User.order(Arel.sql("id DESC")).first
 
diff --git a/spec/features/users/edit_users_spec.rb b/spec/features/users/edit_users_spec.rb
index 650701e321fc..55f21d170dee 100644
--- a/spec/features/users/edit_users_spec.rb
+++ b/spec/features/users/edit_users_spec.rb
@@ -127,7 +127,7 @@ def have_visible_tab(label)
 
       click_button "Save"
 
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
 
       user.reload
 
@@ -140,7 +140,7 @@ def have_visible_tab(label)
 
       click_on "Send invitation"
 
-      expect_primerized_flash(message: "An invitation has been sent to foo@example.com")
+      expect_flash(message: "An invitation has been sent to foo@example.com")
     end
 
     it "can not edit attributes of an admin user" do
diff --git a/spec/features/users/password_change_spec.rb b/spec/features/users/password_change_spec.rb
index 0c905a6f36dc..ecc1daa41ade 100644
--- a/spec/features/users/password_change_spec.rb
+++ b/spec/features/users/password_change_spec.rb
@@ -60,7 +60,7 @@
 
       click_on "Save"
 
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
       expect(password).to be_present
 
       # Logout
@@ -90,7 +90,7 @@
       expect(Sessions::UserSession.for_user(user.id).count).to be >= 1
 
       click_on "Save"
-      expect_primerized_flash(type: :info, message: I18n.t(:notice_account_password_updated))
+      expect_flash(type: :info, message: I18n.t(:notice_account_password_updated))
 
       # The old session is removed
       expect(Sessions::UserSession.find_by(session_id: "other")).to be_nil
@@ -126,7 +126,7 @@
       find_by_id("settings_password_min_adhered_rules").set 3
 
       scroll_to_and_click(find(".button", text: "Save"))
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
 
       Setting.clear_cache
 
@@ -144,19 +144,19 @@
       fill_in "user_password", with: "adminADMIN"
       fill_in "user_password_confirmation", with: "adminADMIN"
       scroll_to_and_click(find(".button", text: "Save"))
-      expect_primerized_flash(type: :error, message: "Password Must contain characters of the following classes")
+      expect_flash(type: :error, message: "Password Must contain characters of the following classes")
 
       # 2 of 3 classes
       fill_in "user_password", with: "adminADMIN123"
       fill_in "user_password_confirmation", with: "adminADMIN123"
       scroll_to_and_click(find(".button", text: "Save"))
-      expect_primerized_flash(type: :error, message: "Password Must contain characters of the following classes")
+      expect_flash(type: :error, message: "Password Must contain characters of the following classes")
 
       # All classes
       fill_in "user_password", with: "adminADMIN!"
       fill_in "user_password_confirmation", with: "adminADMIN!"
       scroll_to_and_click(find(".button", text: "Save"))
-      expect_primerized_flash(message: I18n.t(:notice_successful_update))
+      expect_flash(message: I18n.t(:notice_successful_update))
     end
   end
 
diff --git a/spec/features/versions/delete_spec.rb b/spec/features/versions/delete_spec.rb
index b2204174197e..6f6cdffd3be5 100644
--- a/spec/features/versions/delete_spec.rb
+++ b/spec/features/versions/delete_spec.rb
@@ -53,7 +53,7 @@
       end
     end
 
-    expect_primerized_flash(type: :error, message: I18n.t(:error_can_not_delete_in_use_archived_undisclosed))
+    expect_flash(type: :error, message: I18n.t(:error_can_not_delete_in_use_archived_undisclosed))
     expect(page).to have_no_css("a", text: "Archived child")
 
     user.update!(admin: true)
@@ -67,7 +67,7 @@
       end
     end
 
-    expect_primerized_flash(type: :error, message: "There are also work packages in archived projects.")
+    expect_flash(type: :error, message: "There are also work packages in archived projects.")
     expect(page).to have_css("a", text: "Archived child")
   end
 end
diff --git a/spec/features/wiki/adding_editing_history_spec.rb b/spec/features/wiki/adding_editing_history_spec.rb
index d0ee5a97e58b..d30970bd2513 100644
--- a/spec/features/wiki/adding_editing_history_spec.rb
+++ b/spec/features/wiki/adding_editing_history_spec.rb
@@ -82,7 +82,7 @@
     find(".ck-content").base.send_keys(content_first_version)
     click_button "Save"
 
-    expect_and_dismiss_primerized_flash(message: "Successful creation.")
+    expect_and_dismiss_flash(message: "Successful creation.")
     expect(page).to have_css(".title-container", text: "New page")
     expect(page).to have_css(".wiki-content", text: content_first_version)
 
diff --git a/spec/features/wiki/attachment_upload_spec.rb b/spec/features/wiki/attachment_upload_spec.rb
index 4af6efdc1fdc..0184c6f4f348 100644
--- a/spec/features/wiki/attachment_upload_spec.rb
+++ b/spec/features/wiki/attachment_upload_spec.rb
@@ -56,7 +56,7 @@
 
     click_on "Save"
 
-    expect_and_dismiss_primerized_flash(message: "Successful creation")
+    expect_and_dismiss_flash(message: "Successful creation")
     expect(page).to have_css("#content img", count: 1)
     expect(page).to have_content("Image uploaded the first time")
     attachments_list.expect_attached("image.png")
@@ -113,7 +113,7 @@
 
     click_on "Save"
 
-    expect_and_dismiss_primerized_flash(message: "Successful creation")
+    expect_and_dismiss_flash(message: "Successful creation")
     attachments_list.expect_attached("image.png")
 
     # required sleep otherwise clicking on the Edit button doesn't do anything
diff --git a/spec/features/wiki/edit_new_page_spec.rb b/spec/features/wiki/edit_new_page_spec.rb
index 148edc1e2d25..4b5c5f044cf7 100644
--- a/spec/features/wiki/edit_new_page_spec.rb
+++ b/spec/features/wiki/edit_new_page_spec.rb
@@ -41,6 +41,6 @@
     expect(page).to have_field "page_title", with: "Foobar"
     click_on "Save"
 
-    expect_primerized_flash(message: "Successful creation.", wait: 10)
+    expect_flash(message: "Successful creation.", wait: 10)
   end
 end
diff --git a/spec/features/work_packages/bulk/copy_work_package_spec.rb b/spec/features/work_packages/bulk/copy_work_package_spec.rb
index 13f34af87856..0c595b4f967a 100644
--- a/spec/features/work_packages/bulk/copy_work_package_spec.rb
+++ b/spec/features/work_packages/bulk/copy_work_package_spec.rb
@@ -201,16 +201,16 @@
         it "fails, informing of the reasons" do
           click_on "Copy and follow"
 
-          expect_primerized_flash(type: :error, message: I18n.t("work_packages.bulk.none_could_be_saved", total: 3))
-          expect_primerized_flash(type: :error,
-                                  message: I18n.t(
-                                    "work_packages.bulk.selected_because_descendants", total: 3, selected: 2
-                                  ))
-          expect_primerized_flash(type: :error,
-                                  message: "#{work_package.id}: Type #{I18n.t('activerecord.errors.messages.inclusion')}")
-          expect_primerized_flash(type: :error,
-                                  message: "#{work_package2.id}: Type #{I18n.t('activerecord.errors.messages.inclusion')}")
-          expect_primerized_flash(type: :error, message:
+          expect_flash(type: :error, message: I18n.t("work_packages.bulk.none_could_be_saved", total: 3))
+          expect_flash(type: :error,
+                       message: I18n.t(
+                         "work_packages.bulk.selected_because_descendants", total: 3, selected: 2
+                       ))
+          expect_flash(type: :error,
+                       message: "#{work_package.id}: Type #{I18n.t('activerecord.errors.messages.inclusion')}")
+          expect_flash(type: :error,
+                       message: "#{work_package2.id}: Type #{I18n.t('activerecord.errors.messages.inclusion')}")
+          expect_flash(type: :error, message:
             "#{child.id} (descendant of selected): Type #{I18n.t('activerecord.errors.messages.inclusion')}")
         end
 
@@ -298,7 +298,7 @@
 
       click_on "Copy and follow"
 
-      expect_primerized_flash(message: I18n.t(:notice_successful_create))
+      expect_flash(message: I18n.t(:notice_successful_create))
 
       wp_page = Pages::FullWorkPackage.new(WorkPackage.last)
 
diff --git a/spec/features/work_packages/bulk/move_work_package_spec.rb b/spec/features/work_packages/bulk/move_work_package_spec.rb
index 0e73db0be383..271b9f1a0db7 100644
--- a/spec/features/work_packages/bulk/move_work_package_spec.rb
+++ b/spec/features/work_packages/bulk/move_work_package_spec.rb
@@ -140,7 +140,7 @@
           click_on "Move and follow"
           wait_for_reload
 
-          expect_primerized_flash type: :error, message: I18n.t(:"work_packages.bulk.none_could_be_saved", total: 1)
+          expect_flash type: :error, message: I18n.t(:"work_packages.bulk.none_could_be_saved", total: 1)
 
           # Should NOT have moved
           child_wp.reload
@@ -167,7 +167,7 @@
             click_on "Move and follow"
           end
 
-          expect_primerized_flash type: :error, message: I18n.t(:"work_packages.bulk.none_could_be_saved", total: 1)
+          expect_flash type: :error, message: I18n.t(:"work_packages.bulk.none_could_be_saved", total: 1)
           child_wp.reload
           work_package.reload
           expect(work_package.project_id).to eq(project.id)
@@ -209,11 +209,12 @@
     end
 
     it "displays an error message explaining which work package could not be moved and why" do
-      expect_primerized_flash(type: :error, message: I18n.t("work_packages.bulk.could_not_be_saved"))
-      expect_primerized_flash(type: :error,
-                              message: "#{work_package2.id}: Project #{I18n.t('activerecord.errors.messages.error_readonly')}")
+      expect_flash(type: :error,
+                   message: I18n.t("work_packages.bulk.could_not_be_saved"))
+      expect_flash(type: :error,
+                   message: "#{work_package2.id}: Project #{I18n.t('activerecord.errors.messages.error_readonly')}")
 
-      expect_primerized_flash(type: :error, message:
+      expect_flash(type: :error, message:
         I18n.t("work_packages.bulk.x_out_of_y_could_be_saved",
                failing: 1,
                total: 2,
diff --git a/spec/features/work_packages/bulk/update_work_package_spec.rb b/spec/features/work_packages/bulk/update_work_package_spec.rb
index 8381b71454ca..3f329baab07e 100644
--- a/spec/features/work_packages/bulk/update_work_package_spec.rb
+++ b/spec/features/work_packages/bulk/update_work_package_spec.rb
@@ -111,11 +111,11 @@
         fill_in "Parent", with: "-1"
         click_on "Submit"
 
-        expect_primerized_flash(type: :error, message: I18n.t("work_packages.bulk.none_could_be_saved", total: 2))
-        expect_primerized_flash(type: :error,
-                                message: "#{work_package.id}: Parent #{I18n.t('activerecord.errors.messages.does_not_exist')}")
+        expect_flash(type: :error, message: I18n.t("work_packages.bulk.none_could_be_saved", total: 2))
+        expect_flash(type: :error,
+                     message: "#{work_package.id}: Parent #{I18n.t('activerecord.errors.messages.does_not_exist')}")
 
-        expect_primerized_flash(type: :error, message:
+        expect_flash(type: :error, message:
           <<~MSG.squish
             #{work_package2.id}:
             Parent #{I18n.t('activerecord.errors.messages.does_not_exist')}
@@ -143,10 +143,10 @@
             fill_in custom_field.name, with: "Custom field text"
             click_on "Submit"
 
-            expect_primerized_flash(type: :error, message:
+            expect_flash(type: :error, message:
               I18n.t("work_packages.bulk.x_out_of_y_could_be_saved", total: 2, failing: 1, success: 1))
 
-            expect_primerized_flash(type: :error, message:
+            expect_flash(type: :error, message:
               <<~MSG.squish
                 #{work_package2.id}:
                 #{custom_field.name} #{I18n.t('activerecord.errors.messages.error_readonly')}
@@ -174,7 +174,7 @@
             fill_in custom_field.name, with: "Custom field text"
             click_on "Submit"
 
-            expect_and_dismiss_primerized_flash(message: I18n.t(:notice_successful_update))
+            expect_and_dismiss_flash(message: I18n.t(:notice_successful_update))
 
             # Should update 2 work package custom fields
             work_package.reload
diff --git a/spec/features/work_packages/display_fields/work_display_spec.rb b/spec/features/work_packages/display_fields/work_display_spec.rb
index f14e9c0a7e2f..014af5765a50 100644
--- a/spec/features/work_packages/display_fields/work_display_spec.rb
+++ b/spec/features/work_packages/display_fields/work_display_spec.rb
@@ -186,7 +186,7 @@
         visit admin_settings_working_days_and_hours_path
         select "Days and hours", from: "Duration format"
         click_on "Apply changes"
-        expect_and_dismiss_primerized_flash(message: "Successful update.")
+        expect_and_dismiss_flash(message: "Successful update.")
 
         wp_table.visit_query query
 
diff --git a/spec/features/work_packages/navigation_spec.rb b/spec/features/work_packages/navigation_spec.rb
index 38443aeccdc5..7e6240e7d7b7 100644
--- a/spec/features/work_packages/navigation_spec.rb
+++ b/spec/features/work_packages/navigation_spec.rb
@@ -148,7 +148,7 @@
   it "loading an unknown work package ID" do
     visit "/work_packages/999999999"
 
-    expect_primerized_flash type: :error, message: I18n.t(:notice_file_not_found)
+    expect_flash type: :error, message: I18n.t(:notice_file_not_found)
 
     visit "/projects/#{project.identifier}/work_packages/999999999"
     global_work_packages = Pages::WorkPackagesTable.new
diff --git a/spec/features/wysiwyg/autosave_spec.rb b/spec/features/wysiwyg/autosave_spec.rb
index 6c3e0a1141f3..5d1edb792401 100644
--- a/spec/features/wysiwyg/autosave_spec.rb
+++ b/spec/features/wysiwyg/autosave_spec.rb
@@ -50,7 +50,7 @@
       editor.click_and_type_slowly "Initial version"
       click_on "Save"
 
-      expect_and_dismiss_primerized_flash(message: "Successful creation.")
+      expect_and_dismiss_flash(message: "Successful creation.")
 
       within("#content") do
         expect(page).to have_text "Initial version"
@@ -70,7 +70,7 @@
       # Save wiki page
       click_on "Save"
 
-      expect_primerized_flash(message: "Successful update.")
+      expect_flash(message: "Successful update.")
       within("#content") do
         expect(page).to have_text "This should be saved"
       end
@@ -80,7 +80,7 @@
       keys = page.evaluate_script "Object.keys(localStorage)"
       expect(keys).to include "op_ckeditor_rev_/api/v3/wiki_pages/#{wiki_page.id}_page[text]"
 
-      expect_and_dismiss_primerized_flash(message: "Successful update.")
+      expect_and_dismiss_flash(message: "Successful update.")
 
       # Edit again
       click_on "Edit"
diff --git a/spec/features/wysiwyg/bold_behavior_spec.rb b/spec/features/wysiwyg/bold_behavior_spec.rb
index 5521337ed5ca..37374ff5416c 100644
--- a/spec/features/wysiwyg/bold_behavior_spec.rb
+++ b/spec/features/wysiwyg/bold_behavior_spec.rb
@@ -58,7 +58,7 @@ def bold_keystroke
         # Save wiki page
         click_on "Save"
 
-        expect_primerized_flash(message: "Successful creation.")
+        expect_flash(message: "Successful creation.")
 
         within("#content") do
           expect(page).to have_css("p") { |node|
diff --git a/spec/features/wysiwyg/html_encoding_spec.rb b/spec/features/wysiwyg/html_encoding_spec.rb
index bb955207cdb0..e21e8fa79a11 100644
--- a/spec/features/wysiwyg/html_encoding_spec.rb
+++ b/spec/features/wysiwyg/html_encoding_spec.rb
@@ -51,7 +51,7 @@
     # Save wiki page
     click_on "Save"
 
-    expect_primerized_flash(message: "Successful creation.")
+    expect_flash(message: "Successful creation.")
 
     within("#content") do
       expect(page).to have_css("p", text: '<node foo="bar" />')
diff --git a/spec/features/wysiwyg/linking_spec.rb b/spec/features/wysiwyg/linking_spec.rb
index 792a7ff98426..38dcd4424c3f 100644
--- a/spec/features/wysiwyg/linking_spec.rb
+++ b/spec/features/wysiwyg/linking_spec.rb
@@ -49,7 +49,7 @@
       # Save wiki page
       click_on "Save"
 
-      expect_primerized_flash(message: "Successful creation.")
+      expect_flash(message: "Successful creation.")
 
       wiki_page = project.wiki.pages.first.reload
 
diff --git a/spec/features/wysiwyg/macros/attribute_macros_spec.rb b/spec/features/wysiwyg/macros/attribute_macros_spec.rb
index 7b7ad2aa55ac..fe9f06f06c85 100644
--- a/spec/features/wysiwyg/macros/attribute_macros_spec.rb
+++ b/spec/features/wysiwyg/macros/attribute_macros_spec.rb
@@ -114,7 +114,7 @@
 
       click_on "Save"
 
-      expect_and_dismiss_primerized_flash(message: "Successful creation.")
+      expect_and_dismiss_flash(message: "Successful creation.")
 
       # Expect output widget
       within("#content") do
@@ -177,7 +177,7 @@
 
         click_on "Save"
 
-        expect_primerized_flash(message: "Successful creation.")
+        expect_flash(message: "Successful creation.")
 
         within("#content") do
           expect(page).to have_css(".custom-option", count: 6)
diff --git a/spec/features/wysiwyg/macros/child_pages_spec.rb b/spec/features/wysiwyg/macros/child_pages_spec.rb
index 9b3176a38b0f..d0bbcdbfce65 100644
--- a/spec/features/wysiwyg/macros/child_pages_spec.rb
+++ b/spec/features/wysiwyg/macros/child_pages_spec.rb
@@ -112,7 +112,7 @@
         # Save wiki page
         click_on "Save"
 
-        expect_and_dismiss_primerized_flash(message: "Successful update.")
+        expect_and_dismiss_flash(message: "Successful update.")
 
         within("#content") do
           expect(page).to have_css(".pages-hierarchy")
@@ -145,7 +145,7 @@
         # Save wiki page
         click_on "Save"
 
-        expect_and_dismiss_primerized_flash(message: "Successful update.")
+        expect_and_dismiss_flash(message: "Successful update.")
 
         within("#content") do
           expect(page).to have_css(".pages-hierarchy")
diff --git a/spec/features/wysiwyg/macros/code_block_macro_spec.rb b/spec/features/wysiwyg/macros/code_block_macro_spec.rb
index 8b68df931f10..eb5626d1f478 100644
--- a/spec/features/wysiwyg/macros/code_block_macro_spec.rb
+++ b/spec/features/wysiwyg/macros/code_block_macro_spec.rb
@@ -74,7 +74,7 @@ def foobar
         end
 
         click_on "Save"
-        expect_and_dismiss_primerized_flash(message: "Successful creation.")
+        expect_and_dismiss_flash(message: "Successful creation.")
 
         # Expect output widget
         within("#content") do
@@ -106,7 +106,7 @@ def foobar
           expect(container).to have_css(".op-uc-code-block", text: "asdf")
 
           click_on "Save"
-          expect_and_dismiss_primerized_flash(message: "Successful creation.")
+          expect_and_dismiss_flash(message: "Successful creation.")
 
           wp = WikiPage.last
           expect(wp.text.gsub("\r\n", "\n")).to eq("```text\nasdf\n```")
@@ -119,7 +119,7 @@ def foobar
           end
 
           click_on "Save"
-          expect_and_dismiss_primerized_flash(message: "Successful update.")
+          expect_and_dismiss_flash(message: "Successful update.")
 
           wp.reload
           # Regression added two newlines before fence here
@@ -153,7 +153,7 @@ def foobar
         # Save wiki page
         click_on "Save"
 
-        expect_and_dismiss_primerized_flash(message: "Successful creation.")
+        expect_and_dismiss_flash(message: "Successful creation.")
 
         wiki_page = project.wiki.find_page("wiki")
         text = wiki_page.text.gsub(/\r\n?/, "\n")
diff --git a/spec/features/wysiwyg/macros/embedded_tables_spec.rb b/spec/features/wysiwyg/macros/embedded_tables_spec.rb
index 7886562650c2..fd632db5f541 100644
--- a/spec/features/wysiwyg/macros/embedded_tables_spec.rb
+++ b/spec/features/wysiwyg/macros/embedded_tables_spec.rb
@@ -107,7 +107,7 @@
         # Save wiki page
         click_on "Save"
 
-        expect_primerized_flash(message: "Successful creation.")
+        expect_flash(message: "Successful creation.")
 
         embedded_table = Pages::EmbeddedWorkPackagesTable.new find(".wiki-content")
         embedded_table.expect_work_package_listed wp_task
@@ -143,7 +143,7 @@
           # Save wiki page
           click_on "Save"
 
-          expect_and_dismiss_primerized_flash(message: "Successful creation.")
+          expect_and_dismiss_flash(message: "Successful creation.")
 
           # Embedded queries
           wikipage = project.wiki.pages.last
diff --git a/spec/features/wysiwyg/macros/quicklink_macros_spec.rb b/spec/features/wysiwyg/macros/quicklink_macros_spec.rb
index 45ed16b8d1b4..d487d2ad5e12 100644
--- a/spec/features/wysiwyg/macros/quicklink_macros_spec.rb
+++ b/spec/features/wysiwyg/macros/quicklink_macros_spec.rb
@@ -50,7 +50,7 @@
     editor.set_markdown "##{work_package.id}"
     click_on "Save"
 
-    expect_and_dismiss_primerized_flash(message: "Successful creation.")
+    expect_and_dismiss_flash(message: "Successful creation.")
 
     # Expect output widget
     within("#content") do
@@ -70,7 +70,7 @@
     editor.set_markdown "###{work_package.id}"
     click_on "Save"
 
-    expect_and_dismiss_primerized_flash(message: "Successful creation.")
+    expect_and_dismiss_flash(message: "Successful creation.")
 
     # Expect output widget
     within("#content") do
@@ -93,7 +93,7 @@
     editor.set_markdown "####{work_package.id}"
     click_on "Save"
 
-    expect_and_dismiss_primerized_flash(message: "Successful creation.")
+    expect_and_dismiss_flash(message: "Successful creation.")
 
     # Expect output widget
     within("#content") do
diff --git a/spec/features/wysiwyg/macros/work_package_button_spec.rb b/spec/features/wysiwyg/macros/work_package_button_spec.rb
index 07d8b972c6d3..1359d8d462f1 100644
--- a/spec/features/wysiwyg/macros/work_package_button_spec.rb
+++ b/spec/features/wysiwyg/macros/work_package_button_spec.rb
@@ -85,7 +85,7 @@
         # Save wiki page
         click_on "Save"
 
-        expect_primerized_flash(message: "Successful creation.")
+        expect_flash(message: "Successful creation.")
 
         within("#content") do
           expect(page).to have_css("a[href=\"/projects/my-project/work_packages/new?type=#{type.id}\"]")
diff --git a/spec/features/wysiwyg/tables_spec.rb b/spec/features/wysiwyg/tables_spec.rb
index 7189168013f5..576a196297d7 100644
--- a/spec/features/wysiwyg/tables_spec.rb
+++ b/spec/features/wysiwyg/tables_spec.rb
@@ -67,7 +67,7 @@
         # Save wiki page
         click_on "Save"
 
-        expect_and_dismiss_primerized_flash(message: "Successful creation.")
+        expect_and_dismiss_flash(message: "Successful creation.")
 
         within("#content") do
           expect(page).to have_css("table td", text: "h1")
@@ -116,7 +116,7 @@
         # Save wiki page
         click_on "Save"
 
-        expect_and_dismiss_primerized_flash(message: "Successful creation.")
+        expect_and_dismiss_flash(message: "Successful creation.")
 
         within("#content") do
           expect(page).to have_css("table th", text: "h1")
@@ -181,7 +181,7 @@
         # Save wiki page
         click_on "Save"
 
-        expect_and_dismiss_primerized_flash(message: "Successful creation.")
+        expect_and_dismiss_flash(message: "Successful creation.")
 
         within("#content") do
           expect(page).to have_css('td[style*="background-color:#123456"]')
@@ -232,7 +232,7 @@
         # Save wiki page
         click_on "Save"
 
-        expect_and_dismiss_primerized_flash(message: "Successful update.")
+        expect_and_dismiss_flash(message: "Successful update.")
 
         within("#content") do
           # table height and width is set on figure
@@ -297,7 +297,7 @@
         # Save wiki page
         click_on "Save"
 
-        expect_and_dismiss_primerized_flash(message: "Successful creation.")
+        expect_and_dismiss_flash(message: "Successful creation.")
 
         within("#content") do
           expect(page).to have_css('td[style*="width:250px"]')
diff --git a/spec/features/wysiwyg/work_package_linking_spec.rb b/spec/features/wysiwyg/work_package_linking_spec.rb
index b38ea0aea89d..718b615307d1 100644
--- a/spec/features/wysiwyg/work_package_linking_spec.rb
+++ b/spec/features/wysiwyg/work_package_linking_spec.rb
@@ -53,7 +53,7 @@
       # Save wiki page
       click_on "Save"
 
-      expect_primerized_flash(message: "Successful creation.")
+      expect_flash(message: "Successful creation.")
 
       within("#content") do
         expect(page).to have_css("a.issue", count: 1)
diff --git a/spec/support/components/password_confirmation_dialog.rb b/spec/support/components/password_confirmation_dialog.rb
index cab61adf830f..d7373000f225 100644
--- a/spec/support/components/password_confirmation_dialog.rb
+++ b/spec/support/components/password_confirmation_dialog.rb
@@ -26,7 +26,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-require "support/primerized_flash/expectations"
+require "support/flash/expectations"
 
 module Components
   class PasswordConfirmationDialog
@@ -71,7 +71,7 @@ def submit(should_fail:, with_keyboard:)
       end
 
       if should_fail
-        expect_primerized_flash(type: :error, message: I18n.t(:notice_password_confirmation_failed))
+        expect_flash(type: :error, message: I18n.t(:notice_password_confirmation_failed))
       else
         expect(page).to have_no_css(".op-toast.-error")
       end
diff --git a/spec/support/flash/expectations.rb b/spec/support/flash/expectations.rb
index daa1ca69ea50..5176aa334c98 100644
--- a/spec/support/flash/expectations.rb
+++ b/spec/support/flash/expectations.rb
@@ -1,33 +1,26 @@
 module Flash
   module Expectations
-    def expect_primerized_flash(message:, type: :success, wait: 20)
+    def expect_flash(message:, type: :success, wait: 20)
       expected_css = expected_flash_css(type)
       expect(page).to have_css(expected_css, text: message, wait:)
     end
 
-    def find_primerized_flash(type:)
+    def find_flash_element(type:)
       expected_css = expected_flash_css(type)
       page.find(expected_css)
     end
 
-    def expect_and_dismiss_primerized_flash(message: nil, type: :success, wait: 20)
-      expect_primerized_flash(type:, message:, wait:)
-      dismiss_primerized_flash!
-      expect_no_primerized_flash(type:, message:, wait: 0.1)
+    def expect_and_dismiss_flash(message: nil, type: :success, wait: 20)
+      expect_flash(type:, message:, wait:)
+      dismiss_flash!
+      expect_no_flash(type:, message:, wait: 0.1)
     end
 
-    def dismiss_primerized_flash!
+    def dismiss_flash!
       page.find(".Banner-close button").click # rubocop:disable Capybara/SpecificActions
     end
 
-    # Clears a toaster if there is one waiting 1 second max, but do not fail if there is none
-    def clear_primerized_flashes
-      if has_css?(".Banner-close button")
-        dismiss_primerized_flash!
-      end
-    end
-
-    def expect_no_primerized_flash(type: :success, message: nil, wait: 10)
+    def expect_no_flash(type: :success, message: nil, wait: 10)
       if type.nil?
         expect(page).not_to have_test_selector("op-primer-flash-message")
       else
diff --git a/spec/support/pages/admin/system_settings/languages.rb b/spec/support/pages/admin/system_settings/languages.rb
index 456647b47b72..da1dc652f912 100644
--- a/spec/support/pages/admin/system_settings/languages.rb
+++ b/spec/support/pages/admin/system_settings/languages.rb
@@ -38,7 +38,7 @@ def path
 
     def save
       press_save_button
-      expect_and_dismiss_primerized_flash(message: "Successful update.")
+      expect_and_dismiss_flash(message: "Successful update.")
     end
   end
 end
diff --git a/spec/support/pages/my/password_page.rb b/spec/support/pages/my/password_page.rb
index d5d052ac4783..227db085f509 100644
--- a/spec/support/pages/my/password_page.rb
+++ b/spec/support/pages/my/password_page.rb
@@ -55,7 +55,7 @@ def expect_password_weak_error_message
       end
 
       def expect_password_updated_message
-        expect_and_dismiss_primerized_flash(type: :info, message: I18n.t(:notice_account_password_updated))
+        expect_and_dismiss_flash(type: :info, message: I18n.t(:notice_account_password_updated))
       end
 
       private
diff --git a/spec/support/pages/page.rb b/spec/support/pages/page.rb
index 91fe9504fc00..ac75b11a9202 100644
--- a/spec/support/pages/page.rb
+++ b/spec/support/pages/page.rb
@@ -27,7 +27,7 @@
 #++
 
 require_relative "../toasts/expectations"
-require_relative "../primerized_flash/expectations"
+require_relative "../flash/expectations"
 
 module Pages
   class Page
diff --git a/spec/support/toasts/expectations.rb b/spec/support/toasts/expectations.rb
index 47baac2be88c..4ed7f4fd9455 100644
--- a/spec/support/toasts/expectations.rb
+++ b/spec/support/toasts/expectations.rb
@@ -4,13 +4,15 @@ def expect_toast(message:, type: :success, wait: 20)
       if toast_type == :angular
         expect(page).to have_css(".op-toast.-#{type}", text: message, wait:)
       elsif type == :error
-        ActiveSupport::Deprecation.warn("Use `expect_primerized_flash(type: :error, message: message)` instead of expect_toast with type: :error")
-        expect_primerized_flash(type: :error, message:)
+        ActiveSupport::Deprecation.warn(
+          "Use `expect_flash(type: :error, message: message)` instead of expect_toast with type: :error"
+        )
+        expect_flash(type: :error, message:)
       elsif type == :success
         ActiveSupport::Deprecation.warn(
-          "Use `expect_primerized_flash(type: :success, message:)` instead of expect_toast with type: :success"
+          "Use `expect_flash(type: :success, message:)` instead of expect_toast with type: :success"
         )
-        expect_primerized_flash(message:)
+        expect_flash(message:)
       else
         raise NotImplementedError
       end