diff --git a/data.json b/data.json
index eb07c9c..09c63fa 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"
     ]
diff --git a/edww/app.json b/edww/app.json
index 181d480..68db26b 100644
--- a/edww/app.json
+++ b/edww/app.json
@@ -120,4 +120,4 @@
       "EDWW"
     ]
   }
-]
+]
\ No newline at end of file
diff --git a/legacy/atc_station_mappings.json b/legacy/atc_station_mappings.json
index bf74bce..2b38ead 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",
diff --git a/legacy/schedule.json b/legacy/schedule.json
index eebe210..4759cc3 100644
--- a/legacy/schedule.json
+++ b/legacy/schedule.json
@@ -336,17 +336,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",
@@ -362,20 +362,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",