diff --git a/client/README.md b/client/README.md
index 45d89efaa..3d77514d5 100644
--- a/client/README.md
+++ b/client/README.md
@@ -199,10 +199,10 @@ environment variables never synthesize a selected-adapter identity.
 
  The packaged directory configuration is an explicit trusted endpoint set:
 
-     metaserver = https://classic.metaserver.atrinik.org/index.xml https://rendezvous.meta.atrinik.org/v1/classic https://rendezvous.meta.atrinik.org
+     metaserver = https://classic.meta.atrinik.org/index.xml https://rendezvous.meta.atrinik.org/v1/classic https://rendezvous.meta.atrinik.org
 
  The intro screen always includes a provider button. `Dev` switches to
- `https://classic.dev.metaserver.atrinik.org/index.xml` with
+ `https://classic.dev.meta.atrinik.org/index.xml` with
  `https://rendezvous.dev.meta.atrinik.org/v1/classic` and the trusted access
  origin `https://rendezvous.dev.meta.atrinik.org`; `Default` switches back
  to the packaged endpoint set above. Its label names the destination. Clicking
diff --git a/client/client.cfg b/client/client.cfg
index b34c67163..4ec28b2be 100644
--- a/client/client.cfg
+++ b/client/client.cfg
@@ -23,7 +23,7 @@ game_news_url = https://www.atrinik.org/client_news.php
 # --metaserver triple starts a new isolated list and re-enables metaserver access.
 # The intro screen's Dev/Default button replaces this list for the current
 # session and re-enables discovery, including after --nometa.
-metaserver = https://classic.metaserver.atrinik.org/index.xml https://rendezvous.meta.atrinik.org/v1/classic https://rendezvous.meta.atrinik.org
+metaserver = https://classic.meta.atrinik.org/index.xml https://rendezvous.meta.atrinik.org/v1/classic https://rendezvous.meta.atrinik.org
 
 # Direct rendezvous uses stun.cloudflare.com:3478 by default. Override it with
 # another HOST:PORT, or set it to "off" to prevent STUN DNS and UDP traffic.
diff --git a/client/src/client/gpu_player_view.c b/client/src/client/gpu_player_view.c
index 6378bffe0..ab0959791 100644
--- a/client/src/client/gpu_player_view.c
+++ b/client/src/client/gpu_player_view.c
@@ -2108,7 +2108,7 @@ static server_struct *gpu_player_view_provider_access_transport(
         released && curl_cancelled(cancel) && options->count == 1 &&
         strcmp(code, "0123456789ABCDEF") == 0 &&
         strcmp(options->endpoints[0].directory_url,
-               "https://classic.metaserver.atrinik.org/index.xml") == 0 &&
+               "https://classic.meta.atrinik.org/index.xml") == 0 &&
         strcmp(options->endpoints[0].rendezvous_origin,
                "https://rendezvous.meta.atrinik.org/v1/classic") == 0 &&
         strcmp(options->endpoints[0].access_origin,
diff --git a/client/src/client/metaserver_options.c b/client/src/client/metaserver_options.c
index 83ef191cd..687265c79 100644
--- a/client/src/client/metaserver_options.c
+++ b/client/src/client/metaserver_options.c
@@ -115,8 +115,8 @@ void client_metaserver_options_deinit(client_metaserver_options_t *options) {
 }
 
 static const char *const provider_directory[] = {
-    "https://classic.metaserver.atrinik.org/index.xml",
-    "https://classic.dev.metaserver.atrinik.org/index.xml",
+    "https://classic.meta.atrinik.org/index.xml",
+    "https://classic.dev.meta.atrinik.org/index.xml",
 };
 
 static const char *const provider_rendezvous[] = {
diff --git a/client/src/gui/misc/intro.c b/client/src/gui/misc/intro.c
index ec3f28e34..93f71ec62 100644
--- a/client/src/gui/misc/intro.c
+++ b/client/src/gui/misc/intro.c
@@ -566,8 +566,8 @@ int intro_event(SDL_Event *event) {
     }
     if (BUTTON_CHECK_TOOLTIP(&button_metaserver)) {
         const char *tooltip = metaserver_get_provider() == METASERVER_PROVIDER_DEV
-                                  ? "Switch to default metaserver: classic.metaserver.atrinik.org"
-                                  : "Switch to dev metaserver: classic.dev.metaserver.atrinik.org";
+                                  ? "Switch to default metaserver: classic.meta.atrinik.org"
+                                  : "Switch to dev metaserver: classic.dev.meta.atrinik.org";
         tooltip_create(event_mouse_x(event), event_mouse_y(event), FONT_ARIAL11, tooltip);
         tooltip_enable_delay(300);
     }
diff --git a/client/src/tests/metaserver_lifecycle.c b/client/src/tests/metaserver_lifecycle.c
index 156e1fc09..99548b680 100644
--- a/client/src/tests/metaserver_lifecycle.c
+++ b/client/src/tests/metaserver_lifecycle.c
@@ -232,12 +232,12 @@ int main(void) {
     poll_until_fetch(2);
     wait_for_capture(2);
     REQUIRE(get_fetch_peak() == 1);
-    REQUIRE(strcmp(fetched_directory[0], "https://classic.metaserver.atrinik.org/index.xml") ==
+    REQUIRE(strcmp(fetched_directory[0], "https://classic.meta.atrinik.org/index.xml") ==
             0);
     REQUIRE(strcmp(fetched_rendezvous[0], "https://rendezvous.meta.atrinik.org/v1/classic") ==
             0);
     REQUIRE(strcmp(fetched_directory[1],
-                   "https://classic.dev.metaserver.atrinik.org/index.xml") == 0);
+                   "https://classic.dev.meta.atrinik.org/index.xml") == 0);
     REQUIRE(strcmp(fetched_rendezvous[1],
                    "https://rendezvous.dev.meta.atrinik.org/v1/classic") == 0);
 
diff --git a/client/src/tests/metaserver_options.c b/client/src/tests/metaserver_options.c
index cbfc8520d..c8214d21c 100644
--- a/client/src/tests/metaserver_options.c
+++ b/client/src/tests/metaserver_options.c
@@ -65,7 +65,7 @@ int main(void) {
     TEST_CHECK(client_metaserver_options_enabled(&options));
     TEST_CHECK(options.count == 1);
     TEST_CHECK(strcmp(options.endpoints[0].directory_url,
-                      "https://classic.metaserver.atrinik.org/index.xml") == 0);
+                      "https://classic.meta.atrinik.org/index.xml") == 0);
     TEST_CHECK(strcmp(options.endpoints[0].rendezvous_origin,
                       "https://rendezvous.meta.atrinik.org/v1/classic") == 0);
     TEST_CHECK(strcmp(options.endpoints[0].access_origin,
@@ -75,7 +75,7 @@ int main(void) {
     client_metaserver_options_replace_provider(&options, METASERVER_PROVIDER_DEV);
     TEST_CHECK(options.count == 1);
     TEST_CHECK(strcmp(options.endpoints[0].directory_url,
-                      "https://classic.dev.metaserver.atrinik.org/index.xml") == 0);
+                      "https://classic.dev.meta.atrinik.org/index.xml") == 0);
     TEST_CHECK(strcmp(options.endpoints[0].rendezvous_origin,
                       "https://rendezvous.dev.meta.atrinik.org/v1/classic") == 0);
     TEST_CHECK(strcmp(options.endpoints[0].access_origin,
@@ -93,7 +93,7 @@ int main(void) {
     options.endpoints[0].directory_url[8] = 'X';
     options.endpoints[0].rendezvous_origin[8] = 'X';
     TEST_CHECK(strcmp(copied.endpoints[0].directory_url,
-                      "https://classic.dev.metaserver.atrinik.org/index.xml") == 0);
+                      "https://classic.dev.meta.atrinik.org/index.xml") == 0);
     TEST_CHECK(strcmp(copied.endpoints[0].rendezvous_origin,
                       "https://rendezvous.dev.meta.atrinik.org/v1/classic") == 0);
     TEST_CHECK(strcmp(copied.endpoints[0].access_origin,