diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 7c3e47ad6e..cd0d81c512 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1113,7 +1113,7 @@ sponsored;[sponsored];;name;int_name;1112;
 sponsored|booking;1113;
 hwtag|nobicycle;1114;
 hwtag|yesbicycle;1115;
-hwtag|bicycle_bidir;1116;
+hwtag|bidir_bicycle;1116;
 psurface|paved_good;1117;
 psurface|paved_bad;1118;
 psurface|unpaved_good;1119;
diff --git a/data/visibility.txt b/data/visibility.txt
index a46afd4b42..d4afcc7311 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -363,7 +363,7 @@ world  00000000000000000000  +
         wayside_shrine  00000000000000000111  -
         {}
     hwtag  00000000000000000000  +
-        bicycle_bidir  00000000000000000000  -
+        bidir_bicycle  00000000000000000000  -
         lit  00000000000000000000  -
         nobicycle  00000000000000000000  -
         nofoot  00000000000000000000  -