diff --git a/routing/bicycle_model.cpp b/routing/bicycle_model.cpp
index 66507e9d2f..77cae657e1 100644
--- a/routing/bicycle_model.cpp
+++ b/routing/bicycle_model.cpp
@@ -64,7 +64,7 @@ routing::VehicleModel::InitListT const g_bicycleLimitsDefault =
   { {"highway", "road"},           kSpeedRoadKMpH },
   { {"highway", "track"},          kSpeedTrackKMpH }, // *
   { {"highway", "path"},           kSpeedPathKMpH },
-  { {"highway", "cycleway"},       kSpeedPedestrianKMpH },
+  { {"highway", "cycleway"},       kSpeedCyclewayKMpH },
   { {"highway", "residential"},    kSpeedResidentialKMpH },
   { {"highway", "living_street"},  kSpeedLivingStreetKMpH },
   { {"highway", "steps"},          kSpeedStepsKMpH }, // *
@@ -74,27 +74,27 @@ routing::VehicleModel::InitListT const g_bicycleLimitsDefault =
 // All options available.
 routing::VehicleModel::InitListT const g_bicycleLimitsAll =
 {
-  { {"highway", "trunk"},          kSpeedPedestrianKMpH },
-  { {"highway", "trunk_link"},     kSpeedPedestrianKMpH },
-  { {"highway", "primary"},        kSpeedPedestrianKMpH },
-  { {"highway", "primary_link"},   kSpeedPedestrianKMpH },
-  { {"highway", "secondary"},      kSpeedPedestrianKMpH },
-  { {"highway", "secondary_link"}, kSpeedPedestrianKMpH },
-  { {"highway", "tertiary"},       kSpeedPedestrianKMpH },
-  { {"highway", "tertiary_link"},  kSpeedPedestrianKMpH },
-  { {"highway", "service"},        kSpeedPedestrianKMpH },
-  { {"highway", "unclassified"},   kSpeedPedestrianKMpH },
-  { {"highway", "road"},           kSpeedPedestrianKMpH },
-  { {"highway", "track"},          kSpeedPedestrianKMpH },
-  { {"highway", "path"},           kSpeedPedestrianKMpH },
-  { {"highway", "bridleway"},      kSpeedPedestrianKMpH },
-  { {"highway", "cycleway"},       kSpeedPedestrianKMpH },
-  { {"highway", "residential"},    kSpeedPedestrianKMpH },
-  { {"highway", "living_street"},  kSpeedPedestrianKMpH },
-  { {"highway", "steps"},          kSpeedPedestrianKMpH },
-  { {"highway", "pedestrian"},     kSpeedPedestrianKMpH },
-  { {"highway", "footway"},        kSpeedPedestrianKMpH },
-  { {"highway", "platform"},       kSpeedPedestrianKMpH },
+  { {"highway", "trunk"},          kSpeedCyclewayKMpH },
+  { {"highway", "trunk_link"},     kSpeedCyclewayKMpH },
+  { {"highway", "primary"},        kSpeedCyclewayKMpH },
+  { {"highway", "primary_link"},   kSpeedCyclewayKMpH },
+  { {"highway", "secondary"},      kSpeedCyclewayKMpH },
+  { {"highway", "secondary_link"}, kSpeedCyclewayKMpH },
+  { {"highway", "tertiary"},       kSpeedCyclewayKMpH },
+  { {"highway", "tertiary_link"},  kSpeedCyclewayKMpH },
+  { {"highway", "service"},        kSpeedCyclewayKMpH },
+  { {"highway", "unclassified"},   kSpeedCyclewayKMpH },
+  { {"highway", "road"},           kSpeedCyclewayKMpH },
+  { {"highway", "track"},          kSpeedCyclewayKMpH },
+  { {"highway", "path"},           kSpeedCyclewayKMpH },
+  { {"highway", "bridleway"},      kSpeedCyclewayKMpH },
+  { {"highway", "cycleway"},       kSpeedCyclewayKMpH },
+  { {"highway", "residential"},    kSpeedCyclewayKMpH },
+  { {"highway", "living_street"},  kSpeedCyclewayKMpH },
+  { {"highway", "steps"},          kSpeedCyclewayKMpH },
+  { {"highway", "pedestrian"},     kSpeedCyclewayKMpH },
+  { {"highway", "footway"},        kSpeedCyclewayKMpH },
+  { {"highway", "platform"},       kSpeedCyclewayKMpH },
 };
 
 // Australia