diff --git a/data.json b/data.json
index dd63e7b..98e4f93 100644
--- a/data.json
+++ b/data.json
@@ -121,6 +121,26 @@
     "gcap_status": "AFIS",
     "s1_twr": true
   },
+  {
+    "logon": "EDDB_AN_APP",
+    "frequency": "136.105",
+    "abbreviation": "DBANT",
+    "description": "Berlin Arrival (Feeder Nord)",
+    "schedule_show_booked": [
+      "EDWW"
+    ],
+    "gcap_status": "1"
+  },
+  {
+    "logon": "EDDB_AS_APP",
+    "frequency": "121.130",
+    "abbreviation": "DBAST",
+    "description": "Berlin Arrival (Feeder Sued)",
+    "schedule_show_always": [
+      "EDWW"
+    ],
+    "gcap_status": "1"
+  },
   {
     "logon": "EDDB_A_GND",
     "frequency": "121.855",
@@ -141,16 +161,6 @@
     ],
     "gcap_status": "1"
   },
-  {
-    "logon": "EDDB_D_APP",
-    "frequency": "121.130",
-    "abbreviation": "DBAST",
-    "description": "Berlin Director Sued",
-    "schedule_show_always": [
-      "EDWW"
-    ],
-    "gcap_status": "1"
-  },
   {
     "logon": "EDDB_E_GND",
     "frequency": "129.605",
@@ -161,16 +171,6 @@
     ],
     "gcap_status": "1"
   },
-  {
-    "logon": "EDDB_F_APP",
-    "frequency": "136.105",
-    "abbreviation": "DBANT",
-    "description": "Berlin Director Nord",
-    "schedule_show_booked": [
-      "EDWW"
-    ],
-    "gcap_status": "1"
-  },
   {
     "logon": "EDDB_ICE_GND",
     "frequency": "121.665",
@@ -263,26 +263,6 @@
     ],
     "gcap_status": "1"
   },
-  {
-    "logon": "EDDB_Y_APP",
-    "frequency": "119.630",
-    "abbreviation": "DBANQ",
-    "description": "Bremen Radar (Berlin Arrival Nord Coordinator)",
-    "schedule_show_booked": [
-      "EDWW"
-    ],
-    "gcap_status": "1"
-  },
-  {
-    "logon": "EDDB_Z_APP",
-    "frequency": "126.425",
-    "abbreviation": "DBASQ",
-    "description": "Bremen Radar (Berlin Arrival Sued Coordinator)",
-    "schedule_show_booked": [
-      "EDWW"
-    ],
-    "gcap_status": "1"
-  },
   {
     "logon": "EDDC_A_GND",
     "frequency": "121.755",
@@ -601,6 +581,16 @@
     ],
     "s1_twr": true
   },
+  {
+    "logon": "EDDH_A_APP",
+    "frequency": "118.205",
+    "abbreviation": "DHAT",
+    "description": "Hamburg Arrival (Feeder)",
+    "schedule_show_always": [
+      "EDWW"
+    ],
+    "gcap_status": "1"
+  },
   {
     "logon": "EDDH_DEL",
     "frequency": "121.805",
@@ -632,16 +622,6 @@
     ],
     "gcap_status": "1"
   },
-  {
-    "logon": "EDDH_F_APP",
-    "frequency": "118.205",
-    "abbreviation": "DHAT",
-    "description": "Hamburg Director",
-    "schedule_show_always": [
-      "EDWW"
-    ],
-    "gcap_status": "1"
-  },
   {
     "logon": "EDDH_TWR",
     "frequency": "126.855",
@@ -1271,19 +1251,19 @@
     ]
   },
   {
-    "logon": "EDDV_DEL",
-    "frequency": "120.405",
-    "abbreviation": "DVL",
-    "description": "Hannover Delivery",
+    "logon": "EDDV_A_APP",
+    "frequency": "119.605",
+    "abbreviation": "DVAT",
+    "description": "Hannover Arrival (Feeder)",
     "schedule_show_booked": [
       "EDWW"
     ]
   },
   {
-    "logon": "EDDV_F_APP",
-    "frequency": "119.605",
-    "abbreviation": "DVAT",
-    "description": "Hannover Director",
+    "logon": "EDDV_DEL",
+    "frequency": "120.405",
+    "abbreviation": "DVL",
+    "description": "Hannover Delivery",
     "schedule_show_booked": [
       "EDWW"
     ]
@@ -4252,10 +4232,20 @@
     "cpdlc_login": "EDYC"
   },
   {
-    "logon": "EDYY_H_CTR",
+    "logon": "EDYY_HH_CTR",
+    "frequency": "132.780",
+    "abbreviation": "HH",
+    "description": "Maastricht Radar (Holstein High)",
+    "schedule_show_booked": [
+      "EDWW"
+    ],
+    "cpdlc_login": "EDHH"
+  },
+  {
+    "logon": "EDYY_HL_CTR",
     "frequency": "120.860",
-    "abbreviation": "HOL",
-    "description": "Maastricht Radar (Holstein)",
+    "abbreviation": "HL",
+    "description": "Maastricht Radar (Holstein Low)",
     "schedule_show_booked": [
       "EDWW"
     ],
@@ -4264,7 +4254,7 @@
   {
     "logon": "EDYY_JH_CTR",
     "frequency": "129.735",
-    "abbreviation": "JEVH",
+    "abbreviation": "JH",
     "description": "Maastricht Radar (Jever High)",
     "schedule_show_booked": [
       "EDWW"
@@ -4272,10 +4262,10 @@
     "cpdlc_login": "EDJH"
   },
   {
-    "logon": "EDYY_J_CTR",
+    "logon": "EDYY_JL_CTR",
     "frequency": "136.465",
-    "abbreviation": "JEV",
-    "description": "Maastricht Radar (Jever)",
+    "abbreviation": "JL",
+    "description": "Maastricht Radar (Jever Low)",
     "schedule_show_booked": [
       "EDWW"
     ],
diff --git a/edww/app.json b/edww/app.json
index 2c0c991..68db26b 100644
--- a/edww/app.json
+++ b/edww/app.json
@@ -21,20 +21,20 @@
     "gcap_status": "1"
   },
   {
-    "logon": "EDDB_D_APP",
+    "logon": "EDDB_AS_APP",
     "frequency": "121.130",
     "abbreviation": "DBAST",
-    "description": "Berlin Director Sued",
+    "description": "Berlin Arrival (Feeder Sued)",
     "schedule_show_always": [
       "EDWW"
     ],
     "gcap_status": "1"
   },
   {
-    "logon": "EDDB_F_APP",
+    "logon": "EDDB_AN_APP",
     "frequency": "136.105",
     "abbreviation": "DBANT",
-    "description": "Berlin Director Nord",
+    "description": "Berlin Arrival (Feeder Nord)",
     "schedule_show_booked": [
       "EDWW"
     ],
@@ -60,26 +60,6 @@
     ],
     "gcap_status": "1"
   },
-  {
-    "logon": "EDDB_Z_APP",
-    "frequency": "126.425",
-    "abbreviation": "DBASQ",
-    "description": "Bremen Radar (Berlin Arrival Sued Coordinator)",
-    "schedule_show_booked": [
-      "EDWW"
-    ],
-    "gcap_status": "1"
-  },
-  {
-    "logon": "EDDB_Y_APP",
-    "frequency": "119.630",
-    "abbreviation": "DBANQ",
-    "description": "Bremen Radar (Berlin Arrival Nord Coordinator)",
-    "schedule_show_booked": [
-      "EDWW"
-    ],
-    "gcap_status": "1"
-  },
   {
     "logon": "EDDH_E_APP",
     "frequency": "119.510",
@@ -92,10 +72,10 @@
     "gcap_status": "1"
   },
   {
-    "logon": "EDDH_F_APP",
+    "logon": "EDDH_A_APP",
     "frequency": "118.205",
     "abbreviation": "DHAT",
-    "description": "Hamburg Director",
+    "description": "Hamburg Arrival (Feeder)",
     "schedule_show_always": [
       "EDWW"
     ],
@@ -122,10 +102,10 @@
     ]
   },
   {
-    "logon": "EDDV_F_APP",
+    "logon": "EDDV_A_APP",
     "frequency": "119.605",
     "abbreviation": "DVAT",
-    "description": "Hannover Director",
+    "description": "Hannover Arrival (Feeder)",
     "schedule_show_booked": [
       "EDWW"
     ]
diff --git a/edyy/ctr.json b/edyy/ctr.json
index 8cbbf92..3c3972c 100644
--- a/edyy/ctr.json
+++ b/edyy/ctr.json
@@ -20,20 +20,30 @@
     "cpdlc_login": "EDCH"
   },
   {
-    "logon": "EDYY_H_CTR",
+    "logon": "EDYY_HL_CTR",
     "frequency": "120.860",
-    "abbreviation": "HOL",
-    "description": "Maastricht Radar (Holstein)",
+    "abbreviation": "HL",
+    "description": "Maastricht Radar (Holstein Low)",
     "schedule_show_booked": [
       "EDWW"
     ],
     "cpdlc_login": "EDYH"
   },
   {
-    "logon": "EDYY_J_CTR",
+    "logon": "EDYY_HH_CTR",
+    "frequency": "132.780",
+    "abbreviation": "HH",
+    "description": "Maastricht Radar (Holstein High)",
+    "schedule_show_booked": [
+      "EDWW"
+    ],
+    "cpdlc_login": "EDHH"
+  },
+  {
+    "logon": "EDYY_JL_CTR",
     "frequency": "136.465",
-    "abbreviation": "JEV",
-    "description": "Maastricht Radar (Jever)",
+    "abbreviation": "JL",
+    "description": "Maastricht Radar (Jever Low)",
     "schedule_show_booked": [
       "EDWW"
     ],
@@ -42,7 +52,7 @@
   {
     "logon": "EDYY_JH_CTR",
     "frequency": "129.735",
-    "abbreviation": "JEVH",
+    "abbreviation": "JH",
     "description": "Maastricht Radar (Jever High)",
     "schedule_show_booked": [
       "EDWW"
diff --git a/legacy/atc_station_mappings.json b/legacy/atc_station_mappings.json
index 3e39913..9958003 100644
--- a/legacy/atc_station_mappings.json
+++ b/legacy/atc_station_mappings.json
@@ -75,29 +75,29 @@
     "frequency": "122.480"
   },
   {
-    "id": "DBGA",
+    "id": "DBANT",
     "callsignPrefix": "EDDB",
-    "frequency": "121.855"
+    "frequency": "136.105"
   },
   {
-    "id": "DBC",
+    "id": "DBAST",
     "callsignPrefix": "EDDB",
-    "frequency": "121.605"
+    "frequency": "121.130"
   },
   {
-    "id": "DBAST",
+    "id": "DBGA",
     "callsignPrefix": "EDDB",
-    "frequency": "121.130"
+    "frequency": "121.855"
   },
   {
-    "id": "DBGE",
+    "id": "DBC",
     "callsignPrefix": "EDDB",
-    "frequency": "129.605"
+    "frequency": "121.605"
   },
   {
-    "id": "DBANT",
+    "id": "DBGE",
     "callsignPrefix": "EDDB",
-    "frequency": "136.105"
+    "frequency": "129.605"
   },
   {
     "id": "DBI",
@@ -144,16 +144,6 @@
     "callsignPrefix": "EDDB",
     "frequency": "118.805"
   },
-  {
-    "id": "DBANQ",
-    "callsignPrefix": "EDDB",
-    "frequency": "119.630"
-  },
-  {
-    "id": "DBASQ",
-    "callsignPrefix": "EDDB",
-    "frequency": "126.425"
-  },
   {
     "id": "DCAG",
     "callsignPrefix": "EDDC",
@@ -299,6 +289,11 @@
     "callsignPrefix": "EDDG",
     "frequency": "129.805"
   },
+  {
+    "id": "DHAT",
+    "callsignPrefix": "EDDH",
+    "frequency": "118.205"
+  },
   {
     "id": "DHL",
     "callsignPrefix": "EDDH",
@@ -314,11 +309,6 @@
     "callsignPrefix": "EDDH",
     "frequency": "121.705"
   },
-  {
-    "id": "DHAT",
-    "callsignPrefix": "EDDH",
-    "frequency": "118.205"
-  },
   {
     "id": "DHT",
     "callsignPrefix": "EDDH",
@@ -625,14 +615,14 @@
     "frequency": "119.490"
   },
   {
-    "id": "DVL",
+    "id": "DVAT",
     "callsignPrefix": "EDDV",
-    "frequency": "120.405"
+    "frequency": "119.605"
   },
   {
-    "id": "DVAT",
+    "id": "DVL",
     "callsignPrefix": "EDDV",
-    "frequency": "119.605"
+    "frequency": "120.405"
   },
   {
     "id": "DVG",
@@ -2270,17 +2260,22 @@
     "frequency": "133.955"
   },
   {
-    "id": "HOL",
+    "id": "HH",
+    "callsignPrefix": "EDYY",
+    "frequency": "132.780"
+  },
+  {
+    "id": "HL",
     "callsignPrefix": "EDYY",
     "frequency": "120.860"
   },
   {
-    "id": "JEVH",
+    "id": "JH",
     "callsignPrefix": "EDYY",
     "frequency": "129.735"
   },
   {
-    "id": "JEV",
+    "id": "JL",
     "callsignPrefix": "EDYY",
     "frequency": "136.465"
   },
diff --git a/legacy/schedule.json b/legacy/schedule.json
index 1abde15..03f7ba8 100644
--- a/legacy/schedule.json
+++ b/legacy/schedule.json
@@ -344,17 +344,17 @@
     {
         "name": "EDWW",
         "schedule_show_always": [
+            "EDDB_AS_APP",
             "EDDB_A_GND",
             "EDDB_DEL",
-            "EDDB_D_APP",
             "EDDB_S_APP",
             "EDDB_S_DEP",
             "EDDB_S_GND",
             "EDDB_S_TWR",
+            "EDDH_A_APP",
             "EDDH_DEL",
             "EDDH_E_APP",
             "EDDH_E_GND",
-            "EDDH_F_APP",
             "EDDH_TWR",
             "EDDV_APP",
             "EDDV_GND",
@@ -370,20 +370,18 @@
         ],
         "schedule_show_booked": [
             "EDAH_TWR",
+            "EDDB_AN_APP",
             "EDDB_E_GND",
-            "EDDB_F_APP",
             "EDDB_ICE_GND",
             "EDDB_N_APP",
             "EDDB_N_DEP",
             "EDDB_N_GND",
             "EDDB_N_TWR",
-            "EDDB_Y_APP",
-            "EDDB_Z_APP",
             "EDDH_VFR_TWR",
             "EDDH_W_APP",
             "EDDH_W_GND",
+            "EDDV_A_APP",
             "EDDV_DEL",
-            "EDDV_F_APP",
             "EDDW_GND",
             "EDHI_TWR",
             "EDHL_GND",
@@ -409,9 +407,10 @@
             "EDXX_WW_CTR",
             "EDYY_CH_CTR",
             "EDYY_C_CTR",
-            "EDYY_H_CTR",
+            "EDYY_HH_CTR",
+            "EDYY_HL_CTR",
             "EDYY_JH_CTR",
-            "EDYY_J_CTR",
+            "EDYY_JL_CTR",
             "EDYY_MNS_CTR",
             "EDYY_SH_CTR",
             "EDYY_S_CTR",
diff --git a/topsky/TopSkyCPDLC.txt b/topsky/TopSkyCPDLC.txt
index b506c8a..408fe1b 100644
--- a/topsky/TopSkyCPDLC.txt
+++ b/topsky/TopSkyCPDLC.txt
@@ -17,11 +17,12 @@ LOGIN:EDGP:LANGEN RADAR CTR:PADH
 LOGIN:EDGR:LANGEN RADAR CTR:RUD
 
 LOGIN:EDCH:MAASTRICHT RADAR CTR:CELH
-LOGIN:EDJH:MAASTRICHT RADAR CTR:JEVH
+LOGIN:EDHH:MAASTRICHT RADAR CTR:HH
+LOGIN:EDJH:MAASTRICHT RADAR CTR:JH
 LOGIN:EDSH:MAASTRICHT RADAR CTR:SOLH
 LOGIN:EDYC:MAASTRICHT RADAR CTR:CEL
-LOGIN:EDYH:MAASTRICHT RADAR CTR:HOL
-LOGIN:EDYJ:MAASTRICHT RADAR CTR:JEV
+LOGIN:EDYH:MAASTRICHT RADAR CTR:HL
+LOGIN:EDYJ:MAASTRICHT RADAR CTR:JL
 LOGIN:EDYM:MAASTRICHT RADAR CTR:MNS
 LOGIN:EDYR:MAASTRICHT RADAR CTR:RHR
 LOGIN:EDYS:MAASTRICHT RADAR CTR:SOL