diff --git a/needles/gnome/apps/maps/maps_button_credits-20240425.json b/needles/gnome/apps/maps/maps_button_credits-20240425.json
deleted file mode 100644
index 2e93a1fb..00000000
--- a/needles/gnome/apps/maps/maps_button_credits-20240425.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "width": 54,
-      "xpos": 355,
-      "ypos": 581,
-      "type": "match",
-      "height": 24
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_button_credits"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_button_credits-20240425.png b/needles/gnome/apps/maps/maps_button_credits-20240425.png
deleted file mode 100644
index a3c875a0..00000000
Binary files a/needles/gnome/apps/maps/maps_button_credits-20240425.png and /dev/null differ
diff --git a/needles/gnome/apps/maps/maps_button_credits-20250319.json b/needles/gnome/apps/maps/maps_button_credits-20250319.json
deleted file mode 100644
index f42a9331..00000000
--- a/needles/gnome/apps/maps/maps_button_credits-20250319.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 356,
-      "ypos": 580,
-      "width": 54,
-      "height": 24,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_button_credits"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_button_credits-20250319.png b/needles/gnome/apps/maps/maps_button_credits-20250319.png
deleted file mode 100644
index 61cad029..00000000
Binary files a/needles/gnome/apps/maps/maps_button_credits-20250319.png and /dev/null differ
diff --git a/needles/gnome/apps/maps/maps_button_credits.json b/needles/gnome/apps/maps/maps_button_credits.json
deleted file mode 100644
index 645aed3e..00000000
--- a/needles/gnome/apps/maps/maps_button_credits.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 355,
-      "ypos": 582,
-      "width": 54,
-      "height": 24,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_button_credits"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_button_credits.png b/needles/gnome/apps/maps/maps_button_credits.png
deleted file mode 100644
index 3061355f..00000000
Binary files a/needles/gnome/apps/maps/maps_button_credits.png and /dev/null differ
diff --git a/needles/gnome/gnome_button_credits-20240424.json b/needles/gnome/gnome_selector_credits-20240424.json
similarity index 78%
rename from needles/gnome/gnome_button_credits-20240424.json
rename to needles/gnome/gnome_selector_credits-20240424.json
index 72c292a3..7fad04dd 100644
--- a/needles/gnome/gnome_button_credits-20240424.json
+++ b/needles/gnome/gnome_selector_credits-20240424.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "gnome_button_credits"
+    "gnome_selector_credits"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/gnome/gnome_button_credits-20240424.png b/needles/gnome/gnome_selector_credits-20240424.png
similarity index 100%
rename from needles/gnome/gnome_button_credits-20240424.png
rename to needles/gnome/gnome_selector_credits-20240424.png
diff --git a/needles/gnome/gnome_button_credits-regular-20250319.json b/needles/gnome/gnome_selector_credits-20250319.json
similarity index 78%
rename from needles/gnome/gnome_button_credits-regular-20250319.json
rename to needles/gnome/gnome_selector_credits-20250319.json
index 395a1784..1e880f93 100644
--- a/needles/gnome/gnome_button_credits-regular-20250319.json
+++ b/needles/gnome/gnome_selector_credits-20250319.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "gnome_button_credits"
+    "gnome_selector_credits"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/gnome/gnome_button_credits-regular-20250319.png b/needles/gnome/gnome_selector_credits-20250319.png
similarity index 100%
rename from needles/gnome/gnome_button_credits-regular-20250319.png
rename to needles/gnome/gnome_selector_credits-20250319.png
diff --git a/needles/gnome/gnome_button_credits-regular.json b/needles/gnome/gnome_selector_credits-button.json
similarity index 79%
rename from needles/gnome/gnome_button_credits-regular.json
rename to needles/gnome/gnome_selector_credits-button.json
index aff36cbc..332ce170 100644
--- a/needles/gnome/gnome_button_credits-regular.json
+++ b/needles/gnome/gnome_selector_credits-button.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "gnome_button_credits"
+    "gnome_selector_credits"
   ]
 }
diff --git a/needles/gnome/gnome_button_credits-regular.png b/needles/gnome/gnome_selector_credits-button.png
similarity index 100%
rename from needles/gnome/gnome_button_credits-regular.png
rename to needles/gnome/gnome_selector_credits-button.png
diff --git a/needles/gnome/gnome_button_credits-libadwaita-20220818.json b/needles/gnome/gnome_selector_credits-libadwaita-20220818.json
similarity index 78%
rename from needles/gnome/gnome_button_credits-libadwaita-20220818.json
rename to needles/gnome/gnome_selector_credits-libadwaita-20220818.json
index e5d209d7..2e75fde4 100644
--- a/needles/gnome/gnome_button_credits-libadwaita-20220818.json
+++ b/needles/gnome/gnome_selector_credits-libadwaita-20220818.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "gnome_button_credits"
+    "gnome_selector_credits"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/gnome/gnome_button_credits-libadwaita-20220818.png b/needles/gnome/gnome_selector_credits-libadwaita-20220818.png
similarity index 100%
rename from needles/gnome/gnome_button_credits-libadwaita-20220818.png
rename to needles/gnome/gnome_selector_credits-libadwaita-20220818.png
diff --git a/tests/applications/calculator/about.pm b/tests/applications/calculator/about.pm
index 95fe6574..687ca938 100644
--- a/tests/applications/calculator/about.pm
+++ b/tests/applications/calculator/about.pm
@@ -17,9 +17,9 @@ sub run {
     # Check that it is shown.
     assert_screen("calc_about_shown");
     # Click on the Credits button and check that it shows.
-    unless (check_screen("gnome_button_credits", 30)) {
+    unless (check_screen("gnome_selector_credits", 30)) {
         send_key("pgdn");
-        assert_screen("gnome_button_credits", 15);
+        assert_screen("gnome_selector_credits", 15);
         record_soft_failure("https://gitlab.gnome.org/GNOME/gnome-calculator/-/issues/419");
     }
     click_lastmatch;
diff --git a/tests/applications/clocks/about.pm b/tests/applications/clocks/about.pm
index 4bda6811..c7f9f554 100644
--- a/tests/applications/clocks/about.pm
+++ b/tests/applications/clocks/about.pm
@@ -14,7 +14,7 @@ sub run {
     # Click on About Clocks to see the About info.
     assert_and_click("clocks_menu_about");
     assert_screen("clocks_about_displayed");
-    assert_and_click("gnome_button_credits");
+    assert_and_click("gnome_selector_credits");
     assert_screen("clocks_credits_shown");
 
 }
diff --git a/tests/applications/contacts/about.pm b/tests/applications/contacts/about.pm
index a0c36813..93827b19 100644
--- a/tests/applications/contacts/about.pm
+++ b/tests/applications/contacts/about.pm
@@ -18,7 +18,7 @@ sub run {
     assert_screen("contacts_about_shown");
     # Click on Credits to move to credits and check we
     # have moved.
-    assert_and_click("gnome_button_credits");
+    assert_and_click("gnome_selector_credits");
     assert_screen("contacts_credits_shown");
 }
 
diff --git a/tests/applications/disks/about.pm b/tests/applications/disks/about.pm
index 29bd0ac6..fab589b9 100644
--- a/tests/applications/disks/about.pm
+++ b/tests/applications/disks/about.pm
@@ -17,7 +17,7 @@ sub run {
     assert_screen("disks_about_shown");
 
     # Click on the Credits button.
-    assert_and_click("gnome_button_credits");
+    assert_and_click("gnome_selector_credits");
 
     # Check that Credits are shown.
     assert_screen("disks_credits_shown");
diff --git a/tests/applications/evince/about.pm b/tests/applications/evince/about.pm
index 85e2689e..5f377460 100644
--- a/tests/applications/evince/about.pm
+++ b/tests/applications/evince/about.pm
@@ -19,7 +19,7 @@ sub run {
     assert_screen("evince_about_shown");
 
     # Click on Credits button to see the second part of the dialogue.
-    assert_and_click("gnome_button_credits", button => "left", timeout => 30);
+    assert_and_click("gnome_selector_credits", button => "left", timeout => 30);
 
     # Check that Credits are accessible and visible, too.
     assert_screen("evince_credits_shown");
diff --git a/tests/applications/fonts/about.pm b/tests/applications/fonts/about.pm
index 36439328..950201c8 100644
--- a/tests/applications/fonts/about.pm
+++ b/tests/applications/fonts/about.pm
@@ -13,7 +13,7 @@ sub run {
     # Check that the correct font is shown.
     assert_screen("fonts_about_shown");
     # Click on Credits to see them.
-    assert_and_click("gnome_button_credits");
+    assert_and_click("gnome_selector_credits");
 
     # Check that Credits are shown
     assert_screen("fonts_credits_shown");
@@ -21,14 +21,14 @@ sub run {
     send_key("esc");
 
     # Click on Legal to see legal info.
-    assert_and_click("gnome_button_legal");
+    assert_and_click("gnome_selector_legal");
     # Check that Credits are shown
     assert_screen("fonts_legal_shown");
     # Return to previous screen
     send_key("esc");
 
     # Check that a project website can be reached.
-    assert_and_click("gnome_button_website");
+    assert_and_click("gnome_selector_website");
     # Check that the website has been opened
     assert_screen("fonts_website_opened");
 }
diff --git a/tests/applications/gnome-text-editor/about.pm b/tests/applications/gnome-text-editor/about.pm
index d7c0887e..fd1b8f18 100644
--- a/tests/applications/gnome-text-editor/about.pm
+++ b/tests/applications/gnome-text-editor/about.pm
@@ -19,7 +19,7 @@ sub run {
     assert_screen "gte_about_shown";
 
     # Click on Credits to move to another screen.
-    assert_and_click "gnome_button_credits";
+    assert_and_click "gnome_selector_credits";
     wait_still_screen(2);
 
     # Check that Credits were shown.
diff --git a/tests/applications/maps/about.pm b/tests/applications/maps/about.pm
index b907c8d5..34b43594 100644
--- a/tests/applications/maps/about.pm
+++ b/tests/applications/maps/about.pm
@@ -18,7 +18,7 @@ sub run {
     assert_screen("maps_about_shown");
 
     # Check that you can visit application webpages
-    assert_and_click("maps_link_website");
+    assert_and_click("gnome_selector_website");
     assert_screen("maps_website_opened");
 
     # Close the web browser
@@ -32,12 +32,12 @@ sub run {
     send_key("alt-f4");
 
     # Check that credits are shown.
-    assert_and_click("maps_button_credits");
+    assert_and_click("gnome_selector_credits");
     assert_screen("maps_credits_shown");
     send_key("esc");
 
     # Check that legal info is shown.
-    assert_and_click("maps_button_legal");
+    assert_and_click("gnome_selector_legal");
     assert_screen("maps_legal_shown");
     send_key("esc");
 }
diff --git a/tests/applications/nautilus/about.pm b/tests/applications/nautilus/about.pm
index f2ab6f1c..79b5ea55 100644
--- a/tests/applications/nautilus/about.pm
+++ b/tests/applications/nautilus/about.pm
@@ -19,7 +19,7 @@ sub run {
     assert_screen("nautilus_about_show");
 
     # Click on Credits button to see the second part of the dialogue.
-    assert_and_click("gnome_button_credits", button => "left", timeout => 30);
+    assert_and_click("gnome_selector_credits", button => "left", timeout => 30);
 
     # Check that Credits are accessible and visible, too.
     assert_screen("nautilus_credits_shown");
diff --git a/tests/applications/sysmon/about.pm b/tests/applications/sysmon/about.pm
index 27eb0077..8423de3c 100644
--- a/tests/applications/sysmon/about.pm
+++ b/tests/applications/sysmon/about.pm
@@ -12,7 +12,7 @@ sub run {
     # Check that About dialogue has started.
     assert_screen("sysmon_about_shown");
     # Click on the Credits button
-    assert_and_click("gnome_button_credits");
+    assert_and_click("gnome_selector_credits");
     # Check that Credits are shown
     assert_screen("sysmon_credits_shown");
 }
diff --git a/tests/applications/weather/about.pm b/tests/applications/weather/about.pm
index 126a88a5..4e902002 100644
--- a/tests/applications/weather/about.pm
+++ b/tests/applications/weather/about.pm
@@ -14,7 +14,7 @@ sub run {
     assert_and_click("weather_menu_about");
     assert_screen("weather_about_shown");
     # Change to Credits
-    assert_and_click("gnome_button_credits");
+    assert_and_click("gnome_selector_credits");
     assert_screen("weather_credits_shown");
 }