diff --git a/include/util/geojson_validation.hpp b/include/util/geojson_validation.hpp
index e290828cb..d24c8da71 100644
--- a/include/util/geojson_validation.hpp
+++ b/include/util/geojson_validation.hpp
@@ -11,7 +11,7 @@ namespace osrm
 namespace util
 {
 
-inline void ValidateCoordinate(const rapidjson::Value &coordinate)
+inline void validateCoordinate(const rapidjson::Value &coordinate)
 {
     if (!coordinate.IsArray())
         throw osrm::util::exception("Feature geometry has a non-array coordinate.");
@@ -30,7 +30,7 @@ inline void ValidateCoordinate(const rapidjson::Value &coordinate)
     }
 }
 
-inline void ValidateFeature(const rapidjson::Value &feature)
+inline void validateFeature(const rapidjson::Value &feature)
 {
     if (!feature.HasMember("type"))
     {
diff --git a/src/util/timezones.cpp b/src/util/timezones.cpp
index 9f9a51930..dcbbc4b12 100644
--- a/src/util/timezones.cpp
+++ b/src/util/timezones.cpp
@@ -107,7 +107,7 @@ void Timezoner::LoadLocalTimesRTree(rapidjson::Document &geojson, std::time_t ut
     std::vector<rtree_t::value_type> polygons;
     for (rapidjson::SizeType i = 0; i < features_array.Size(); i++)
     {
-        util::ValidateFeature(features_array[i]);
+        util::validateFeature(features_array[i]);
         // time zone geojson specific checks
         if (!features_array[i]["properties"].GetObject().HasMember("TZID") &&
             !features_array[i]["properties"].GetObject().HasMember("tzid"))
@@ -134,7 +134,7 @@ void Timezoner::LoadLocalTimesRTree(rapidjson::Document &geojson, std::time_t ut
                                           .GetArray();
             for (rapidjson::SizeType i = 0; i < coords_outer_array.Size(); ++i)
             {
-                util::ValidateCoordinate(coords_outer_array[i]);
+                util::validateCoordinate(coords_outer_array[i]);
                 const auto &coords = coords_outer_array[i].GetArray();
                 polygon.outer().emplace_back(coords[0].GetDouble(), coords[1].GetDouble());
             }
@@ -142,7 +142,7 @@ void Timezoner::LoadLocalTimesRTree(rapidjson::Document &geojson, std::time_t ut
                                   local_times.size());
 
             // Get time zone name and emplace polygon and local time for the UTC input
-            const auto tzname =
+            const auto &tzname =
                 features_array[i].GetObject()["properties"].GetObject()["tzid"].GetString();
             local_times.push_back(local_time_t{polygon, get_local_time_in_tz(tzname)});
         }
diff --git a/unit_tests/updater/validation.cpp b/unit_tests/updater/validation.cpp
index 5062193b6..b68c34528 100644
--- a/unit_tests/updater/validation.cpp
+++ b/unit_tests/updater/validation.cpp
@@ -12,19 +12,19 @@ BOOST_AUTO_TEST_CASE(timezone_coordinate_validation_test)
     rapidjson::Document doc;
     char valid_coord[] = "[8.28369,48.88277]";
     doc.Parse(valid_coord);
-    BOOST_CHECK_NO_THROW(util::ValidateCoordinate(doc));
+    BOOST_CHECK_NO_THROW(util::validateCoordinate(doc));
 
     char non_array[] = "{\"x\": 48.88277}";
     doc.Parse(non_array);
-    BOOST_CHECK_THROW(util::ValidateCoordinate(doc), util::exception);
+    BOOST_CHECK_THROW(util::validateCoordinate(doc), util::exception);
 
     char too_many[] = "[8.28369, 48.88277, 8.2806]";
     doc.Parse(too_many);
-    BOOST_CHECK_THROW(util::ValidateCoordinate(doc), util::exception);
+    BOOST_CHECK_THROW(util::validateCoordinate(doc), util::exception);
 
     char nan[] = "[8.28369, y]";
     doc.Parse(nan);
-    BOOST_CHECK_THROW(util::ValidateCoordinate(doc), util::exception);
+    BOOST_CHECK_THROW(util::validateCoordinate(doc), util::exception);
 }
 
 BOOST_AUTO_TEST_CASE(timezone_validation_test)
@@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
         "49.07206], [8.28369, 48.88277]]] }}";
     rapidjson::Document doc;
     doc.Parse(json);
-    BOOST_CHECK_NO_THROW(util::ValidateFeature(doc));
+    BOOST_CHECK_NO_THROW(util::validateFeature(doc));
 
     char missing_type[] = "{\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { "
                           "\"type\": \"polygon\", "
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
                           "48.88277], [8.57757, 49.07206], [8.28369, "
                           "49.07206], [8.28369, 48.88277]]] }}";
     doc.Parse(missing_type);
-    BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
+    BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
 
     char missing_props[] =
         "{ \"type\" : \"Feature\","
@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
         "48.88277], [8.57757, 49.07206], [8.28369, "
         "49.07206], [8.28369, 48.88277]]] }}";
     doc.Parse(missing_props);
-    BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
+    BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
 
     char nonobj_props[] =
         "{ \"type\" : \"Feature\","
@@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
         "48.88277], [8.57757, 49.07206], [8.28369, "
         "49.07206], [8.28369, 48.88277]]] }}";
     doc.Parse(nonobj_props);
-    BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
+    BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
 
     char missing_tzid[] = "{ \"type\" : \"Feature\","
                           "\"properties\" : { }, \"geometry\" : { \"type\": \"polygon\", "
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
                           "48.88277], [8.57757, 49.07206], [8.28369, "
                           "49.07206], [8.28369, 48.88277]]] }}";
     doc.Parse(missing_tzid);
-    BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
+    BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
 
     char tzid_err[] = "{ \"type\" : \"Feature\","
                       "\"properties\" : { \"TZID\" : []}, \"geometry\" : { \"type\": \"polygon\", "
@@ -79,7 +79,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
                       "48.88277], [8.57757, 49.07206], [8.28369, "
                       "49.07206], [8.28369, 48.88277]]] }}";
     doc.Parse(tzid_err);
-    BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
+    BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
 
     char missing_geom[] = "{ \"type\" : \"Feature\","
                           "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometries\" : { "
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
                           "48.88277], [8.57757, 49.07206], [8.28369, "
                           "49.07206], [8.28369, 48.88277]]] }}";
     doc.Parse(missing_geom);
-    BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
+    BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
 
     char nonobj_geom[] =
         "{ \"type\" : \"Feature\","
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
         "48.88277], [8.57757, 49.07206], [8.28369, "
         "49.07206], [8.28369, 48.88277]]] ]}";
     doc.Parse(nonobj_geom);
-    BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
+    BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
 
     char missing_geom_type[] = "{ \"type\" : \"Feature\","
                                "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { "
@@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
                                "48.88277], [8.57757, 49.07206], [8.28369, "
                                "49.07206], [8.28369, 48.88277]]] }}";
     doc.Parse(missing_geom_type);
-    BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
+    BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
 
     char nonstring_geom_type[] = "{ \"type\" : \"Feature\","
                                  "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : "
@@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
                                  "48.88277], [8.57757, 49.07206], [8.28369, "
                                  "49.07206], [8.28369, 48.88277]]] }}";
     doc.Parse(nonstring_geom_type);
-    BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
+    BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
 
     char missing_coords[] =
         "{ \"type\" : \"Feature\","
@@ -124,7 +124,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
         "48.88277], [8.57757, 49.07206], [8.28369, "
         "49.07206], [8.28369, 48.88277]]] }}";
     doc.Parse(missing_coords);
-    BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
+    BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
 
     char missing_outerring[] =
         "{ \"type\" : \"Feature\","
@@ -133,6 +133,6 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
         "48.88277], [8.57757, 49.07206], [8.28369, "
         "49.07206], [8.28369, 48.88277]] }}";
     doc.Parse(missing_outerring);
-    BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
+    BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
 }
 BOOST_AUTO_TEST_SUITE_END()