diff --git a/data/deprecated.json b/data/deprecated.json
index ad8af2b86..b99aead66 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -765,22 +765,6 @@
       "old": {"railway": "station"},
       "replace": {"railway": "station", "public_transport": "station"}
     },
-    {
-      "old": {"railway": "station", "station": "light_rail"},
-      "replace": {"railway": "station", "station": "light_rail", "public_transport": "station", "light_rail": "yes"}
-    },
-    {
-      "old": {"railway": "station", "station": "monorail"},
-      "replace": {"railway": "station", "station": "monorail", "public_transport": "station", "monorail": "yes"}
-    },
-    {
-      "old": {"railway": "station", "station": "subway"},
-      "replace": {"railway": "station", "station": "subway", "public_transport": "station", "subway": "yes"}
-    },
-    {
-      "old": {"railway": "station", "station": "train"},
-      "replace": {"railway": "station", "station": "train", "public_transport": "station", "train": "yes"}
-    },
     {
       "old": {"recommended_speed": "*"},
       "replace": {"maxspeed:advisory": "$1"}
@@ -1001,6 +985,22 @@
       "old": {"sport": "shuffle_board"},
       "replace": {"sport": "shuffleboard"}
     },
+    {
+      "old": {"station": "light_rail"},
+      "replace": {"station": "light_rail", "light_rail": "yes"}
+    },
+    {
+      "old": {"station": "monorail"},
+      "replace": {"station": "monorail", "monorail": "yes"}
+    },
+    {
+      "old": {"station": "subway"},
+      "replace": {"station": "subway", "subway": "yes"}
+    },
+    {
+      "old": {"station": "train"},
+      "replace": {"station": "train", "train": "yes"}
+    },
     {
       "old": {"sustenance": "bar"},
       "replace": {"amenity": "bar"}
diff --git a/data/taginfo.json b/data/taginfo.json
index 95c03f63d..7a21d2618 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2079,6 +2079,10 @@
     {"key": "sport", "value": "horse_shoes", "description": "🄳 ➜ sport=horseshoes"},
     {"key": "sport", "value": "horseshoe", "description": "🄳 ➜ sport=horseshoes"},
     {"key": "sport", "value": "shuffle_board", "description": "🄳 ➜ sport=shuffleboard"},
+    {"key": "station", "value": "light_rail", "description": "🄳 ➜ station=light_rail + light_rail=yes"},
+    {"key": "station", "value": "monorail", "description": "🄳 ➜ station=monorail + monorail=yes"},
+    {"key": "station", "value": "subway", "description": "🄳 ➜ station=subway + subway=yes"},
+    {"key": "station", "value": "train", "description": "🄳 ➜ station=train + train=yes"},
     {"key": "sustenance", "value": "bar", "description": "🄳 ➜ amenity=bar"},
     {"key": "sustenance", "value": "cafe", "description": "🄳 ➜ amenity=cafe"},
     {"key": "sustenance", "value": "pub", "description": "🄳 ➜ amenity=pub"},