diff --git a/include/contractor/contract_excludable_graph.hpp b/include/contractor/contract_excludable_graph.hpp
index 05567f287..f6a34fc4a 100644
--- a/include/contractor/contract_excludable_graph.hpp
+++ b/include/contractor/contract_excludable_graph.hpp
@@ -92,6 +92,6 @@ inline auto contractExcludableGraph(ContractorGraph contractor_graph_,
     return GraphAndFilter{QueryGraph{num_nodes, edge_container.edges},
                           edge_container.MakeEdgeFilters()};
 }
-} // namespace osrm
+} // namespace osrm::contractor
 
 #endif
diff --git a/include/contractor/contracted_edge_container.hpp b/include/contractor/contracted_edge_container.hpp
index 89affa65a..4dec3be62 100644
--- a/include/contractor/contracted_edge_container.hpp
+++ b/include/contractor/contracted_edge_container.hpp
@@ -162,6 +162,6 @@ struct ContractedEdgeContainer
     std::vector<MergedFlags> flags;
     std::vector<QueryEdge> edges;
 };
-} // namespace osrm
+} // namespace osrm::contractor
 
 #endif
diff --git a/include/contractor/contracted_metric.hpp b/include/contractor/contracted_metric.hpp
index 184e6aae2..b41d7f2ac 100644
--- a/include/contractor/contracted_metric.hpp
+++ b/include/contractor/contracted_metric.hpp
@@ -17,6 +17,6 @@ template <storage::Ownership Ownership> struct ContractedMetric
 
 using ContractedMetric = detail::ContractedMetric<storage::Ownership::Container>;
 using ContractedMetricView = detail::ContractedMetric<storage::Ownership::View>;
-} // namespace osrm
+} // namespace osrm::contractor
 
 #endif
diff --git a/include/contractor/contractor.hpp b/include/contractor/contractor.hpp
index 5db562e30..4bd38b52b 100644
--- a/include/contractor/contractor.hpp
+++ b/include/contractor/contractor.hpp
@@ -47,6 +47,6 @@ class Contractor
   private:
     ContractorConfig config;
 };
-} // namespace osrm
+} // namespace osrm::contractor
 
 #endif // PROCESSING_CHAIN_HPP
diff --git a/include/contractor/contractor_config.hpp b/include/contractor/contractor_config.hpp
index 164065cb0..020720dde 100644
--- a/include/contractor/contractor_config.hpp
+++ b/include/contractor/contractor_config.hpp
@@ -69,6 +69,6 @@ struct ContractorConfig final : storage::IOConfig
     //(e.g. 0.8 contracts 80 percent of the hierarchy, leaving a core of 20%)
     double core_factor = 1.0;
 };
-} // namespace osrm
+} // namespace osrm::contractor
 
 #endif // EXTRACTOR_OPTIONS_HPP
diff --git a/include/contractor/contractor_graph.hpp b/include/contractor/contractor_graph.hpp
index 13d44985f..e88a5185c 100644
--- a/include/contractor/contractor_graph.hpp
+++ b/include/contractor/contractor_graph.hpp
@@ -40,6 +40,6 @@ struct ContractorEdgeData
 using ContractorGraph = util::DynamicGraph<ContractorEdgeData>;
 using ContractorEdge = ContractorGraph::InputEdge;
 
-} // namespace osrm
+} // namespace osrm::contractor
 
 #endif // OSRM_CONTRACTOR_CONTRACTOR_GRAPH_HPP_
diff --git a/include/contractor/contractor_heap.hpp b/include/contractor/contractor_heap.hpp
index 79fce9df5..fc581f3b0 100644
--- a/include/contractor/contractor_heap.hpp
+++ b/include/contractor/contractor_heap.hpp
@@ -22,6 +22,6 @@ using ContractorHeap = util::QueryHeap<NodeID,
                                        ContractorHeapData,
                                        util::XORFastHashStorage<NodeID, NodeID>>;
 
-} // namespace osrm
+} // namespace osrm::contractor
 
 #endif // OSRM_CONTRACTOR_CONTRACTOR_HEAP_HPP_
diff --git a/include/contractor/contractor_search.hpp b/include/contractor/contractor_search.hpp
index ebc0b40b9..2adcf212d 100644
--- a/include/contractor/contractor_search.hpp
+++ b/include/contractor/contractor_search.hpp
@@ -18,6 +18,6 @@ void search(ContractorHeap &heap,
             const EdgeWeight weight_limit,
             const NodeID forbidden_node);
 
-} // namespace osrm
+} // namespace osrm::contractor
 
 #endif // OSRM_CONTRACTOR_DIJKSTRA_HPP
diff --git a/include/contractor/crc32_processor.hpp b/include/contractor/crc32_processor.hpp
index c909731ba..81b0baa08 100644
--- a/include/contractor/crc32_processor.hpp
+++ b/include/contractor/crc32_processor.hpp
@@ -123,6 +123,6 @@ struct RangebasedCRC32
   private:
     IteratorbasedCRC32 crc32;
 };
-} // namespace osrm
+} // namespace osrm::contractor
 
 #endif /* ITERATOR_BASED_CRC32_H */
diff --git a/include/contractor/files.hpp b/include/contractor/files.hpp
index 6c747b6cf..c0755b728 100644
--- a/include/contractor/files.hpp
+++ b/include/contractor/files.hpp
@@ -48,6 +48,6 @@ inline void writeGraph(const boost::filesystem::path &path,
         serialization::write(writer, "/ch/metrics/" + pair.first, pair.second);
     }
 }
-} // namespace osrm
+} // namespace osrm::contractor::files
 
 #endif
diff --git a/include/contractor/graph_contractor.hpp b/include/contractor/graph_contractor.hpp
index 2df62c795..8592d75b1 100644
--- a/include/contractor/graph_contractor.hpp
+++ b/include/contractor/graph_contractor.hpp
@@ -35,6 +35,6 @@ inline auto contractGraph(ContractorGraph &graph,
         graph, {}, std::move(node_is_contractable), std::move(node_weights), core_factor);
 }
 
-} // namespace osrm
+} // namespace osrm::contractor
 
 #endif // OSRM_CONTRACTOR_GRAPH_CONTRACTOR_HPP
diff --git a/include/contractor/graph_contractor_adaptors.hpp b/include/contractor/graph_contractor_adaptors.hpp
index a622b9048..903fa08c5 100644
--- a/include/contractor/graph_contractor_adaptors.hpp
+++ b/include/contractor/graph_contractor_adaptors.hpp
@@ -175,6 +175,6 @@ template <class Edge, typename GraphT> inline std::vector<Edge> toEdges(GraphT g
     return edges;
 }
 
-} // namespace osrm
+} // namespace osrm::contractor
 
 #endif // OSRM_CONTRACTOR_GRAPH_CONTRACTION_ADAPTORS_HPP_
diff --git a/include/contractor/query_edge.hpp b/include/contractor/query_edge.hpp
index f8281ac0e..3776aab18 100644
--- a/include/contractor/query_edge.hpp
+++ b/include/contractor/query_edge.hpp
@@ -75,6 +75,6 @@ struct QueryEdge
                 data.distance == right.data.distance);
     }
 };
-} // namespace osrm
+} // namespace osrm::contractor
 
 #endif // QUERYEDGE_HPP
diff --git a/include/contractor/query_graph.hpp b/include/contractor/query_graph.hpp
index ad7844435..44cc14092 100644
--- a/include/contractor/query_graph.hpp
+++ b/include/contractor/query_graph.hpp
@@ -17,6 +17,6 @@ using QueryGraph = util::StaticGraph<typename QueryEdge::EdgeData, Ownership>;
 
 using QueryGraph = detail::QueryGraph<storage::Ownership::Container>;
 using QueryGraphView = detail::QueryGraph<storage::Ownership::View>;
-} // namespace osrm
+} // namespace osrm::contractor
 
 #endif // QUERYEDGE_HPP
diff --git a/include/contractor/serialization.hpp b/include/contractor/serialization.hpp
index da9ec8bdb..f1c3bd969 100644
--- a/include/contractor/serialization.hpp
+++ b/include/contractor/serialization.hpp
@@ -42,6 +42,6 @@ void read(storage::tar::FileReader &reader,
                                      metric.edge_filter[index]);
     }
 }
-} // namespace osrm
+} // namespace osrm::contractor::serialization
 
 #endif
diff --git a/include/customizer/cell_customizer.hpp b/include/customizer/cell_customizer.hpp
index 5cb924c89..bf625fa9b 100644
--- a/include/customizer/cell_customizer.hpp
+++ b/include/customizer/cell_customizer.hpp
@@ -233,6 +233,6 @@ class CellCustomizer
 
     const partitioner::MultiLevelPartition &partition;
 };
-} // namespace osrm
+} // namespace osrm::customizer
 
 #endif // OSRM_CELLS_CUSTOMIZER_HPP
diff --git a/include/customizer/cell_metric.hpp b/include/customizer/cell_metric.hpp
index 2adf713fb..f9ffc9b84 100644
--- a/include/customizer/cell_metric.hpp
+++ b/include/customizer/cell_metric.hpp
@@ -24,6 +24,6 @@ template <storage::Ownership Ownership> struct CellMetricImpl
 
 using CellMetric = detail::CellMetricImpl<storage::Ownership::Container>;
 using CellMetricView = detail::CellMetricImpl<storage::Ownership::View>;
-} // namespace osrm
+} // namespace osrm::customizer
 
 #endif
diff --git a/include/customizer/customizer.hpp b/include/customizer/customizer.hpp
index 40d2583f8..e153498dc 100644
--- a/include/customizer/customizer.hpp
+++ b/include/customizer/customizer.hpp
@@ -12,6 +12,6 @@ class Customizer
     int Run(const CustomizationConfig &config);
 };
 
-} // namespace osrm
+} // namespace osrm::customizer
 
 #endif // OSRM_CUSTOMIZE_CUSTOMIZER_HPP
diff --git a/include/customizer/customizer_config.hpp b/include/customizer/customizer_config.hpp
index ca5258fb2..3ac028027 100644
--- a/include/customizer/customizer_config.hpp
+++ b/include/customizer/customizer_config.hpp
@@ -37,6 +37,6 @@ struct CustomizationConfig final : storage::IOConfig
 
     updater::UpdaterConfig updater_config;
 };
-} // namespace osrm
+} // namespace osrm::customizer
 
 #endif // OSRM_CUSTOMIZE_CUSTOMIZER_CONFIG_HPP
diff --git a/include/customizer/edge_based_graph.hpp b/include/customizer/edge_based_graph.hpp
index 2f5a552b2..5bc45e24a 100644
--- a/include/customizer/edge_based_graph.hpp
+++ b/include/customizer/edge_based_graph.hpp
@@ -124,6 +124,6 @@ using MultiLevelEdgeBasedGraph =
     MultiLevelGraph<EdgeBasedGraphEdgeData, storage::Ownership::Container>;
 using MultiLevelEdgeBasedGraphView =
     MultiLevelGraph<EdgeBasedGraphEdgeData, storage::Ownership::View>;
-} // namespace osrm
+} // namespace osrm::customizer
 
 #endif
diff --git a/include/customizer/files.hpp b/include/customizer/files.hpp
index 287ca5063..e5394da59 100644
--- a/include/customizer/files.hpp
+++ b/include/customizer/files.hpp
@@ -102,6 +102,6 @@ inline void writeGraph(const boost::filesystem::path &path,
     writer.WriteFrom("/mld/connectivity_checksum", connectivity_checksum);
     serialization::write(writer, "/mld/multilevelgraph", graph);
 }
-} // namespace osrm
+} // namespace osrm::customizer::files
 
 #endif
diff --git a/include/customizer/serialization.hpp b/include/customizer/serialization.hpp
index 158d37a39..afd0cc91e 100644
--- a/include/customizer/serialization.hpp
+++ b/include/customizer/serialization.hpp
@@ -61,6 +61,6 @@ inline void write(storage::tar::FileWriter &writer,
     storage::serialization::write(writer, name + "/is_backward_edge", graph.is_backward_edge);
     storage::serialization::write(writer, name + "/node_to_edge_offset", graph.node_to_edge_offset);
 }
-} // namespace osrm
+} // namespace osrm::customizer::serialization
 
 #endif
diff --git a/include/engine/algorithm.hpp b/include/engine/algorithm.hpp
index eca88b21c..5d86b7626 100644
--- a/include/engine/algorithm.hpp
+++ b/include/engine/algorithm.hpp
@@ -107,6 +107,6 @@ template <> struct HasGetTileTurns<mld::Algorithm> final : std::true_type
 template <> struct HasExcludeFlags<mld::Algorithm> final : std::true_type
 {
 };
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
 
 #endif
diff --git a/include/engine/api/base_api.hpp b/include/engine/api/base_api.hpp
index a1ce063f1..a2acfcfbc 100644
--- a/include/engine/api/base_api.hpp
+++ b/include/engine/api/base_api.hpp
@@ -166,6 +166,6 @@ class BaseAPI
     const BaseParameters &parameters;
 };
 
-} // namespace osrm
+} // namespace osrm::engine::api
 
 #endif
diff --git a/include/engine/api/base_parameters.hpp b/include/engine/api/base_parameters.hpp
index 7e243dc98..9cc13ae01 100644
--- a/include/engine/api/base_parameters.hpp
+++ b/include/engine/api/base_parameters.hpp
@@ -120,6 +120,6 @@ struct BaseParameters
                            });
     }
 };
-} // namespace osrm
+} // namespace osrm::engine::api
 
 #endif // ROUTE_PARAMETERS_HPP
diff --git a/include/engine/api/base_result.hpp b/include/engine/api/base_result.hpp
index eae87550a..328871595 100644
--- a/include/engine/api/base_result.hpp
+++ b/include/engine/api/base_result.hpp
@@ -12,6 +12,6 @@ namespace osrm::engine::api
 {
 using ResultT =
     mapbox::util::variant<util::json::Object, std::string, flatbuffers::FlatBufferBuilder>;
-} // namespace osrm
+} // namespace osrm::engine::api
 
 #endif
diff --git a/include/engine/api/json_factory.hpp b/include/engine/api/json_factory.hpp
index 3e3c98005..a3f2b0954 100644
--- a/include/engine/api/json_factory.hpp
+++ b/include/engine/api/json_factory.hpp
@@ -108,7 +108,7 @@ util::json::Object makeRouteLeg(guidance::RouteLeg leg, util::json::Array steps)
 util::json::Array makeRouteLegs(std::vector<guidance::RouteLeg> legs,
                                 std::vector<util::json::Value> step_geometries,
                                 std::vector<util::json::Object> annotations);
-} // namespace api
-} // namespace osrm
+} // namespace api::json
+} // namespace osrm::engine
 
 #endif // ENGINE_GUIDANCE_API_RESPONSE_GENERATOR_HPP_
diff --git a/include/engine/api/match_api.hpp b/include/engine/api/match_api.hpp
index 341f9cc3b..20034e75b 100644
--- a/include/engine/api/match_api.hpp
+++ b/include/engine/api/match_api.hpp
@@ -249,6 +249,6 @@ class MatchAPI final : public RouteAPI
     const tidy::Result &tidy_result;
 };
 
-} // namespace osrm
+} // namespace osrm::engine::api
 
 #endif
diff --git a/include/engine/api/match_parameters.hpp b/include/engine/api/match_parameters.hpp
index e2009bd6e..52fc64c1e 100644
--- a/include/engine/api/match_parameters.hpp
+++ b/include/engine/api/match_parameters.hpp
@@ -94,6 +94,6 @@ struct MatchParameters : public RouteParameters
                (timestamps.empty() || timestamps.size() == coordinates.size());
     }
 };
-} // namespace osrm
+} // namespace osrm::engine::api
 
 #endif
diff --git a/include/engine/api/match_parameters_tidy.hpp b/include/engine/api/match_parameters_tidy.hpp
index 43b12dd13..93a572b13 100644
--- a/include/engine/api/match_parameters_tidy.hpp
+++ b/include/engine/api/match_parameters_tidy.hpp
@@ -194,6 +194,6 @@ inline Result tidy(const MatchParameters &params, Thresholds cfg = {15., 5})
     return result;
 }
 
-} // namespace osrm
+} // namespace osrm::engine::api::tidy
 
 #endif
diff --git a/include/engine/api/nearest_api.hpp b/include/engine/api/nearest_api.hpp
index 1f031f2f5..bc1d4e04f 100644
--- a/include/engine/api/nearest_api.hpp
+++ b/include/engine/api/nearest_api.hpp
@@ -160,6 +160,6 @@ class NearestAPI final : public BaseAPI
     }
 };
 
-} // namespace osrm
+} // namespace osrm::engine::api
 
 #endif
diff --git a/include/engine/api/nearest_parameters.hpp b/include/engine/api/nearest_parameters.hpp
index d6217fcfa..442b7b67d 100644
--- a/include/engine/api/nearest_parameters.hpp
+++ b/include/engine/api/nearest_parameters.hpp
@@ -48,6 +48,6 @@ struct NearestParameters : public BaseParameters
 
     bool IsValid() const { return BaseParameters::IsValid() && number_of_results >= 1; }
 };
-} // namespace osrm
+} // namespace osrm::engine::api
 
 #endif // ENGINE_API_NEAREST_PARAMETERS_HPP
diff --git a/include/engine/api/route_api.hpp b/include/engine/api/route_api.hpp
index a494abe64..088235e54 100644
--- a/include/engine/api/route_api.hpp
+++ b/include/engine/api/route_api.hpp
@@ -997,6 +997,6 @@ class RouteAPI : public BaseAPI
     }
 };
 
-} // namespace osrm
+} // namespace osrm::engine::api
 
 #endif
diff --git a/include/engine/api/route_parameters.hpp b/include/engine/api/route_parameters.hpp
index a513daad1..fe121a06d 100644
--- a/include/engine/api/route_parameters.hpp
+++ b/include/engine/api/route_parameters.hpp
@@ -207,6 +207,6 @@ inline RouteParameters::AnnotationsType operator|=(RouteParameters::AnnotationsT
 {
     return lhs = lhs | rhs;
 }
-} // namespace osrm
+} // namespace osrm::engine::api
 
 #endif
diff --git a/include/engine/api/table_api.hpp b/include/engine/api/table_api.hpp
index 2eaee214b..af4e692e3 100644
--- a/include/engine/api/table_api.hpp
+++ b/include/engine/api/table_api.hpp
@@ -418,6 +418,6 @@ class TableAPI final : public BaseAPI
     const TableParameters &parameters;
 };
 
-} // namespace osrm
+} // namespace osrm::engine::api
 
 #endif
diff --git a/include/engine/api/table_parameters.hpp b/include/engine/api/table_parameters.hpp
index ea860652c..be65b9a77 100644
--- a/include/engine/api/table_parameters.hpp
+++ b/include/engine/api/table_parameters.hpp
@@ -162,6 +162,6 @@ inline TableParameters::AnnotationsType &operator|=(TableParameters::Annotations
 {
     return lhs = lhs | rhs;
 }
-} // namespace osrm
+} // namespace osrm::engine::api
 
 #endif // ENGINE_API_TABLE_PARAMETERS_HPP
diff --git a/include/engine/api/tile_parameters.hpp b/include/engine/api/tile_parameters.hpp
index 2c5bafc27..09978ac4b 100644
--- a/include/engine/api/tile_parameters.hpp
+++ b/include/engine/api/tile_parameters.hpp
@@ -66,6 +66,6 @@ struct TileParameters final
         return valid_x && valid_y && valid_z;
     }
 };
-} // namespace osrm
+} // namespace osrm::engine::api
 
 #endif
diff --git a/include/engine/api/trip_api.hpp b/include/engine/api/trip_api.hpp
index 74e17676b..f15d21422 100644
--- a/include/engine/api/trip_api.hpp
+++ b/include/engine/api/trip_api.hpp
@@ -176,6 +176,6 @@ class TripAPI final : public RouteAPI
     const TripParameters &parameters;
 };
 
-} // namespace osrm
+} // namespace osrm::engine::api
 
 #endif
diff --git a/include/engine/api/trip_parameters.hpp b/include/engine/api/trip_parameters.hpp
index bffcae38c..6cfffd295 100644
--- a/include/engine/api/trip_parameters.hpp
+++ b/include/engine/api/trip_parameters.hpp
@@ -72,6 +72,6 @@ struct TripParameters : public RouteParameters
 
     bool IsValid() const { return RouteParameters::IsValid(); }
 };
-} // namespace osrm
+} // namespace osrm::engine::api
 
 #endif
diff --git a/include/engine/approach.hpp b/include/engine/approach.hpp
index c5ee5182a..185dcfcf5 100644
--- a/include/engine/approach.hpp
+++ b/include/engine/approach.hpp
@@ -39,5 +39,5 @@ enum class Approach : std::uint8_t
     UNRESTRICTED = 1
 
 };
-} // namespace osrm
+} // namespace osrm::engine
 #endif
diff --git a/include/engine/bearing.hpp b/include/engine/bearing.hpp
index 60bfe28fe..c64e689d5 100644
--- a/include/engine/bearing.hpp
+++ b/include/engine/bearing.hpp
@@ -44,6 +44,6 @@ inline bool operator==(const Bearing lhs, const Bearing rhs)
     return lhs.bearing == rhs.bearing && lhs.range == rhs.range;
 }
 inline bool operator!=(const Bearing lhs, const Bearing rhs) { return !(lhs == rhs); }
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif
diff --git a/include/engine/data_watchdog.hpp b/include/engine/data_watchdog.hpp
index 1e913a26b..a4583398a 100644
--- a/include/engine/data_watchdog.hpp
+++ b/include/engine/data_watchdog.hpp
@@ -147,6 +147,6 @@ class DataWatchdogImpl<AlgorithmT, datafacade::ContiguousInternalMemoryDataFacad
 // once a new dataset arrives.
 template <typename AlgorithmT, template <typename A> class FacadeT>
 using DataWatchdog = detail::DataWatchdogImpl<AlgorithmT, FacadeT<AlgorithmT>>;
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif
diff --git a/include/engine/datafacade.hpp b/include/engine/datafacade.hpp
index 1488610e0..900f11661 100644
--- a/include/engine/datafacade.hpp
+++ b/include/engine/datafacade.hpp
@@ -9,6 +9,6 @@ namespace osrm::engine
 using DataFacadeBase = datafacade::ContiguousInternalMemoryDataFacadeBase;
 template <typename AlgorithmT>
 using DataFacade = datafacade::ContiguousInternalMemoryDataFacade<AlgorithmT>;
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif
diff --git a/include/engine/datafacade/algorithm_datafacade.hpp b/include/engine/datafacade/algorithm_datafacade.hpp
index d838f9c09..7965784bc 100644
--- a/include/engine/datafacade/algorithm_datafacade.hpp
+++ b/include/engine/datafacade/algorithm_datafacade.hpp
@@ -105,6 +105,6 @@ template <> class AlgorithmDataFacade<MLD>
     virtual EdgeID FindEdge(const NodeID edge_based_node_from,
                             const NodeID edge_based_node_to) const = 0;
 };
-} // namespace osrm
+} // namespace osrm::engine::datafacade
 
 #endif
diff --git a/include/engine/datafacade/contiguous_block_allocator.hpp b/include/engine/datafacade/contiguous_block_allocator.hpp
index 5103dc8a8..ec16e303f 100644
--- a/include/engine/datafacade/contiguous_block_allocator.hpp
+++ b/include/engine/datafacade/contiguous_block_allocator.hpp
@@ -15,6 +15,6 @@ class ContiguousBlockAllocator
     virtual const storage::SharedDataIndex &GetIndex() = 0;
 };
 
-} // namespace osrm
+} // namespace osrm::engine::datafacade
 
 #endif // OSRM_ENGINE_DATAFACADE_CONTIGUOUS_BLOCK_ALLOCATOR_HPP_
diff --git a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
index 936c9a927..1f584870a 100644
--- a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
+++ b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
@@ -689,6 +689,6 @@ class ContiguousInternalMemoryDataFacade<MLD> final
     {
     }
 };
-} // namespace osrm
+} // namespace osrm::engine::datafacade
 
 #endif // CONTIGUOUS_INTERNALMEM_DATAFACADE_HPP
diff --git a/include/engine/datafacade/datafacade_base.hpp b/include/engine/datafacade/datafacade_base.hpp
index d38a329bf..2d110e7da 100644
--- a/include/engine/datafacade/datafacade_base.hpp
+++ b/include/engine/datafacade/datafacade_base.hpp
@@ -185,6 +185,6 @@ class BaseDataFacade
     virtual std::vector<extractor::ManeuverOverride>
     GetOverridesThatStartAt(const NodeID edge_based_node_id) const = 0;
 };
-} // namespace osrm
+} // namespace osrm::engine::datafacade
 
 #endif // DATAFACADE_BASE_HPP
diff --git a/include/engine/datafacade/mmap_memory_allocator.hpp b/include/engine/datafacade/mmap_memory_allocator.hpp
index 9fae0f562..3acb5caa4 100644
--- a/include/engine/datafacade/mmap_memory_allocator.hpp
+++ b/include/engine/datafacade/mmap_memory_allocator.hpp
@@ -33,6 +33,6 @@ class MMapMemoryAllocator final : public ContiguousBlockAllocator
     std::string rtree_filename;
 };
 
-} // namespace osrm
+} // namespace osrm::engine::datafacade
 
 #endif // OSRM_ENGINE_DATAFACADE_SHARED_MEMORY_ALLOCATOR_HPP_
diff --git a/include/engine/datafacade/process_memory_allocator.hpp b/include/engine/datafacade/process_memory_allocator.hpp
index 5851f545f..8cf5db0bf 100644
--- a/include/engine/datafacade/process_memory_allocator.hpp
+++ b/include/engine/datafacade/process_memory_allocator.hpp
@@ -30,6 +30,6 @@ class ProcessMemoryAllocator final : public ContiguousBlockAllocator
     std::unique_ptr<char[]> internal_memory;
 };
 
-} // namespace osrm
+} // namespace osrm::engine::datafacade
 
 #endif // OSRM_ENGINE_DATAFACADE_PROCESS_MEMORY_ALLOCATOR_HPP_
diff --git a/include/engine/datafacade/shared_memory_allocator.hpp b/include/engine/datafacade/shared_memory_allocator.hpp
index 5326d8d37..71170316c 100644
--- a/include/engine/datafacade/shared_memory_allocator.hpp
+++ b/include/engine/datafacade/shared_memory_allocator.hpp
@@ -31,6 +31,6 @@ class SharedMemoryAllocator final : public ContiguousBlockAllocator
     std::vector<std::unique_ptr<storage::SharedMemory>> memory_regions;
 };
 
-} // namespace osrm
+} // namespace osrm::engine::datafacade
 
 #endif // OSRM_ENGINE_DATAFACADE_SHARED_MEMORY_ALLOCATOR_HPP_
diff --git a/include/engine/datafacade_factory.hpp b/include/engine/datafacade_factory.hpp
index 705b8ff19..d255b394d 100644
--- a/include/engine/datafacade_factory.hpp
+++ b/include/engine/datafacade_factory.hpp
@@ -150,6 +150,6 @@ template <template <typename A> class FacadeT, typename AlgorithmT> class DataFa
     std::unordered_map<std::string, extractor::ClassData> name_to_class;
     const extractor::ProfileProperties *properties = nullptr;
 };
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif
diff --git a/include/engine/datafacade_provider.hpp b/include/engine/datafacade_provider.hpp
index d5aae6433..7f4cecae3 100644
--- a/include/engine/datafacade_provider.hpp
+++ b/include/engine/datafacade_provider.hpp
@@ -101,6 +101,6 @@ template <typename AlgorithmT>
 using ImmutableProvider = detail::ImmutableProvider<AlgorithmT, DataFacade>;
 template <typename AlgorithmT>
 using ExternalProvider = detail::ExternalProvider<AlgorithmT, DataFacade>;
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif
diff --git a/include/engine/douglas_peucker.hpp b/include/engine/douglas_peucker.hpp
index 0348eab83..2be14a1ab 100644
--- a/include/engine/douglas_peucker.hpp
+++ b/include/engine/douglas_peucker.hpp
@@ -73,6 +73,6 @@ inline std::vector<util::Coordinate> douglasPeucker(const std::vector<util::Coor
 {
     return douglasPeucker(begin(geometry), end(geometry), zoom_level);
 }
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif /* DOUGLAS_PEUCKER_HPP_ */
diff --git a/include/engine/engine.hpp b/include/engine/engine.hpp
index 571eba979..fcb4f2dc5 100644
--- a/include/engine/engine.hpp
+++ b/include/engine/engine.hpp
@@ -128,6 +128,6 @@ template <typename Algorithm> class Engine final : public EngineInterface
     const plugins::MatchPlugin match_plugin;
     const plugins::TilePlugin tile_plugin;
 };
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif // OSRM_IMPL_HPP
diff --git a/include/engine/engine_config.hpp b/include/engine/engine_config.hpp
index 5edb25a02..6f4594b15 100644
--- a/include/engine/engine_config.hpp
+++ b/include/engine/engine_config.hpp
@@ -91,6 +91,6 @@ struct EngineConfig final
     std::string verbosity;
     std::string dataset_name;
 };
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif // SERVER_CONFIG_HPP
diff --git a/include/engine/geospatial_query.hpp b/include/engine/geospatial_query.hpp
index bb1365bbc..8388e9294 100644
--- a/include/engine/geospatial_query.hpp
+++ b/include/engine/geospatial_query.hpp
@@ -581,6 +581,6 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
     const CoordinateList &coordinates;
     DataFacadeT &datafacade;
 };
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif
diff --git a/include/engine/guidance/assemble_geometry.hpp b/include/engine/guidance/assemble_geometry.hpp
index af4477f22..4001f6089 100644
--- a/include/engine/guidance/assemble_geometry.hpp
+++ b/include/engine/guidance/assemble_geometry.hpp
@@ -168,6 +168,6 @@ inline LegGeometry assembleGeometry(const datafacade::BaseDataFacade &facade,
 
     return geometry;
 }
-} // namespace osrm
+} // namespace osrm::engine::guidance
 
 #endif
diff --git a/include/engine/guidance/assemble_leg.hpp b/include/engine/guidance/assemble_leg.hpp
index cec40e1f7..31dfc7027 100644
--- a/include/engine/guidance/assemble_leg.hpp
+++ b/include/engine/guidance/assemble_leg.hpp
@@ -228,6 +228,6 @@ inline RouteLeg assembleLeg(const datafacade::BaseDataFacade &facade,
                     {}};
 }
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
 
 #endif // ENGINE_GUIDANCE_SEGMENT_LIST_HPP_
diff --git a/include/engine/guidance/assemble_overview.hpp b/include/engine/guidance/assemble_overview.hpp
index b8ee72eba..f585810d0 100644
--- a/include/engine/guidance/assemble_overview.hpp
+++ b/include/engine/guidance/assemble_overview.hpp
@@ -13,6 +13,6 @@ namespace osrm::engine::guidance
 std::vector<util::Coordinate> assembleOverview(const std::vector<LegGeometry> &leg_geometries,
                                                const bool use_simplification);
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
 
 #endif
diff --git a/include/engine/guidance/assemble_route.hpp b/include/engine/guidance/assemble_route.hpp
index cdec0e61b..ababc3c49 100644
--- a/include/engine/guidance/assemble_route.hpp
+++ b/include/engine/guidance/assemble_route.hpp
@@ -11,6 +11,6 @@ namespace osrm::engine::guidance
 
 Route assembleRoute(const std::vector<RouteLeg> &route_legs);
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
 
 #endif
diff --git a/include/engine/guidance/assemble_steps.hpp b/include/engine/guidance/assemble_steps.hpp
index d5a0e5e14..b25b9976d 100644
--- a/include/engine/guidance/assemble_steps.hpp
+++ b/include/engine/guidance/assemble_steps.hpp
@@ -361,6 +361,6 @@ inline std::vector<RouteStep> assembleSteps(const datafacade::BaseDataFacade &fa
     return steps;
 }
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
 
 #endif // ENGINE_GUIDANCE_SEGMENT_LIST_HPP_
diff --git a/include/engine/guidance/collapse_scenario_detection.hpp b/include/engine/guidance/collapse_scenario_detection.hpp
index 958c91ba4..b072627c7 100644
--- a/include/engine/guidance/collapse_scenario_detection.hpp
+++ b/include/engine/guidance/collapse_scenario_detection.hpp
@@ -83,6 +83,6 @@ bool doubleChoiceless(const RouteStepIterator step_entering_intersection,
 bool straightTurnFollowedByChoiceless(const RouteStepIterator step_entering_intersection,
                                       const RouteStepIterator step_leaving_intersection);
 
-} /* namespace osrm */
+} // namespace osrm::engine::guidance
 
 #endif /* OSRM_ENGINE_GUIDANCE_COLLAPSE_SCENARIO_DETECTION_HPP_ */
diff --git a/include/engine/guidance/collapse_turns.hpp b/include/engine/guidance/collapse_turns.hpp
index ffde35d4d..6d0b1fe7d 100644
--- a/include/engine/guidance/collapse_turns.hpp
+++ b/include/engine/guidance/collapse_turns.hpp
@@ -158,6 +158,6 @@ void combineRouteSteps(RouteStep &step_at_turn_location,
 // alias for suppressing a step, using CombineRouteStep with NoModificationStrategy only
 void suppressStep(RouteStep &step_at_turn_location, RouteStep &step_after_turn_location);
 
-} /* namespace osrm */
+} // namespace osrm::engine::guidance
 
 #endif /* OSRM_ENGINE_GUIDANCE_COLLAPSE_HPP_ */
diff --git a/include/engine/guidance/collapsing_utility.hpp b/include/engine/guidance/collapsing_utility.hpp
index 7a61aba24..8d990e194 100644
--- a/include/engine/guidance/collapsing_utility.hpp
+++ b/include/engine/guidance/collapsing_utility.hpp
@@ -298,6 +298,6 @@ inline bool hasStraightestTurn(const RouteStep &step)
     return false;
 }
 
-} /* namespace osrm */
+} // namespace osrm::engine::guidance
 
 #endif /* OSRM_ENGINE_GUIDANCE_COLLAPSING_UTILITY_HPP_ */
diff --git a/include/engine/guidance/lane_processing.hpp b/include/engine/guidance/lane_processing.hpp
index 4c9d0dc3d..f42567279 100644
--- a/include/engine/guidance/lane_processing.hpp
+++ b/include/engine/guidance/lane_processing.hpp
@@ -18,6 +18,6 @@ OSRM_ATTR_WARN_UNUSED
 std::vector<RouteStep> anticipateLaneChange(std::vector<RouteStep> steps,
                                             const double min_distance_needed_for_lane_change = 200);
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
 
 #endif /* OSRM_ENGINE_GUIDANCE_LANE_PROCESSING_HPP_ */
diff --git a/include/engine/guidance/leg_geometry.hpp b/include/engine/guidance/leg_geometry.hpp
index fcfd5cf2c..4392e8200 100644
--- a/include/engine/guidance/leg_geometry.hpp
+++ b/include/engine/guidance/leg_geometry.hpp
@@ -60,6 +60,6 @@ struct LegGeometry
         return segment_offsets.size() - 1;
     }
 };
-} // namespace osrm
+} // namespace osrm::engine::guidance
 
 #endif
diff --git a/include/engine/guidance/post_processing.hpp b/include/engine/guidance/post_processing.hpp
index 8b0bcb18e..b489de07a 100644
--- a/include/engine/guidance/post_processing.hpp
+++ b/include/engine/guidance/post_processing.hpp
@@ -54,6 +54,6 @@ void applyOverrides(const datafacade::BaseDataFacade &facade,
                     std::vector<RouteStep> &steps,
                     const LegGeometry &geometry);
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
 
 #endif // ENGINE_GUIDANCE_POST_PROCESSING_HPP
diff --git a/include/engine/guidance/postprocessing_toolkit.hpp b/include/engine/guidance/postprocessing_toolkit.hpp
index f4e993540..f861ed3c3 100644
--- a/include/engine/guidance/postprocessing_toolkit.hpp
+++ b/include/engine/guidance/postprocessing_toolkit.hpp
@@ -42,6 +42,6 @@ template <typename Iter, typename Fn> inline Fn forEachRoundabout(Iter first, It
     return fn;
 }
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
 
 #endif /* OSRM_ENGINE_GUIDANCE_POSTPROCESSING_TOOLKIT_HPP_ */
diff --git a/include/engine/guidance/route.hpp b/include/engine/guidance/route.hpp
index e831fb12d..7723eeb47 100644
--- a/include/engine/guidance/route.hpp
+++ b/include/engine/guidance/route.hpp
@@ -10,6 +10,6 @@ struct Route
     double duration;
     double weight;
 };
-} // namespace osrm
+} // namespace osrm::engine::guidance
 
 #endif
diff --git a/include/engine/guidance/route_leg.hpp b/include/engine/guidance/route_leg.hpp
index c8d4cfa9b..681c4c40e 100644
--- a/include/engine/guidance/route_leg.hpp
+++ b/include/engine/guidance/route_leg.hpp
@@ -19,6 +19,6 @@ struct RouteLeg
     std::string summary;
     std::vector<RouteStep> steps;
 };
-} // namespace osrm
+} // namespace osrm::engine::guidance
 
 #endif
diff --git a/include/engine/guidance/route_step.hpp b/include/engine/guidance/route_step.hpp
index 7d9c50927..870373817 100644
--- a/include/engine/guidance/route_step.hpp
+++ b/include/engine/guidance/route_step.hpp
@@ -230,6 +230,6 @@ inline auto RouteStep::LanesToTheRight() const
     return boost::make_iterator_range(description.end() - num_lanes_right, description.end());
 }
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
 
 #endif
diff --git a/include/engine/guidance/step_maneuver.hpp b/include/engine/guidance/step_maneuver.hpp
index 2e68f8394..91131be3d 100644
--- a/include/engine/guidance/step_maneuver.hpp
+++ b/include/engine/guidance/step_maneuver.hpp
@@ -40,5 +40,5 @@ inline StepManeuver getInvalidStepManeuver()
             0};
 }
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
 #endif
diff --git a/include/engine/guidance/verbosity_reduction.hpp b/include/engine/guidance/verbosity_reduction.hpp
index 6e29e5acc..3ad6d26be 100644
--- a/include/engine/guidance/verbosity_reduction.hpp
+++ b/include/engine/guidance/verbosity_reduction.hpp
@@ -16,6 +16,6 @@ namespace osrm::engine::guidance
 OSRM_ATTR_WARN_UNUSED
 std::vector<RouteStep> suppressShortNameSegments(std::vector<RouteStep> steps);
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
 
 #endif /* OSRM_ENGINE_GUIDANCE_VERBOSITY_REDUCTION_HPP_ */
diff --git a/include/engine/hint.hpp b/include/engine/hint.hpp
index 7428e29a5..7f07d327d 100644
--- a/include/engine/hint.hpp
+++ b/include/engine/hint.hpp
@@ -81,6 +81,6 @@ constexpr std::size_t ENCODED_SEGMENT_HINT_SIZE = 112;
 static_assert(ENCODED_SEGMENT_HINT_SIZE / 4 * 3 >= sizeof(SegmentHint),
               "ENCODED_SEGMENT_HINT_SIZE does not match size of SegmentHint");
 
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif
diff --git a/include/engine/internal_route_result.hpp b/include/engine/internal_route_result.hpp
index cdecc9e59..e2bc6f475 100644
--- a/include/engine/internal_route_result.hpp
+++ b/include/engine/internal_route_result.hpp
@@ -150,6 +150,6 @@ inline InternalRouteResult CollapseInternalRouteResult(const InternalRouteResult
     BOOST_ASSERT(collapsed.leg_endpoints.size() == collapsed.unpacked_path_segments.size());
     return collapsed;
 }
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif // RAW_ROUTE_DATA_H
diff --git a/include/engine/map_matching/bayes_classifier.hpp b/include/engine/map_matching/bayes_classifier.hpp
index da1d3d5c6..5dd5813c3 100644
--- a/include/engine/map_matching/bayes_classifier.hpp
+++ b/include/engine/map_matching/bayes_classifier.hpp
@@ -94,6 +94,6 @@ class BayesClassifier
     double positive_apriori_probability;
     double negative_apriori_probability;
 };
-} // namespace osrm
+} // namespace osrm::engine::map_matching
 
 #endif // BAYES_CLASSIFIER_HPP
diff --git a/include/engine/map_matching/hidden_markov_model.hpp b/include/engine/map_matching/hidden_markov_model.hpp
index c2c7a3eca..54505c8ec 100644
--- a/include/engine/map_matching/hidden_markov_model.hpp
+++ b/include/engine/map_matching/hidden_markov_model.hpp
@@ -133,6 +133,6 @@ template <class CandidateLists> struct HiddenMarkovModel
         return initial_timestamp;
     }
 };
-} // namespace osrm
+} // namespace osrm::engine::map_matching
 
 #endif // HIDDEN_MARKOV_MODEL
diff --git a/include/engine/map_matching/matching_confidence.hpp b/include/engine/map_matching/matching_confidence.hpp
index dd65f397b..4b6b00a83 100644
--- a/include/engine/map_matching/matching_confidence.hpp
+++ b/include/engine/map_matching/matching_confidence.hpp
@@ -47,6 +47,6 @@ struct MatchingConfidence
   private:
     ClassifierT classifier;
 };
-} // namespace osrm
+} // namespace osrm::engine::map_matching
 
 #endif
diff --git a/include/engine/map_matching/sub_matching.hpp b/include/engine/map_matching/sub_matching.hpp
index b099fb3a3..5a0b5d35c 100644
--- a/include/engine/map_matching/sub_matching.hpp
+++ b/include/engine/map_matching/sub_matching.hpp
@@ -15,6 +15,6 @@ struct SubMatching
     std::vector<unsigned> alternatives_count;
     double confidence;
 };
-} // namespace osrm
+} // namespace osrm::engine::map_matching
 
 #endif
diff --git a/include/engine/phantom_node.hpp b/include/engine/phantom_node.hpp
index 107d78ea8..19bdde520 100644
--- a/include/engine/phantom_node.hpp
+++ b/include/engine/phantom_node.hpp
@@ -271,6 +271,6 @@ struct PhantomEndpoints
     PhantomNode target_phantom;
 };
 
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif // OSRM_ENGINE_PHANTOM_NODE_H
diff --git a/include/engine/plugins/match.hpp b/include/engine/plugins/match.hpp
index ff88c462c..0bb4682ba 100644
--- a/include/engine/plugins/match.hpp
+++ b/include/engine/plugins/match.hpp
@@ -34,6 +34,6 @@ class MatchPlugin : public BasePlugin
     const int max_locations_map_matching;
     const double max_radius_map_matching;
 };
-} // namespace osrm
+} // namespace osrm::engine::plugins
 
 #endif // MATCH_HPP
diff --git a/include/engine/plugins/nearest.hpp b/include/engine/plugins/nearest.hpp
index ff812e885..e4c9212b2 100644
--- a/include/engine/plugins/nearest.hpp
+++ b/include/engine/plugins/nearest.hpp
@@ -22,6 +22,6 @@ class NearestPlugin final : public BasePlugin
   private:
     const int max_results;
 };
-} // namespace osrm
+} // namespace osrm::engine::plugins
 
 #endif /* NEAREST_HPP */
diff --git a/include/engine/plugins/plugin_base.hpp b/include/engine/plugins/plugin_base.hpp
index 91ad15461..d2084ae36 100644
--- a/include/engine/plugins/plugin_base.hpp
+++ b/include/engine/plugins/plugin_base.hpp
@@ -321,6 +321,6 @@ class BasePlugin
                std::to_string(missing_index);
     }
 };
-} // namespace osrm
+} // namespace osrm::engine::plugins
 
 #endif /* BASE_PLUGIN_HPP */
diff --git a/include/engine/plugins/table.hpp b/include/engine/plugins/table.hpp
index 9dfce38b0..fc8fd18eb 100644
--- a/include/engine/plugins/table.hpp
+++ b/include/engine/plugins/table.hpp
@@ -23,6 +23,6 @@ class TablePlugin final : public BasePlugin
   private:
     const int max_locations_distance_table;
 };
-} // namespace osrm
+} // namespace osrm::engine::plugins
 
 #endif // TABLE_HPP
diff --git a/include/engine/plugins/tile.hpp b/include/engine/plugins/tile.hpp
index dc22e7070..c5a85f615 100644
--- a/include/engine/plugins/tile.hpp
+++ b/include/engine/plugins/tile.hpp
@@ -26,6 +26,6 @@ class TilePlugin final : public BasePlugin
                          const api::TileParameters &parameters,
                          osrm::engine::api::ResultT &pbf_buffer) const;
 };
-} // namespace osrm
+} // namespace osrm::engine::plugins
 
 #endif /* TILEPLUGIN_HPP */
diff --git a/include/engine/plugins/trip.hpp b/include/engine/plugins/trip.hpp
index 2c4347f9c..01b72a38c 100644
--- a/include/engine/plugins/trip.hpp
+++ b/include/engine/plugins/trip.hpp
@@ -38,6 +38,6 @@ class TripPlugin final : public BasePlugin
                          const api::TripParameters &parameters,
                          osrm::engine::api::ResultT &json_result) const;
 };
-} // namespace osrm
+} // namespace osrm::engine::plugins
 
 #endif // TRIP_HPP
diff --git a/include/engine/plugins/viaroute.hpp b/include/engine/plugins/viaroute.hpp
index a9382e05d..d45dd44aa 100644
--- a/include/engine/plugins/viaroute.hpp
+++ b/include/engine/plugins/viaroute.hpp
@@ -31,6 +31,6 @@ class ViaRoutePlugin final : public BasePlugin
                          const api::RouteParameters &route_parameters,
                          osrm::engine::api::ResultT &json_result) const;
 };
-} // namespace osrm
+} // namespace osrm::engine::plugins
 
 #endif // VIA_ROUTE_HPP
diff --git a/include/engine/polyline_compressor.hpp b/include/engine/polyline_compressor.hpp
index cbda68e12..f313ccfe5 100644
--- a/include/engine/polyline_compressor.hpp
+++ b/include/engine/polyline_compressor.hpp
@@ -78,6 +78,6 @@ std::vector<util::Coordinate> decodePolyline(const std::string &polyline)
     }
     return coordinates;
 }
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif /* POLYLINECOMPRESSOR_H_ */
diff --git a/include/engine/routing_algorithms.hpp b/include/engine/routing_algorithms.hpp
index c06e7ec75..93c310a4a 100644
--- a/include/engine/routing_algorithms.hpp
+++ b/include/engine/routing_algorithms.hpp
@@ -230,6 +230,6 @@ inline std::vector<routing_algorithms::TurnData> RoutingAlgorithms<Algorithm>::G
     return routing_algorithms::getTileTurns(*facade, edges, sorted_edge_indexes);
 }
 
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif
diff --git a/include/engine/routing_algorithms/alternative_path.hpp b/include/engine/routing_algorithms/alternative_path.hpp
index 007510be8..30f9a1e19 100644
--- a/include/engine/routing_algorithms/alternative_path.hpp
+++ b/include/engine/routing_algorithms/alternative_path.hpp
@@ -22,6 +22,6 @@ InternalManyRoutesResult alternativePathSearch(SearchEngineData<mld::Algorithm>
                                                const PhantomEndpointCandidates &endpoint_candidates,
                                                unsigned number_of_alternatives);
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
 
 #endif
diff --git a/include/engine/routing_algorithms/direct_shortest_path.hpp b/include/engine/routing_algorithms/direct_shortest_path.hpp
index 744f6da84..63b5da8ab 100644
--- a/include/engine/routing_algorithms/direct_shortest_path.hpp
+++ b/include/engine/routing_algorithms/direct_shortest_path.hpp
@@ -22,6 +22,6 @@ InternalRouteResult directShortestPathSearch(SearchEngineData<Algorithm> &engine
                                              const DataFacade<Algorithm> &facade,
                                              const PhantomEndpointCandidates &endpoint_candidates);
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
 
 #endif /* DIRECT_SHORTEST_PATH_HPP */
diff --git a/include/engine/routing_algorithms/many_to_many.hpp b/include/engine/routing_algorithms/many_to_many.hpp
index e5ae497c8..613980784 100644
--- a/include/engine/routing_algorithms/many_to_many.hpp
+++ b/include/engine/routing_algorithms/many_to_many.hpp
@@ -95,6 +95,6 @@ manyToManySearch(SearchEngineData<Algorithm> &engine_working_data,
                  const std::vector<std::size_t> &target_indices,
                  const bool calculate_distance);
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
 
 #endif
diff --git a/include/engine/routing_algorithms/map_matching.hpp b/include/engine/routing_algorithms/map_matching.hpp
index 146405143..c739aac99 100644
--- a/include/engine/routing_algorithms/map_matching.hpp
+++ b/include/engine/routing_algorithms/map_matching.hpp
@@ -27,6 +27,6 @@ SubMatchingList mapMatching(SearchEngineData<Algorithm> &engine_working_data,
                             const std::vector<boost::optional<double>> &trace_gps_precision,
                             const bool allow_splitting);
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
 
 #endif /* MAP_MATCHING_HPP */
diff --git a/include/engine/routing_algorithms/routing_base.hpp b/include/engine/routing_algorithms/routing_base.hpp
index 473870fdf..4d56f86d6 100644
--- a/include/engine/routing_algorithms/routing_base.hpp
+++ b/include/engine/routing_algorithms/routing_base.hpp
@@ -416,6 +416,6 @@ template <typename FacadeT> EdgeDistance computeEdgeDistance(const FacadeT &faca
     return total_distance;
 }
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
 
 #endif // OSRM_ENGINE_ROUTING_BASE_HPP
diff --git a/include/engine/routing_algorithms/routing_base_ch.hpp b/include/engine/routing_algorithms/routing_base_ch.hpp
index c2a415534..7ac0530d8 100644
--- a/include/engine/routing_algorithms/routing_base_ch.hpp
+++ b/include/engine/routing_algorithms/routing_base_ch.hpp
@@ -514,6 +514,6 @@ std::tuple<EdgeMetric, EdgeDistance> getLoopMetric(const DataFacade<Algorithm> &
     }
     return std::make_tuple(loop_metric, loop_distance);
 }
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms::ch
 
 #endif // OSRM_ENGINE_ROUTING_BASE_CH_HPP
diff --git a/include/engine/routing_algorithms/routing_base_mld.hpp b/include/engine/routing_algorithms/routing_base_mld.hpp
index b20117e3c..39e93c5df 100644
--- a/include/engine/routing_algorithms/routing_base_mld.hpp
+++ b/include/engine/routing_algorithms/routing_base_mld.hpp
@@ -649,6 +649,6 @@ double getNetworkDistance(SearchEngineData<Algorithm> &engine_working_data,
     return getPathDistance(facade, unpacked_path, source_phantom, target_phantom);
 }
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms::mld
 
 #endif // OSRM_ENGINE_ROUTING_BASE_MLD_HPP
diff --git a/include/engine/routing_algorithms/shortest_path.hpp b/include/engine/routing_algorithms/shortest_path.hpp
index 8e461de20..00e85234a 100644
--- a/include/engine/routing_algorithms/shortest_path.hpp
+++ b/include/engine/routing_algorithms/shortest_path.hpp
@@ -16,6 +16,6 @@ shortestPathSearch(SearchEngineData<Algorithm> &engine_working_data,
                    const std::vector<PhantomNodeCandidates> &waypoint_candidates,
                    const boost::optional<bool> continue_straight_at_waypoint);
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
 
 #endif /* OSRM_SHORTEST_PATH_HPP */
diff --git a/include/engine/routing_algorithms/shortest_path_impl.hpp b/include/engine/routing_algorithms/shortest_path_impl.hpp
index 6aade1152..f23ae7654 100644
--- a/include/engine/routing_algorithms/shortest_path_impl.hpp
+++ b/include/engine/routing_algorithms/shortest_path_impl.hpp
@@ -785,6 +785,6 @@ shortestPathSearch(SearchEngineData<Algorithm> &engine_working_data,
     }
 }
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
 
 #endif /* OSRM_SHORTEST_PATH_IMPL_HPP */
diff --git a/include/engine/routing_algorithms/tile_turns.hpp b/include/engine/routing_algorithms/tile_turns.hpp
index 69f9ef102..d728b4c0c 100644
--- a/include/engine/routing_algorithms/tile_turns.hpp
+++ b/include/engine/routing_algorithms/tile_turns.hpp
@@ -33,6 +33,6 @@ std::vector<TurnData> getTileTurns(const DataFacade<mld::Algorithm> &facade,
                                    const std::vector<RTreeLeaf> &edges,
                                    const std::vector<std::size_t> &sorted_edge_indexes);
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
 
 #endif
diff --git a/include/engine/search_engine_data.hpp b/include/engine/search_engine_data.hpp
index cd809e7fd..2f32b327b 100644
--- a/include/engine/search_engine_data.hpp
+++ b/include/engine/search_engine_data.hpp
@@ -118,6 +118,6 @@ template <> struct SearchEngineData<routing_algorithms::mld::Algorithm>
     void InitializeOrClearManyToManyThreadLocalStorage(unsigned number_of_nodes,
                                                        unsigned number_of_boundary_nodes);
 };
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif // SEARCH_ENGINE_DATA_HPP
diff --git a/include/engine/status.hpp b/include/engine/status.hpp
index 71c9eead0..b55a6f608 100644
--- a/include/engine/status.hpp
+++ b/include/engine/status.hpp
@@ -40,6 +40,6 @@ enum class Status
     Ok,
     Error
 };
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif
diff --git a/include/engine/trip/trip_brute_force.hpp b/include/engine/trip/trip_brute_force.hpp
index 148496de5..a55e41ee5 100644
--- a/include/engine/trip/trip_brute_force.hpp
+++ b/include/engine/trip/trip_brute_force.hpp
@@ -89,6 +89,6 @@ inline std::vector<NodeID> BruteForceTrip(const std::size_t number_of_locations,
     return route;
 }
 
-} // namespace osrm
+} // namespace osrm::engine::trip
 
 #endif // TRIP_BRUTE_FORCE_HPP
diff --git a/include/engine/trip/trip_farthest_insertion.hpp b/include/engine/trip/trip_farthest_insertion.hpp
index af0b95daa..46ace93e3 100644
--- a/include/engine/trip/trip_farthest_insertion.hpp
+++ b/include/engine/trip/trip_farthest_insertion.hpp
@@ -171,6 +171,6 @@ FarthestInsertionTrip(const std::size_t number_of_locations,
     return FindRoute(number_of_locations, dist_table, max_from, max_to);
 }
 
-} // namespace osrm
+} // namespace osrm::engine::trip
 
 #endif // TRIP_FARTHEST_INSERTION_HPP
diff --git a/include/engine/trip/trip_nearest_neighbour.hpp b/include/engine/trip/trip_nearest_neighbour.hpp
index 038a0fccf..6f798270f 100644
--- a/include/engine/trip/trip_nearest_neighbour.hpp
+++ b/include/engine/trip/trip_nearest_neighbour.hpp
@@ -88,6 +88,6 @@ std::vector<NodeID> NearestNeighbourTrip(const NodeIDIterator &start,
     }
     return route;
 }
-} // namespace osrm
+} // namespace osrm::engine::trip
 
 #endif // TRIP_NEAREST_NEIGHBOUR_HPP
diff --git a/include/extractor/class_data.hpp b/include/extractor/class_data.hpp
index 1b685562f..99cb02e03 100644
--- a/include/extractor/class_data.hpp
+++ b/include/extractor/class_data.hpp
@@ -31,6 +31,6 @@ inline bool isValidClassName(const std::string &name)
                return std::isalnum(c);
            }) == name.end();
 }
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif
diff --git a/include/extractor/compressed_edge_container.hpp b/include/extractor/compressed_edge_container.hpp
index 5254f6aa9..2bc3cd157 100644
--- a/include/extractor/compressed_edge_container.hpp
+++ b/include/extractor/compressed_edge_container.hpp
@@ -80,6 +80,6 @@ class CompressedEdgeContainer
     std::unordered_map<EdgeID, unsigned> m_reverse_edge_id_to_zipped_index_map;
     std::unique_ptr<SegmentDataContainer> segment_data;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // GEOMETRY_COMPRESSOR_HPP_
diff --git a/include/extractor/compressed_node_based_graph_edge.hpp b/include/extractor/compressed_node_based_graph_edge.hpp
index fe840dc0f..0cd404d01 100644
--- a/include/extractor/compressed_node_based_graph_edge.hpp
+++ b/include/extractor/compressed_node_based_graph_edge.hpp
@@ -12,6 +12,6 @@ struct CompressedNodeBasedGraphEdge
     NodeID source;
     NodeID target;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_COMPRESSED_NODE_BASED_GRAPH_EDGE_HPP
diff --git a/include/extractor/conditional_turn_penalty.hpp b/include/extractor/conditional_turn_penalty.hpp
index 95facbb01..835d4fee8 100644
--- a/include/extractor/conditional_turn_penalty.hpp
+++ b/include/extractor/conditional_turn_penalty.hpp
@@ -19,6 +19,6 @@ struct ConditionalTurnPenalty
     std::vector<util::OpeningHours> conditions;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_CONDITIONAL_TURN_PENALTY_HPP_
diff --git a/include/extractor/datasources.hpp b/include/extractor/datasources.hpp
index c4aa41988..0232cca6f 100644
--- a/include/extractor/datasources.hpp
+++ b/include/extractor/datasources.hpp
@@ -43,6 +43,6 @@ class Datasources
     std::array<std::uint32_t, MAX_NUM_SOURES> lengths;
     std::array<char, MAX_LENGTH_NAME * MAX_NUM_SOURES> sources;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif
diff --git a/include/extractor/edge_based_edge.hpp b/include/extractor/edge_based_edge.hpp
index 95af597c7..44181efb9 100644
--- a/include/extractor/edge_based_edge.hpp
+++ b/include/extractor/edge_based_edge.hpp
@@ -94,6 +94,6 @@ inline bool EdgeBasedEdge::operator<(const EdgeBasedEdge &other) const
     return std::tie(source, target, data.weight, unidirectional) <
            std::tie(other.source, other.target, other.data.weight, other_is_unidirectional);
 }
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* EDGE_BASED_EDGE_HPP */
diff --git a/include/extractor/edge_based_graph_factory.hpp b/include/extractor/edge_based_graph_factory.hpp
index 009896a9c..9c66c35ca 100644
--- a/include/extractor/edge_based_graph_factory.hpp
+++ b/include/extractor/edge_based_graph_factory.hpp
@@ -171,6 +171,6 @@ class EdgeBasedGraphFactory
     // mapping of node-based edges to edge-based nodes
     std::vector<NodeID> nbe_to_ebn_mapping;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* EDGE_BASED_GRAPH_FACTORY_HPP_ */
diff --git a/include/extractor/edge_based_node.hpp b/include/extractor/edge_based_node.hpp
index 6fbab52fb..0421d309c 100644
--- a/include/extractor/edge_based_node.hpp
+++ b/include/extractor/edge_based_node.hpp
@@ -14,6 +14,6 @@ struct EdgeBasedNode
     std::uint32_t segregated : 1;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_EDGE_BASED_NODE_HPP_
diff --git a/include/extractor/edge_based_node_segment.hpp b/include/extractor/edge_based_node_segment.hpp
index f16571eab..3bbe6c8f9 100644
--- a/include/extractor/edge_based_node_segment.hpp
+++ b/include/extractor/edge_based_node_segment.hpp
@@ -46,6 +46,6 @@ struct EdgeBasedNodeSegment
     unsigned short fwd_segment_position : 15; // segment id in a compressed geometry
     bool is_startpoint : 1;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACT_EDGE_BASED_NODE_SEGMENT_HPP
diff --git a/include/extractor/extraction_containers.hpp b/include/extractor/extraction_containers.hpp
index 746ebb38b..1711e7cb2 100644
--- a/include/extractor/extraction_containers.hpp
+++ b/include/extractor/extraction_containers.hpp
@@ -89,6 +89,6 @@ class ExtractionContainers
     void PrepareData(ScriptingEnvironment &scripting_environment,
                      const std::string &names_data_path);
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* EXTRACTION_CONTAINERS_HPP */
diff --git a/include/extractor/extraction_helper_functions.hpp b/include/extractor/extraction_helper_functions.hpp
index bb59c3257..46b6c7b2e 100644
--- a/include/extractor/extraction_helper_functions.hpp
+++ b/include/extractor/extraction_helper_functions.hpp
@@ -134,6 +134,6 @@ inline std::string canonicalizeStringList(std::string strlist, const std::string
     return strlist;
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // EXTRACTION_HELPER_FUNCTIONS_HPP
diff --git a/include/extractor/extraction_node.hpp b/include/extractor/extraction_node.hpp
index 1203fb1df..ad46e9bce 100644
--- a/include/extractor/extraction_node.hpp
+++ b/include/extractor/extraction_node.hpp
@@ -17,6 +17,6 @@ struct ExtractionNode
     TrafficLightClass::Direction traffic_lights;
     bool barrier;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // EXTRACTION_NODE_HPP
diff --git a/include/extractor/extraction_relation.hpp b/include/extractor/extraction_relation.hpp
index cee830c8a..0e3332951 100644
--- a/include/extractor/extraction_relation.hpp
+++ b/include/extractor/extraction_relation.hpp
@@ -197,6 +197,6 @@ class ExtractionRelationContainer
     RelationRefMap rel_refs;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // EXTRACTION_RELATION_HPP
diff --git a/include/extractor/extraction_segment.hpp b/include/extractor/extraction_segment.hpp
index 3f009cc22..f6bda5e48 100644
--- a/include/extractor/extraction_segment.hpp
+++ b/include/extractor/extraction_segment.hpp
@@ -24,6 +24,6 @@ struct ExtractionSegment
     double weight;
     double duration;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif
diff --git a/include/extractor/extraction_turn.hpp b/include/extractor/extraction_turn.hpp
index 809dcc5d2..f1bb16a0f 100644
--- a/include/extractor/extraction_turn.hpp
+++ b/include/extractor/extraction_turn.hpp
@@ -129,6 +129,6 @@ struct ExtractionTurn
     double weight;
     double duration;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif
diff --git a/include/extractor/extraction_way.hpp b/include/extractor/extraction_way.hpp
index 5c295fade..5f6fe9600 100644
--- a/include/extractor/extraction_way.hpp
+++ b/include/extractor/extraction_way.hpp
@@ -128,6 +128,6 @@ struct ExtractionWay
     std::uint8_t highway_turn_classification : 4;
     std::uint8_t access_turn_classification : 4;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // EXTRACTION_WAY_HPP
diff --git a/include/extractor/extractor.hpp b/include/extractor/extractor.hpp
index 1e840776c..1d36418aa 100644
--- a/include/extractor/extractor.hpp
+++ b/include/extractor/extractor.hpp
@@ -118,6 +118,6 @@ class Extractor
                               LaneDescriptionMap lane_description_map,
                               ScriptingEnvironment &scripting_environment);
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* EXTRACTOR_HPP */
diff --git a/include/extractor/extractor_callbacks.hpp b/include/extractor/extractor_callbacks.hpp
index c4ecef952..69f53ab2b 100644
--- a/include/extractor/extractor_callbacks.hpp
+++ b/include/extractor/extractor_callbacks.hpp
@@ -93,6 +93,6 @@ class ExtractorCallbacks
     // warning: caller needs to take care of synchronization!
     void ProcessManeuverOverride(const InputManeuverOverride &override);
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* EXTRACTOR_CALLBACKS_HPP */
diff --git a/include/extractor/extractor_config.hpp b/include/extractor/extractor_config.hpp
index 215a86337..61a69d6d0 100644
--- a/include/extractor/extractor_config.hpp
+++ b/include/extractor/extractor_config.hpp
@@ -89,6 +89,6 @@ struct ExtractorConfig final : storage::IOConfig
     bool use_locations_cache = true;
     bool dump_nbg_graph = false;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // EXTRACTOR_CONFIG_HPP
diff --git a/include/extractor/files.hpp b/include/extractor/files.hpp
index 843bdeee9..f3f759470 100644
--- a/include/extractor/files.hpp
+++ b/include/extractor/files.hpp
@@ -574,6 +574,6 @@ void readCompressedNodeBasedGraph(const boost::filesystem::path &path, EdgeListT
 
     storage::serialization::read(reader, "/extractor/cnbg", edge_list);
 }
-} // namespace osrm
+} // namespace osrm::extractor::files
 
 #endif
diff --git a/include/extractor/graph_compressor.hpp b/include/extractor/graph_compressor.hpp
index e5aaef90a..ba518e210 100644
--- a/include/extractor/graph_compressor.hpp
+++ b/include/extractor/graph_compressor.hpp
@@ -37,6 +37,6 @@ class GraphCompressor
                          unsigned original_number_of_edges,
                          const util::NodeBasedDynamicGraph &graph) const;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif
diff --git a/include/extractor/internal_extractor_edge.hpp b/include/extractor/internal_extractor_edge.hpp
index 6dc87f240..32242252a 100644
--- a/include/extractor/internal_extractor_edge.hpp
+++ b/include/extractor/internal_extractor_edge.hpp
@@ -84,6 +84,6 @@ struct InternalExtractorEdge
     // coordinate of the source node
     util::Coordinate source_coordinate;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // INTERNAL_EXTRACTOR_EDGE_HPP
diff --git a/include/extractor/intersection/constants.hpp b/include/extractor/intersection/constants.hpp
index 69d2b9579..5e4ca33b2 100644
--- a/include/extractor/intersection/constants.hpp
+++ b/include/extractor/intersection/constants.hpp
@@ -26,6 +26,6 @@ const auto constexpr ASSUMED_LANE_WIDTH = 3.25;
 // how far apart can roads be at the most, when thinking about merging them?
 const auto constexpr MERGABLE_ANGLE_DIFFERENCE = 95.0;
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
 
 #endif // OSRM_EXTRACTOR_INTERSECTION_CONSTANTS_HPP_
diff --git a/include/extractor/intersection/coordinate_extractor.hpp b/include/extractor/intersection/coordinate_extractor.hpp
index c50555cac..376ea10d5 100644
--- a/include/extractor/intersection/coordinate_extractor.hpp
+++ b/include/extractor/intersection/coordinate_extractor.hpp
@@ -247,6 +247,6 @@ class CoordinateExtractor
                         const std::uint8_t considered_lanes) const;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
 
 #endif // OSRM_EXTRACTOR_INTERSECTION_COORDINATE_EXTRACTOR_HPP_
diff --git a/include/extractor/intersection/have_identical_names.hpp b/include/extractor/intersection/have_identical_names.hpp
index 79a49d6e5..e80c8ad7f 100644
--- a/include/extractor/intersection/have_identical_names.hpp
+++ b/include/extractor/intersection/have_identical_names.hpp
@@ -16,6 +16,6 @@ bool HaveIdenticalNames(const NameID lhs,
                         const NameTable &name_table,
                         const SuffixTable &street_name_suffix_table);
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
 
 #endif /*OSRM_EXTRACTOR_INTERSECTION_HAVE_IDENTICAL_NAMES_HPP_*/
diff --git a/include/extractor/intersection/intersection_analysis.hpp b/include/extractor/intersection/intersection_analysis.hpp
index dc967b26b..9e0878df5 100644
--- a/include/extractor/intersection/intersection_analysis.hpp
+++ b/include/extractor/intersection/intersection_analysis.hpp
@@ -85,6 +85,6 @@ getConnectedRoadsForEdgeGeometries(const util::NodeBasedDynamicGraph &graph,
 // for getConnectedRoads.
 IntersectionEdge skipDegreeTwoNodes(const util::NodeBasedDynamicGraph &graph,
                                     IntersectionEdge road);
-} // namespace osrm
+} // namespace osrm::extractor::intersection
 
 #endif
diff --git a/include/extractor/intersection/intersection_edge.hpp b/include/extractor/intersection/intersection_edge.hpp
index a0fab3144..9121e1b0e 100644
--- a/include/extractor/intersection/intersection_edge.hpp
+++ b/include/extractor/intersection/intersection_edge.hpp
@@ -38,6 +38,6 @@ struct IntersectionEdgeGeometry
 };
 
 using IntersectionEdgeGeometries = std::vector<IntersectionEdgeGeometry>;
-} // namespace osrm
+} // namespace osrm::extractor::intersection
 
 #endif
diff --git a/include/extractor/intersection/intersection_view.hpp b/include/extractor/intersection/intersection_view.hpp
index d38b5159a..2da17db6a 100644
--- a/include/extractor/intersection/intersection_view.hpp
+++ b/include/extractor/intersection/intersection_view.hpp
@@ -228,6 +228,6 @@ struct IntersectionView final : std::vector<IntersectionViewData>,      //
     using Base = std::vector<IntersectionViewData>;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
 
 #endif /* OSRM_EXTRACTOR_INTERSECTION_INTERSECTION_VIEW_HPP_*/
diff --git a/include/extractor/intersection/node_based_graph_walker.hpp b/include/extractor/intersection/node_based_graph_walker.hpp
index 45755ea62..869e934bc 100644
--- a/include/extractor/intersection/node_based_graph_walker.hpp
+++ b/include/extractor/intersection/node_based_graph_walker.hpp
@@ -307,6 +307,6 @@ struct DistanceToNextIntersectionAccumulator
     double distance = 0.;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
 
 #endif
diff --git a/include/extractor/intersection_bearings_container.hpp b/include/extractor/intersection_bearings_container.hpp
index 47fcbfeef..6df186889 100644
--- a/include/extractor/intersection_bearings_container.hpp
+++ b/include/extractor/intersection_bearings_container.hpp
@@ -104,6 +104,6 @@ template <storage::Ownership Ownership> class IntersectionBearingsContainer
 using IntersectionBearingsContainer =
     detail::IntersectionBearingsContainer<storage::Ownership::Container>;
 using IntersectionBearingsView = detail::IntersectionBearingsContainer<storage::Ownership::View>;
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif
diff --git a/include/extractor/location_dependent_data.hpp b/include/extractor/location_dependent_data.hpp
index 26b68d163..3c9fd6df3 100644
--- a/include/extractor/location_dependent_data.hpp
+++ b/include/extractor/location_dependent_data.hpp
@@ -46,6 +46,6 @@ struct LocationDependentData
     std::vector<std::pair<polygon_bands_t, std::size_t>> polygons;
     std::vector<properties_t> properties;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif
diff --git a/include/extractor/maneuver_override.hpp b/include/extractor/maneuver_override.hpp
index 1d73bae49..db647359b 100644
--- a/include/extractor/maneuver_override.hpp
+++ b/include/extractor/maneuver_override.hpp
@@ -141,7 +141,7 @@ struct UnresolvedManeuverOverride
 
     static std::string Name() { return "maneuver override"; };
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 // custom specialization of std::hash can be injected in namespace std
 namespace std
diff --git a/include/extractor/maneuver_override_relation_parser.hpp b/include/extractor/maneuver_override_relation_parser.hpp
index 259d61297..df4b93a3d 100644
--- a/include/extractor/maneuver_override_relation_parser.hpp
+++ b/include/extractor/maneuver_override_relation_parser.hpp
@@ -57,6 +57,6 @@ class ManeuverOverrideRelationParser
     ManeuverOverrideRelationParser();
     boost::optional<InputManeuverOverride> TryParse(const osmium::Relation &relation) const;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* RESTRICTION_PARSER_HPP */
diff --git a/include/extractor/name_table.hpp b/include/extractor/name_table.hpp
index 94f84aa00..cc26cc181 100644
--- a/include/extractor/name_table.hpp
+++ b/include/extractor/name_table.hpp
@@ -113,6 +113,6 @@ template <storage::Ownership Ownership> class NameTableImpl
 
 using NameTable = detail::NameTableImpl<storage::Ownership::Container>;
 using NameTableView = detail::NameTableImpl<storage::Ownership::View>;
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_NAME_TABLE_HPP
diff --git a/include/extractor/nbg_to_ebg.hpp b/include/extractor/nbg_to_ebg.hpp
index 18a0d9f8e..23f71d056 100644
--- a/include/extractor/nbg_to_ebg.hpp
+++ b/include/extractor/nbg_to_ebg.hpp
@@ -13,6 +13,6 @@ struct NBGToEBG
     NodeID u, v;
     NodeID forward_ebg_node, backward_ebg_node;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif
diff --git a/include/extractor/node_based_edge.hpp b/include/extractor/node_based_edge.hpp
index f5aacd569..2abb98b20 100644
--- a/include/extractor/node_based_edge.hpp
+++ b/include/extractor/node_based_edge.hpp
@@ -205,6 +205,6 @@ static_assert(sizeof(extractor::NodeBasedEdge) == 32,
               "bigger than expected. This will influence "
               "memory consumption.");
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* NODE_BASED_EDGE_HPP */
diff --git a/include/extractor/node_based_graph_factory.hpp b/include/extractor/node_based_graph_factory.hpp
index 20765260d..29cc25ac4 100644
--- a/include/extractor/node_based_graph_factory.hpp
+++ b/include/extractor/node_based_graph_factory.hpp
@@ -102,6 +102,6 @@ class NodeBasedGraphFactory
     extractor::CompressedEdgeContainer compressed_edge_container;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_NODE_BASED_GRAPH_FACTORY_HPP_
diff --git a/include/extractor/node_data_container.hpp b/include/extractor/node_data_container.hpp
index 6c596e86c..be204bf58 100644
--- a/include/extractor/node_data_container.hpp
+++ b/include/extractor/node_data_container.hpp
@@ -127,6 +127,6 @@ using EdgeBasedNodeDataExternalContainer =
 using EdgeBasedNodeDataContainer =
     detail::EdgeBasedNodeDataContainerImpl<storage::Ownership::Container>;
 using EdgeBasedNodeDataView = detail::EdgeBasedNodeDataContainerImpl<storage::Ownership::View>;
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif
diff --git a/include/extractor/node_restriction_map.hpp b/include/extractor/node_restriction_map.hpp
index 181e4ab00..1a0b7303a 100644
--- a/include/extractor/node_restriction_map.hpp
+++ b/include/extractor/node_restriction_map.hpp
@@ -72,6 +72,6 @@ struct UnconditionalOnly
 using RestrictionMap = NodeRestrictionMap<UnconditionalOnly>;
 using ConditionalRestrictionMap = NodeRestrictionMap<ConditionalOnly>;
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_NODE_RESTRICTION_MAP_HPP_
diff --git a/include/extractor/nodes_of_way.hpp b/include/extractor/nodes_of_way.hpp
index 26a2ac38a..774d3fb77 100644
--- a/include/extractor/nodes_of_way.hpp
+++ b/include/extractor/nodes_of_way.hpp
@@ -48,6 +48,6 @@ struct NodesOfWay
         return node_ids[node_ids.size() - 1];
     }
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* NODES_OF_WAY_HPP */
diff --git a/include/extractor/packed_osm_ids.hpp b/include/extractor/packed_osm_ids.hpp
index 845a190fc..ee1c793dc 100644
--- a/include/extractor/packed_osm_ids.hpp
+++ b/include/extractor/packed_osm_ids.hpp
@@ -14,6 +14,6 @@ using PackedOSMIDs = util::detail::PackedVector<OSMNodeID, 34, Ownership>;
 
 using PackedOSMIDsView = detail::PackedOSMIDs<storage::Ownership::View>;
 using PackedOSMIDs = detail::PackedOSMIDs<storage::Ownership::Container>;
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif
diff --git a/include/extractor/profile_properties.hpp b/include/extractor/profile_properties.hpp
index 80154333b..817e7b763 100644
--- a/include/extractor/profile_properties.hpp
+++ b/include/extractor/profile_properties.hpp
@@ -136,6 +136,6 @@ struct ProfileProperties
     bool force_split_edges = false;
     bool call_tagless_node_function = true;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif
diff --git a/include/extractor/query_node.hpp b/include/extractor/query_node.hpp
index b3723ea10..628ca9eed 100644
--- a/include/extractor/query_node.hpp
+++ b/include/extractor/query_node.hpp
@@ -46,6 +46,6 @@ struct QueryNode
                          MAX_OSM_NODEID);
     }
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // QUERY_NODE_HPP
diff --git a/include/extractor/raster_source.hpp b/include/extractor/raster_source.hpp
index d70548bfe..b575b5581 100644
--- a/include/extractor/raster_source.hpp
+++ b/include/extractor/raster_source.hpp
@@ -171,6 +171,6 @@ class RasterCache
     // the instance
     static RasterCache *g_instance;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* RASTER_SOURCE_HPP */
diff --git a/include/extractor/restriction.hpp b/include/extractor/restriction.hpp
index b05db4f1e..5e0cc5d72 100644
--- a/include/extractor/restriction.hpp
+++ b/include/extractor/restriction.hpp
@@ -61,6 +61,6 @@ struct TurnRestriction
 
     static std::string Name() { return "turn restriction"; };
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // RESTRICTION_HPP
diff --git a/include/extractor/restriction_graph.hpp b/include/extractor/restriction_graph.hpp
index 301d1f141..4a4d61bf8 100644
--- a/include/extractor/restriction_graph.hpp
+++ b/include/extractor/restriction_graph.hpp
@@ -129,6 +129,6 @@ struct RestrictionGraph
 
 RestrictionGraph constructRestrictionGraph(const std::vector<TurnRestriction> &turn_restrictions);
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_RESTRICTION_GRAPH_HPP_
diff --git a/include/extractor/restriction_parser.hpp b/include/extractor/restriction_parser.hpp
index ccf8303a4..9dca9c55b 100644
--- a/include/extractor/restriction_parser.hpp
+++ b/include/extractor/restriction_parser.hpp
@@ -54,6 +54,6 @@ class RestrictionParser
     std::set<std::string> restrictions;
     osmium::tags::KeyFilter filter;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* RESTRICTION_PARSER_HPP */
diff --git a/include/extractor/road_classification.hpp b/include/extractor/road_classification.hpp
index 07aa11738..fad836557 100644
--- a/include/extractor/road_classification.hpp
+++ b/include/extractor/road_classification.hpp
@@ -221,6 +221,6 @@ inline bool obviousByRoadClass(const RoadClassification in_classification,
             compare_candidate.IsLowPriorityRoadClass());
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_CLASSIFICATION_DATA_HPP_
diff --git a/include/extractor/scripting_environment_lua.hpp b/include/extractor/scripting_environment_lua.hpp
index a89d2a1b8..b81e9024c 100644
--- a/include/extractor/scripting_environment_lua.hpp
+++ b/include/extractor/scripting_environment_lua.hpp
@@ -108,6 +108,6 @@ class Sol2ScriptingEnvironment final : public ScriptingEnvironment
     tbb::enumerable_thread_specific<std::unique_ptr<LuaScriptingContext>> script_contexts;
     const LocationDependentData location_dependent_data;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* SCRIPTING_ENVIRONMENT_LUA_HPP */
diff --git a/include/extractor/segment_data_container.hpp b/include/extractor/segment_data_container.hpp
index f7baf2f5c..99bf5d74b 100644
--- a/include/extractor/segment_data_container.hpp
+++ b/include/extractor/segment_data_container.hpp
@@ -223,6 +223,6 @@ template <storage::Ownership Ownership> class SegmentDataContainerImpl
 
 using SegmentDataView = detail::SegmentDataContainerImpl<storage::Ownership::View>;
 using SegmentDataContainer = detail::SegmentDataContainerImpl<storage::Ownership::Container>;
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif
diff --git a/include/extractor/serialization.hpp b/include/extractor/serialization.hpp
index 4db02de5a..779989261 100644
--- a/include/extractor/serialization.hpp
+++ b/include/extractor/serialization.hpp
@@ -218,6 +218,6 @@ inline void read(storage::tar::FileReader &reader,
     std::string buffer;
     util::serialization::read(reader, name, name_table.indexed_data);
 }
-} // namespace osrm
+} // namespace osrm::extractor::serialization
 
 #endif
diff --git a/include/extractor/suffix_table.hpp b/include/extractor/suffix_table.hpp
index 1d26fcef6..8547eacdf 100644
--- a/include/extractor/suffix_table.hpp
+++ b/include/extractor/suffix_table.hpp
@@ -37,6 +37,6 @@ class SuffixTable final
     std::unordered_set<std::string_view> suffix_set;
 };
 
-} /* namespace osrm */
+} // namespace osrm::extractor
 
 #endif /* OSRM_EXTRACTOR_SUFFIX_LIST_HPP_ */
diff --git a/include/extractor/tarjan_scc.hpp b/include/extractor/tarjan_scc.hpp
index 2b4fdc23b..113001518 100644
--- a/include/extractor/tarjan_scc.hpp
+++ b/include/extractor/tarjan_scc.hpp
@@ -178,6 +178,6 @@ template <typename GraphT> class TarjanSCC
 
     unsigned GetComponentID(const NodeID node) const { return components_index[node]; }
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* TARJAN_SCC_HPP */
diff --git a/include/extractor/traffic_lights.hpp b/include/extractor/traffic_lights.hpp
index b4250e173..1bb54bd91 100644
--- a/include/extractor/traffic_lights.hpp
+++ b/include/extractor/traffic_lights.hpp
@@ -12,6 +12,6 @@ enum Direction
     DIRECTION_FORWARD = 2,
     DIRECTION_REVERSE = 3
 };
-} // namespace osrm
+} // namespace osrm::extractor::TrafficLightClass
 
 #endif // OSRM_EXTRACTOR_TRAFFIC_LIGHTS_DATA_HPP_
diff --git a/include/extractor/traffic_signals.hpp b/include/extractor/traffic_signals.hpp
index 47ff9c09f..a70d67d54 100644
--- a/include/extractor/traffic_signals.hpp
+++ b/include/extractor/traffic_signals.hpp
@@ -20,6 +20,6 @@ struct TrafficSignals
         return bidirectional_nodes.count(to) > 0 || unidirectional_segments.count({from, to}) > 0;
     }
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_TRAFFIC_SIGNALS_HPP
diff --git a/include/extractor/travel_mode.hpp b/include/extractor/travel_mode.hpp
index 82a466ca1..8768c54c1 100644
--- a/include/extractor/travel_mode.hpp
+++ b/include/extractor/travel_mode.hpp
@@ -101,6 +101,6 @@ inline std::string travelModeToString(const TravelMode mode)
     return token;
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* TRAVEL_MODE_HPP */
diff --git a/include/extractor/turn_lane_types.hpp b/include/extractor/turn_lane_types.hpp
index a54b9ee16..275b6365c 100644
--- a/include/extractor/turn_lane_types.hpp
+++ b/include/extractor/turn_lane_types.hpp
@@ -98,6 +98,6 @@ inline TurnLanesIndexedArray transformTurnLaneMapIntoArrays(const LaneDescriptio
     return std::make_tuple(std::move(turn_lane_offsets), std::move(turn_lane_masks));
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* OSRM_GUIDANCE_TURN_LANE_TYPES_HPP_ */
diff --git a/include/extractor/turn_path.hpp b/include/extractor/turn_path.hpp
index c562c6c76..004036d59 100644
--- a/include/extractor/turn_path.hpp
+++ b/include/extractor/turn_path.hpp
@@ -262,5 +262,5 @@ struct TurnPath
     };
 };
 
-} // namespace osrm
+} // namespace osrm::extractor
 #endif // OSRM_TURN_PATH_HPP
diff --git a/include/extractor/turn_path_compressor.hpp b/include/extractor/turn_path_compressor.hpp
index 114590878..4a6bbea89 100644
--- a/include/extractor/turn_path_compressor.hpp
+++ b/include/extractor/turn_path_compressor.hpp
@@ -46,6 +46,6 @@ class TurnPathCompressor
     std::unordered_multimap<NodeID, TurnPath *> ends;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_TURN_PATH_COMPRESSOR_HPP_
diff --git a/include/extractor/turn_path_filter.hpp b/include/extractor/turn_path_filter.hpp
index 6d8e770fc..db60839ca 100644
--- a/include/extractor/turn_path_filter.hpp
+++ b/include/extractor/turn_path_filter.hpp
@@ -14,6 +14,6 @@ namespace osrm::extractor
 // `restrictions = removeInvalidRestrictions(std::move(restrictions))`
 template <typename T>
 std::vector<T> removeInvalidTurnPaths(std::vector<T>, const util::NodeBasedDynamicGraph &);
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_TURN_PATH_FILTER_HPP_
diff --git a/include/extractor/way_restriction_map.hpp b/include/extractor/way_restriction_map.hpp
index f40db16a5..8c8cca4a5 100644
--- a/include/extractor/way_restriction_map.hpp
+++ b/include/extractor/way_restriction_map.hpp
@@ -67,6 +67,6 @@ class WayRestrictionMap
     const RestrictionGraph &restriction_graph;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_WAY_RESTRICTION_MAP_HPP_
diff --git a/include/guidance/constants.hpp b/include/guidance/constants.hpp
index 780b65297..3201aad33 100644
--- a/include/guidance/constants.hpp
+++ b/include/guidance/constants.hpp
@@ -28,6 +28,6 @@ const double constexpr INCREASES_BY_FOURTY_PERCENT = 1.4;
 
 const int constexpr MAX_SLIPROAD_THRESHOLD = 250;
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif // OSRM_GUIDANCE_CONSTANTS_HPP_
diff --git a/include/guidance/driveway_handler.hpp b/include/guidance/driveway_handler.hpp
index 1bdaeb4ab..a33cab9a8 100644
--- a/include/guidance/driveway_handler.hpp
+++ b/include/guidance/driveway_handler.hpp
@@ -33,6 +33,6 @@ class DrivewayHandler final : public IntersectionHandler
                             Intersection intersection) const override final;
 };
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif /* OSRM_GUIDANCE_DRIVEWAY_HANDLER_HPP */
diff --git a/include/guidance/files.hpp b/include/guidance/files.hpp
index bd7361d5a..b1b7a9776 100644
--- a/include/guidance/files.hpp
+++ b/include/guidance/files.hpp
@@ -47,6 +47,6 @@ inline void writeTurnData(const boost::filesystem::path &path,
     writer.WriteFrom("/common/connectivity_checksum", connectivity_checksum);
     serialization::write(writer, "/common/turn_data", turn_data);
 }
-} // namespace osrm
+} // namespace osrm::guidance::files
 
 #endif
diff --git a/include/guidance/guidance_processing.hpp b/include/guidance/guidance_processing.hpp
index 2c56dabf5..e0aea1d54 100644
--- a/include/guidance/guidance_processing.hpp
+++ b/include/guidance/guidance_processing.hpp
@@ -43,6 +43,6 @@ void annotateTurns(const util::NodeBasedDynamicGraph &node_based_graph,
                    EntryClassesMap &entry_class_hash,
                    std::uint32_t &connectivity_checksum);
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif
diff --git a/include/guidance/intersection.hpp b/include/guidance/intersection.hpp
index 1f4521c34..58122d0a1 100644
--- a/include/guidance/intersection.hpp
+++ b/include/guidance/intersection.hpp
@@ -120,6 +120,6 @@ inline std::string toString(const ConnectedRoad &road)
     return result;
 }
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif /* OSRM_GUIDANCE_INTERSECTION_HPP_*/
diff --git a/include/guidance/intersection_handler.hpp b/include/guidance/intersection_handler.hpp
index 3ba2fb057..dcd62d4cb 100644
--- a/include/guidance/intersection_handler.hpp
+++ b/include/guidance/intersection_handler.hpp
@@ -658,6 +658,6 @@ std::size_t IntersectionHandler::findObviousTurn(const EdgeID via_edge,
     return 0;
 }
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif /*OSRM_GUIDANCE_INTERSECTION_HANDLER_HPP_*/
diff --git a/include/guidance/is_through_street.hpp b/include/guidance/is_through_street.hpp
index 53281f196..027c643e6 100644
--- a/include/guidance/is_through_street.hpp
+++ b/include/guidance/is_through_street.hpp
@@ -58,6 +58,6 @@ inline bool isThroughStreet(const std::size_t index,
     return false;
 }
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif /*OSRM_GUIDANCE_IS_THROUGH_STREET_HPP_*/
diff --git a/include/guidance/motorway_handler.hpp b/include/guidance/motorway_handler.hpp
index 630b99e8e..6b390d6a3 100644
--- a/include/guidance/motorway_handler.hpp
+++ b/include/guidance/motorway_handler.hpp
@@ -56,6 +56,6 @@ class MotorwayHandler final : public IntersectionHandler
     Intersection fallback(Intersection intersection) const;
 };
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif /*OSRM_GUIDANCE_MOTORWAY_HANDLER_HPP_*/
diff --git a/include/guidance/parsing_toolkit.hpp b/include/guidance/parsing_toolkit.hpp
index aa3e1e4d1..403599dcd 100644
--- a/include/guidance/parsing_toolkit.hpp
+++ b/include/guidance/parsing_toolkit.hpp
@@ -101,6 +101,6 @@ inline std::string applyAccessTokens(std::string lane_string, const std::string
     return result_string;
 }
 
-} // namespace osrm
+} // namespace osrm::extractor::guidance
 
 #endif // OSRM_GUIDANCE_PARSING_TOOLKIT_HPP_
diff --git a/include/guidance/roundabout_handler.hpp b/include/guidance/roundabout_handler.hpp
index 8cab619b0..29fda3786 100644
--- a/include/guidance/roundabout_handler.hpp
+++ b/include/guidance/roundabout_handler.hpp
@@ -82,6 +82,6 @@ class RoundaboutHandler final : public IntersectionHandler
     const extractor::intersection::CoordinateExtractor coordinate_extractor;
 };
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif /*OSRM_GUIDANCE_ROUNDABOUT_HANDLER_HPP_*/
diff --git a/include/guidance/roundabout_type.hpp b/include/guidance/roundabout_type.hpp
index daae81e3c..1af8816ad 100644
--- a/include/guidance/roundabout_type.hpp
+++ b/include/guidance/roundabout_type.hpp
@@ -10,6 +10,6 @@ enum class RoundaboutType
     Rotary,                // traffic circle (large roundabout) with dedicated name
     RoundaboutIntersection // small roundabout with distinct turns, handled as intersection
 };
-} /* namespace osrm */
+} // namespace osrm::guidance
 
 #endif /* OSRM_EXTRACTOR_GUIDANCE_ROUNDABOUT_TYPES_HPP_ */
diff --git a/include/guidance/serialization.hpp b/include/guidance/serialization.hpp
index 86e196f53..98e303222 100644
--- a/include/guidance/serialization.hpp
+++ b/include/guidance/serialization.hpp
@@ -45,6 +45,6 @@ inline void write(storage::tar::FileWriter &writer,
     storage::serialization::write(
         writer, name + "/post_turn_bearings", turn_data_container.post_turn_bearings);
 }
-} // namespace osrm
+} // namespace osrm::guidance::serialization
 
 #endif
diff --git a/include/guidance/sliproad_handler.hpp b/include/guidance/sliproad_handler.hpp
index d88a27e52..a75f70a52 100644
--- a/include/guidance/sliproad_handler.hpp
+++ b/include/guidance/sliproad_handler.hpp
@@ -79,6 +79,6 @@ class SliproadHandler final : public IntersectionHandler
     const extractor::intersection::CoordinateExtractor coordinate_extractor;
 };
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif /*OSRM_GUIDANCE_SLIPROAD_HANDLER_HPP_*/
diff --git a/include/guidance/statistics_handler.hpp b/include/guidance/statistics_handler.hpp
index c943eb349..f0e3401c7 100644
--- a/include/guidance/statistics_handler.hpp
+++ b/include/guidance/statistics_handler.hpp
@@ -105,6 +105,6 @@ class StatisticsHandler final : public IntersectionHandler
     mutable std::map<DirectionModifier::Enum, std::uint64_t> modifier_hist;
 };
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif // OSRM_GUIDANCE_VALIDATION_HANDLER_HPP_
diff --git a/include/guidance/suppress_mode_handler.hpp b/include/guidance/suppress_mode_handler.hpp
index 6553795fa..447a3fdb3 100644
--- a/include/guidance/suppress_mode_handler.hpp
+++ b/include/guidance/suppress_mode_handler.hpp
@@ -38,6 +38,6 @@ class SuppressModeHandler final : public IntersectionHandler
                             Intersection intersection) const override final;
 };
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif /* OSRM_GUIDANCE_SUPPRESS_MODE_HANDLER_HPP_ */
diff --git a/include/guidance/turn_analysis.hpp b/include/guidance/turn_analysis.hpp
index fc2650e60..c2e6f947c 100644
--- a/include/guidance/turn_analysis.hpp
+++ b/include/guidance/turn_analysis.hpp
@@ -73,6 +73,6 @@ class TurnAnalysis
     setTurnTypes(const NodeID from, const EdgeID via_edge, Intersection intersection) const;
 }; // class TurnAnalysis
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif // OSRM_GUIDANCE_TURN_ANALYSIS
diff --git a/include/guidance/turn_bearing.hpp b/include/guidance/turn_bearing.hpp
index 6165fc0de..e6532f3b5 100644
--- a/include/guidance/turn_bearing.hpp
+++ b/include/guidance/turn_bearing.hpp
@@ -27,6 +27,6 @@ class TurnBearing
 };
 #pragma pack(pop)
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif /* OSRM_INCLUDE_GUIDANCE_TURN_BEARING_HPP_ */
diff --git a/include/guidance/turn_classification.hpp b/include/guidance/turn_classification.hpp
index 4103b14a2..bcbf5a999 100644
--- a/include/guidance/turn_classification.hpp
+++ b/include/guidance/turn_classification.hpp
@@ -15,6 +15,6 @@ namespace osrm::guidance
 std::pair<util::guidance::EntryClass, util::guidance::BearingClass>
 classifyIntersection(Intersection intersection, const osrm::util::Coordinate &location);
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif // OSRM_GUIDANCE_TURN_CLASSIFICATION_HPP_
diff --git a/include/guidance/turn_data_container.hpp b/include/guidance/turn_data_container.hpp
index 2500df9a2..f697b1a58 100644
--- a/include/guidance/turn_data_container.hpp
+++ b/include/guidance/turn_data_container.hpp
@@ -114,6 +114,6 @@ template <storage::Ownership Ownership> class TurnDataContainerImpl
 using TurnDataExternalContainer = detail::TurnDataContainerImpl<storage::Ownership::External>;
 using TurnDataContainer = detail::TurnDataContainerImpl<storage::Ownership::Container>;
 using TurnDataView = detail::TurnDataContainerImpl<storage::Ownership::View>;
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif
diff --git a/include/guidance/turn_discovery.hpp b/include/guidance/turn_discovery.hpp
index b53bc8387..67aaa1259 100644
--- a/include/guidance/turn_discovery.hpp
+++ b/include/guidance/turn_discovery.hpp
@@ -42,7 +42,7 @@ bool findPreviousIntersection(
     EdgeID &result_via_edge,
     extractor::intersection::IntersectionView &result_intersection);
 
-} // namespace guidance
+} // namespace guidance::lanes
 } // namespace osrm
 
 #endif /*OSRM_GUIDANCE_TURN_DISCOVERY_HPP_*/
diff --git a/include/guidance/turn_handler.hpp b/include/guidance/turn_handler.hpp
index 73bcb7369..d3e25c79a 100644
--- a/include/guidance/turn_handler.hpp
+++ b/include/guidance/turn_handler.hpp
@@ -109,6 +109,6 @@ class TurnHandler final : public IntersectionHandler
                                   const std::size_t up_to) const;
 };
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif /*OSRM_GUIDANCE_TURN_HANDLER_HPP_*/
diff --git a/include/guidance/turn_instruction.hpp b/include/guidance/turn_instruction.hpp
index a57836584..45ab1f5df 100644
--- a/include/guidance/turn_instruction.hpp
+++ b/include/guidance/turn_instruction.hpp
@@ -391,6 +391,6 @@ inline std::string instructionModifierToString(const DirectionModifier::Enum mod
     return detail::modifier_names[static_cast<std::size_t>(modifier)];
 }
 
-} // namespace osrm
+} // namespace osrm::guidance
 
 #endif // OSRM_GUIDANCE_TURN_INSTRUCTION_HPP_
diff --git a/include/guidance/turn_lane_augmentation.hpp b/include/guidance/turn_lane_augmentation.hpp
index efb14a345..53ecd9d7f 100644
--- a/include/guidance/turn_lane_augmentation.hpp
+++ b/include/guidance/turn_lane_augmentation.hpp
@@ -12,6 +12,6 @@ OSRM_ATTR_WARN_UNUSED
 LaneDataVector handleNoneValueAtSimpleTurn(LaneDataVector lane_data,
                                            const Intersection &intersection);
 
-} // namespace osrm
+} // namespace osrm::guidance::lanes
 
 #endif /* OSRM_GUIDANCE_TURN_LANE_AUGMENTATION_HPP_ */
diff --git a/include/guidance/turn_lane_data.hpp b/include/guidance/turn_lane_data.hpp
index 302ca4496..384172306 100644
--- a/include/guidance/turn_lane_data.hpp
+++ b/include/guidance/turn_lane_data.hpp
@@ -33,6 +33,6 @@ LaneDataVector::iterator findTag(const extractor::TurnLaneType::Mask tag, LaneDa
 
 // Returns true if any of the queried tags is contained
 bool hasTag(const extractor::TurnLaneType::Mask tag, const LaneDataVector &data);
-} // namespace osrm
+} // namespace osrm::guidance::lanes
 
 #endif /* OSRM_GUIDANCE_TURN_LANE_DATA_HPP_ */
diff --git a/include/guidance/turn_lane_handler.hpp b/include/guidance/turn_lane_handler.hpp
index cfbb8c54d..de39a22cf 100644
--- a/include/guidance/turn_lane_handler.hpp
+++ b/include/guidance/turn_lane_handler.hpp
@@ -133,6 +133,6 @@ class TurnLaneHandler
                          LaneDataVector &lane_data) const;
 };
 
-} // namespace osrm
+} // namespace osrm::guidance::lanes
 
 #endif // OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_HANDLER_HPP_
diff --git a/include/guidance/turn_lane_matcher.hpp b/include/guidance/turn_lane_matcher.hpp
index 241968fca..b336dde8d 100644
--- a/include/guidance/turn_lane_matcher.hpp
+++ b/include/guidance/turn_lane_matcher.hpp
@@ -41,6 +41,6 @@ Intersection triviallyMatchLanesToTurns(Intersection intersection,
                                         const LaneDescriptionID lane_string_id,
                                         util::guidance::LaneDataIdMap &lane_data_to_id);
 
-} // namespace osrm
+} // namespace osrm::guidance::lanes
 
 #endif /*OSRM_GUIDANCE_TURN_LANE_MATCHER_HPP_*/
diff --git a/include/osrm/osrm_fwd.hpp b/include/osrm/osrm_fwd.hpp
index 5e32348da..be1095059 100644
--- a/include/osrm/osrm_fwd.hpp
+++ b/include/osrm/osrm_fwd.hpp
@@ -37,7 +37,7 @@ namespace osrm
 namespace util::json
 {
 struct Object;
-} // namespace util
+} // namespace util::json
 
 namespace engine
 {
diff --git a/include/partitioner/bisection_graph.hpp b/include/partitioner/bisection_graph.hpp
index 8c697af64..e6d18530d 100644
--- a/include/partitioner/bisection_graph.hpp
+++ b/include/partitioner/bisection_graph.hpp
@@ -109,6 +109,6 @@ std::vector<BisectionInputEdge> adaptToBisectionEdge(std::vector<InputEdge> edge
     return result;
 }
 
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif // OSRM_PARTITIONER_BISECTION_GRAPH_HPP_
diff --git a/include/partitioner/bisection_graph_view.hpp b/include/partitioner/bisection_graph_view.hpp
index c050607f1..e3a62aaf1 100644
--- a/include/partitioner/bisection_graph_view.hpp
+++ b/include/partitioner/bisection_graph_view.hpp
@@ -62,6 +62,6 @@ class BisectionGraphView
     const BisectionGraph::ConstNodeIterator end;
 };
 
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif // OSRM_PARTITIONER_GRAPHVIEW_HPP_
diff --git a/include/partitioner/bisection_to_partition.hpp b/include/partitioner/bisection_to_partition.hpp
index 8c26c810d..1191b1345 100644
--- a/include/partitioner/bisection_to_partition.hpp
+++ b/include/partitioner/bisection_to_partition.hpp
@@ -15,6 +15,6 @@ using Partition = std::vector<CellID>;
 std::tuple<std::vector<Partition>, std::vector<std::uint32_t>>
 bisectionToPartition(const std::vector<BisectionID> &node_to_bisection_id,
                      const std::vector<std::size_t> &max_cell_sizes);
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif
diff --git a/include/partitioner/cell_statistics.hpp b/include/partitioner/cell_statistics.hpp
index 46dac654d..633c79a98 100644
--- a/include/partitioner/cell_statistics.hpp
+++ b/include/partitioner/cell_statistics.hpp
@@ -46,6 +46,6 @@ void printCellStatistics(const Partition &partition, const CellStorage &storage)
                     << (2 * entries * sizeof(EdgeWeight)) << " bytes)";
     }
 }
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif
diff --git a/include/partitioner/cell_storage.hpp b/include/partitioner/cell_storage.hpp
index 751826c66..6229b6b79 100644
--- a/include/partitioner/cell_storage.hpp
+++ b/include/partitioner/cell_storage.hpp
@@ -446,6 +446,6 @@ template <storage::Ownership Ownership> class CellStorageImpl
     Vector<std::uint64_t> level_to_cell_offset;
 };
 } // namespace detail
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif // OSRM_PARTITIONER_CUSTOMIZE_CELL_STORAGE_HPP
diff --git a/include/partitioner/dinic_max_flow.hpp b/include/partitioner/dinic_max_flow.hpp
index 565f39d6c..5f742ac78 100644
--- a/include/partitioner/dinic_max_flow.hpp
+++ b/include/partitioner/dinic_max_flow.hpp
@@ -86,7 +86,7 @@ class DinicMaxFlow
                    const std::size_t flow_value) const;
 };
 
-} // namespace osrm
+} // namespace osrm::partitioner
 
 // Implementation of Dinics [1] algorithm for max-flow/min-cut.
 // [1] https://www.cs.bgu.ac.il/~dinitz/D70.pdf
diff --git a/include/partitioner/edge_based_graph.hpp b/include/partitioner/edge_based_graph.hpp
index 51422d981..0b09aea17 100644
--- a/include/partitioner/edge_based_graph.hpp
+++ b/include/partitioner/edge_based_graph.hpp
@@ -51,6 +51,6 @@ struct DynamicEdgeBasedGraphEdge : DynamicEdgeBasedGraph::InputEdge
     using Base = DynamicEdgeBasedGraph::InputEdge;
     using Base::Base;
 };
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif
diff --git a/include/partitioner/edge_based_graph_reader.hpp b/include/partitioner/edge_based_graph_reader.hpp
index 817b65e82..669035682 100644
--- a/include/partitioner/edge_based_graph_reader.hpp
+++ b/include/partitioner/edge_based_graph_reader.hpp
@@ -196,6 +196,6 @@ inline DynamicEdgeBasedGraph LoadEdgeBasedGraph(const boost::filesystem::path &p
     return DynamicEdgeBasedGraph(number_of_edge_based_nodes, tidied, checksum);
 }
 
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif
diff --git a/include/partitioner/files.hpp b/include/partitioner/files.hpp
index 0b389ec18..9bd74447b 100644
--- a/include/partitioner/files.hpp
+++ b/include/partitioner/files.hpp
@@ -92,6 +92,6 @@ inline void writeGraph(const boost::filesystem::path &path,
     writer.WriteFrom("/mld/connectivity_checksum", connectivity_checksum);
     serialization::write(writer, "/mld/multilevelgraph", graph);
 }
-} // namespace osrm
+} // namespace osrm::partitioner::files
 
 #endif
diff --git a/include/partitioner/inertial_flow.hpp b/include/partitioner/inertial_flow.hpp
index 18a1553d9..c34bea51e 100644
--- a/include/partitioner/inertial_flow.hpp
+++ b/include/partitioner/inertial_flow.hpp
@@ -12,6 +12,6 @@ DinicMaxFlow::MinCut computeInertialFlowCut(const BisectionGraphView &view,
                                             const double balance,
                                             const double source_sink_rate);
 
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif // OSRM_PARTITIONER_INERTIAL_FLOW_HPP_
diff --git a/include/partitioner/multi_level_graph.hpp b/include/partitioner/multi_level_graph.hpp
index 0febf305e..288663b88 100644
--- a/include/partitioner/multi_level_graph.hpp
+++ b/include/partitioner/multi_level_graph.hpp
@@ -233,6 +233,6 @@ class MultiLevelGraph : public util::StaticGraph<EdgeDataT, Ownership>
 
 using MultiLevelEdgeBasedGraph =
     MultiLevelGraph<EdgeBasedGraphEdgeData, storage::Ownership::Container>;
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif
diff --git a/include/partitioner/multi_level_partition.hpp b/include/partitioner/multi_level_partition.hpp
index fc0f4077b..afdde0b6d 100644
--- a/include/partitioner/multi_level_partition.hpp
+++ b/include/partitioner/multi_level_partition.hpp
@@ -342,6 +342,6 @@ inline MultiLevelPartitionImpl<storage::Ownership::View>::MultiLevelPartitionImp
 {
 }
 } // namespace detail
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif
diff --git a/include/partitioner/partition_graph.hpp b/include/partitioner/partition_graph.hpp
index b0dbde9da..f425a3520 100644
--- a/include/partitioner/partition_graph.hpp
+++ b/include/partitioner/partition_graph.hpp
@@ -154,6 +154,6 @@ template <typename NodeEntryT, typename EdgeEntryT> class RemappableGraph
     std::vector<EdgeT> edges;
 };
 
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif // OSRM_PARTITIONER_GRAPH_HPP_
diff --git a/include/partitioner/partitioner.hpp b/include/partitioner/partitioner.hpp
index e254809ac..18993ae83 100644
--- a/include/partitioner/partitioner.hpp
+++ b/include/partitioner/partitioner.hpp
@@ -13,6 +13,6 @@ class Partitioner
     int Run(const PartitionerConfig &config);
 };
 
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif // OSRM_PARTITIONER_PARTITIONER_HPP_
diff --git a/include/partitioner/partitioner_config.hpp b/include/partitioner/partitioner_config.hpp
index 7522cb4e0..021ed1b4e 100644
--- a/include/partitioner/partitioner_config.hpp
+++ b/include/partitioner/partitioner_config.hpp
@@ -42,6 +42,6 @@ struct PartitionerConfig final : storage::IOConfig
     std::size_t small_component_size;
     std::vector<std::size_t> max_cell_sizes;
 };
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif // OSRM_PARTITIONER_CONFIG_HPP
diff --git a/include/partitioner/recursive_bisection.hpp b/include/partitioner/recursive_bisection.hpp
index 4985527dc..a17add988 100644
--- a/include/partitioner/recursive_bisection.hpp
+++ b/include/partitioner/recursive_bisection.hpp
@@ -30,6 +30,6 @@ class RecursiveBisection
     RecursiveBisectionState internal_state;
 };
 
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif // OSRM_PARTITIONER_RECURSIVE_BISECTION_HPP_
diff --git a/include/partitioner/recursive_bisection_state.hpp b/include/partitioner/recursive_bisection_state.hpp
index 933219fcc..2da263ff5 100644
--- a/include/partitioner/recursive_bisection_state.hpp
+++ b/include/partitioner/recursive_bisection_state.hpp
@@ -48,6 +48,6 @@ class RecursiveBisectionState
     std::vector<BisectionID> bisection_ids;
 };
 
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif // OSRM_PARTITIONER_RECURSIVE_BISECTION_STATE_HPP_
diff --git a/include/partitioner/remove_unconnected.hpp b/include/partitioner/remove_unconnected.hpp
index cb25a77db..c3ad1e521 100644
--- a/include/partitioner/remove_unconnected.hpp
+++ b/include/partitioner/remove_unconnected.hpp
@@ -107,6 +107,6 @@ std::size_t removeUnconnectedBoundaryNodes(const GraphT &edge_based_graph,
 
     return num_unconnected;
 }
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif
diff --git a/include/partitioner/renumber.hpp b/include/partitioner/renumber.hpp
index c1d8f5851..ead377d4d 100644
--- a/include/partitioner/renumber.hpp
+++ b/include/partitioner/renumber.hpp
@@ -91,6 +91,6 @@ inline void renumber(std::vector<extractor::StorageManeuverOverride> &maneuver_o
     }
 }
 
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif
diff --git a/include/partitioner/reorder_first_last.hpp b/include/partitioner/reorder_first_last.hpp
index 728f41958..b5e5b7798 100644
--- a/include/partitioner/reorder_first_last.hpp
+++ b/include/partitioner/reorder_first_last.hpp
@@ -47,6 +47,6 @@ void reorderFirstLast(RandomAccessRange &rng, std::size_t n, Compare comp)
     return reorderFirstLast(begin(rng), end(rng), n, comp);
 }
 
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif
diff --git a/include/partitioner/serialization.hpp b/include/partitioner/serialization.hpp
index ee1b0ebef..006698d58 100644
--- a/include/partitioner/serialization.hpp
+++ b/include/partitioner/serialization.hpp
@@ -61,6 +61,6 @@ inline void write(storage::tar::FileWriter &writer,
     storage::serialization::write(
         writer, name + "/level_to_cell_offset", storage.level_to_cell_offset);
 }
-} // namespace osrm
+} // namespace osrm::partitioner::serialization
 
 #endif
diff --git a/include/partitioner/tarjan_graph_wrapper.hpp b/include/partitioner/tarjan_graph_wrapper.hpp
index 7027a1238..0f1293334 100644
--- a/include/partitioner/tarjan_graph_wrapper.hpp
+++ b/include/partitioner/tarjan_graph_wrapper.hpp
@@ -21,6 +21,6 @@ class TarjanGraphWrapper
     const BisectionGraph &bisection_graph;
 };
 
-} // namespace osrm
+} // namespace osrm::partitioner
 
 #endif // OSRM_PARTITIONER_TARJAN_GRAPH_WRAPPER_HPP_
diff --git a/include/server/api/base_parameters_grammar.hpp b/include/server/api/base_parameters_grammar.hpp
index 4c43016f5..b9ab4e106 100644
--- a/include/server/api/base_parameters_grammar.hpp
+++ b/include/server/api/base_parameters_grammar.hpp
@@ -231,6 +231,6 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar<Iterator, Signature>
     qi::symbols<char, engine::Approach> approach_type;
     qi::symbols<char, engine::api::BaseParameters::SnappingType> snapping_type;
 };
-} // namespace osrm
+} // namespace osrm::server::api
 
 #endif
diff --git a/include/server/api/match_parameter_grammar.hpp b/include/server/api/match_parameter_grammar.hpp
index 855482856..f5f8142b3 100644
--- a/include/server/api/match_parameter_grammar.hpp
+++ b/include/server/api/match_parameter_grammar.hpp
@@ -58,6 +58,6 @@ struct MatchParametersGrammar final : public RouteParametersGrammar<Iterator, Si
 
     qi::symbols<char, engine::api::MatchParameters::GapsType> gaps_type;
 };
-} // namespace osrm
+} // namespace osrm::server::api
 
 #endif
diff --git a/include/server/api/nearest_parameter_grammar.hpp b/include/server/api/nearest_parameter_grammar.hpp
index b7b8bb502..9c57147cf 100644
--- a/include/server/api/nearest_parameter_grammar.hpp
+++ b/include/server/api/nearest_parameter_grammar.hpp
@@ -36,6 +36,6 @@ struct NearestParametersGrammar final : public BaseParametersGrammar<Iterator, S
     qi::rule<Iterator, Signature> root_rule;
     qi::rule<Iterator, Signature> nearest_rule;
 };
-} // namespace osrm
+} // namespace osrm::server::api
 
 #endif
diff --git a/include/server/api/parameters_parser.hpp b/include/server/api/parameters_parser.hpp
index 9492226bf..db16ad77b 100644
--- a/include/server/api/parameters_parser.hpp
+++ b/include/server/api/parameters_parser.hpp
@@ -39,6 +39,6 @@ boost::optional<ParameterT> parseParameters(std::string options_string)
     return parseParameters<ParameterT>(first, last);
 }
 
-} // namespace osrm
+} // namespace osrm::server::api
 
 #endif
diff --git a/include/server/api/parsed_url.hpp b/include/server/api/parsed_url.hpp
index 2e444c48b..ee1cf2218 100644
--- a/include/server/api/parsed_url.hpp
+++ b/include/server/api/parsed_url.hpp
@@ -18,6 +18,6 @@ struct ParsedURL final
     std::size_t prefix_length;
 };
 
-} // namespace osrm
+} // namespace osrm::server::api
 
 #endif
diff --git a/include/server/api/route_parameters_grammar.hpp b/include/server/api/route_parameters_grammar.hpp
index 544c179c6..21d19b519 100644
--- a/include/server/api/route_parameters_grammar.hpp
+++ b/include/server/api/route_parameters_grammar.hpp
@@ -109,6 +109,6 @@ struct RouteParametersGrammar : public BaseParametersGrammar<Iterator, Signature
     qi::symbols<char, engine::api::RouteParameters::OverviewType> overview_type;
     qi::symbols<char, engine::api::RouteParameters::AnnotationsType> annotations_type;
 };
-} // namespace osrm
+} // namespace osrm::server::api
 
 #endif
diff --git a/include/server/api/table_parameter_grammar.hpp b/include/server/api/table_parameter_grammar.hpp
index d810f85c1..873024787 100644
--- a/include/server/api/table_parameter_grammar.hpp
+++ b/include/server/api/table_parameter_grammar.hpp
@@ -102,6 +102,6 @@ struct TableParametersGrammar : public BaseParametersGrammar<Iterator, Signature
         fallback_coordinate_type;
     qi::real_parser<double, json_policy> double_;
 };
-} // namespace osrm
+} // namespace osrm::server::api
 
 #endif
diff --git a/include/server/api/tile_parameter_grammar.hpp b/include/server/api/tile_parameter_grammar.hpp
index dfd7351a2..40d4f4786 100644
--- a/include/server/api/tile_parameter_grammar.hpp
+++ b/include/server/api/tile_parameter_grammar.hpp
@@ -36,6 +36,6 @@ struct TileParametersGrammar final : boost::spirit::qi::grammar<Iterator, Signat
   private:
     qi::rule<Iterator, Signature> root_rule;
 };
-} // namespace osrm
+} // namespace osrm::server::api
 
 #endif
diff --git a/include/server/api/trip_parameter_grammar.hpp b/include/server/api/trip_parameter_grammar.hpp
index c3318ddac..1f29a029a 100644
--- a/include/server/api/trip_parameter_grammar.hpp
+++ b/include/server/api/trip_parameter_grammar.hpp
@@ -56,6 +56,6 @@ struct TripParametersGrammar final : public RouteParametersGrammar<Iterator, Sig
     qi::symbols<char, engine::api::TripParameters::SourceType> source_type;
     qi::symbols<char, engine::api::TripParameters::DestinationType> destination_type;
 };
-} // namespace osrm
+} // namespace osrm::server::api
 
 #endif
diff --git a/include/server/api/url_parser.hpp b/include/server/api/url_parser.hpp
index f166ea38c..227fddfcb 100644
--- a/include/server/api/url_parser.hpp
+++ b/include/server/api/url_parser.hpp
@@ -18,6 +18,6 @@ inline boost::optional<ParsedURL> parseURL(std::string url_string)
     auto iter = url_string.begin();
     return parseURL(iter, url_string.end());
 }
-} // namespace osrm
+} // namespace osrm::server::api
 
 #endif
diff --git a/include/server/connection.hpp b/include/server/connection.hpp
index 5bc84a824..01288d17f 100644
--- a/include/server/connection.hpp
+++ b/include/server/connection.hpp
@@ -74,6 +74,6 @@ class Connection : public std::enable_shared_from_this<Connection>
     short processed_requests = 512;
     short keepalive_timeout = 5; // In seconds
 };
-} // namespace osrm
+} // namespace osrm::server
 
 #endif // CONNECTION_HPP
diff --git a/include/server/http/compression_type.hpp b/include/server/http/compression_type.hpp
index 1e3d18fee..52f096266 100644
--- a/include/server/http/compression_type.hpp
+++ b/include/server/http/compression_type.hpp
@@ -10,6 +10,6 @@ enum compression_type
     gzip_rfc1952,
     deflate_rfc1951
 };
-} // namespace osrm
+} // namespace osrm::server::http
 
 #endif // COMPRESSION_TYPE_HPP
diff --git a/include/server/http/header.hpp b/include/server/http/header.hpp
index 1b1bc4f08..35d4fcc13 100644
--- a/include/server/http/header.hpp
+++ b/include/server/http/header.hpp
@@ -23,6 +23,6 @@ struct header
     std::string name;
     std::string value;
 };
-} // namespace osrm
+} // namespace osrm::server::http
 
 #endif // HEADER_HPP
diff --git a/include/server/http/reply.hpp b/include/server/http/reply.hpp
index 55dd8f1b6..534bd56dd 100644
--- a/include/server/http/reply.hpp
+++ b/include/server/http/reply.hpp
@@ -34,6 +34,6 @@ class reply
     std::string status_to_string(reply::status_type status);
     boost::asio::const_buffer status_to_buffer(reply::status_type status);
 };
-} // namespace osrm
+} // namespace osrm::server::http
 
 #endif // REPLY_HPP
diff --git a/include/server/http/request.hpp b/include/server/http/request.hpp
index 34acaf9fc..2f6d8a242 100644
--- a/include/server/http/request.hpp
+++ b/include/server/http/request.hpp
@@ -16,6 +16,6 @@ struct request
     std::string connection;
     boost::asio::ip::address endpoint;
 };
-} // namespace osrm
+} // namespace osrm::server::http
 
 #endif // REQUEST_HPP
diff --git a/include/server/request_handler.hpp b/include/server/request_handler.hpp
index 62864dab7..4841d2ec2 100644
--- a/include/server/request_handler.hpp
+++ b/include/server/request_handler.hpp
@@ -29,6 +29,6 @@ class RequestHandler
   private:
     std::unique_ptr<ServiceHandlerInterface> service_handler;
 };
-} // namespace osrm
+} // namespace osrm::server
 
 #endif // REQUEST_HANDLER_HPP
diff --git a/include/server/request_parser.hpp b/include/server/request_parser.hpp
index 7b27ccf2d..558cdec10 100644
--- a/include/server/request_parser.hpp
+++ b/include/server/request_parser.hpp
@@ -67,6 +67,6 @@ class RequestParser
     http::header current_header;
     http::compression_type selected_compression;
 };
-} // namespace osrm
+} // namespace osrm::server
 
 #endif // REQUEST_PARSER_HPP
diff --git a/include/server/server.hpp b/include/server/server.hpp
index eb50d02f6..992092484 100644
--- a/include/server/server.hpp
+++ b/include/server/server.hpp
@@ -111,6 +111,6 @@ class Server
     boost::asio::ip::tcp::acceptor acceptor;
     std::shared_ptr<Connection> new_connection;
 };
-} // namespace osrm
+} // namespace osrm::server
 
 #endif // SERVER_HPP
diff --git a/include/server/service/base_service.hpp b/include/server/service/base_service.hpp
index 1324ef60d..4a5db6db1 100644
--- a/include/server/service/base_service.hpp
+++ b/include/server/service/base_service.hpp
@@ -27,6 +27,6 @@ class BaseService
   protected:
     OSRM &routing_machine;
 };
-} // namespace osrm
+} // namespace osrm::server::service
 
 #endif
diff --git a/include/server/service/match_service.hpp b/include/server/service/match_service.hpp
index 09ab65389..4294a1f41 100644
--- a/include/server/service/match_service.hpp
+++ b/include/server/service/match_service.hpp
@@ -24,6 +24,6 @@ class MatchService final : public BaseService
 
     unsigned GetVersion() final override { return 1; }
 };
-} // namespace osrm
+} // namespace osrm::server::service
 
 #endif
diff --git a/include/server/service/nearest_service.hpp b/include/server/service/nearest_service.hpp
index 40d0b56b9..c4895ecfb 100644
--- a/include/server/service/nearest_service.hpp
+++ b/include/server/service/nearest_service.hpp
@@ -24,6 +24,6 @@ class NearestService final : public BaseService
 
     unsigned GetVersion() final override { return 1; }
 };
-} // namespace osrm
+} // namespace osrm::server::service
 
 #endif
diff --git a/include/server/service/route_service.hpp b/include/server/service/route_service.hpp
index 642c4a827..19b52d380 100644
--- a/include/server/service/route_service.hpp
+++ b/include/server/service/route_service.hpp
@@ -24,6 +24,6 @@ class RouteService final : public BaseService
 
     unsigned GetVersion() final override { return 1; }
 };
-} // namespace osrm
+} // namespace osrm::server::service
 
 #endif
diff --git a/include/server/service/table_service.hpp b/include/server/service/table_service.hpp
index e23bbf547..f4ce955b2 100644
--- a/include/server/service/table_service.hpp
+++ b/include/server/service/table_service.hpp
@@ -24,6 +24,6 @@ class TableService final : public BaseService
 
     unsigned GetVersion() final override { return 1; }
 };
-} // namespace osrm
+} // namespace osrm::server::service
 
 #endif
diff --git a/include/server/service/tile_service.hpp b/include/server/service/tile_service.hpp
index a4d9e6fe2..5cc62e6ca 100644
--- a/include/server/service/tile_service.hpp
+++ b/include/server/service/tile_service.hpp
@@ -24,6 +24,6 @@ class TileService final : public BaseService
 
     unsigned GetVersion() final override { return 1; }
 };
-} // namespace osrm
+} // namespace osrm::server::service
 
 #endif
diff --git a/include/server/service/trip_service.hpp b/include/server/service/trip_service.hpp
index 605523376..3f820b747 100644
--- a/include/server/service/trip_service.hpp
+++ b/include/server/service/trip_service.hpp
@@ -24,6 +24,6 @@ class TripService final : public BaseService
 
     unsigned GetVersion() final override { return 1; }
 };
-} // namespace osrm
+} // namespace osrm::server::service
 
 #endif
diff --git a/include/server/service/utils.hpp b/include/server/service/utils.hpp
index 7d008d1a8..391211d69 100644
--- a/include/server/service/utils.hpp
+++ b/include/server/service/utils.hpp
@@ -20,4 +20,4 @@ bool constrainParamSize(const char *msg_template,
     }
     return false;
 }
-} // namespace osrm
+} // namespace osrm::server::service
diff --git a/include/server/service_handler.hpp b/include/server/service_handler.hpp
index fe3557f8d..bbbeb3c97 100644
--- a/include/server/service_handler.hpp
+++ b/include/server/service_handler.hpp
@@ -13,7 +13,7 @@ namespace osrm
 namespace util::json
 {
 struct Object;
-} // namespace util
+} // namespace util::json
 namespace server
 {
 namespace api
diff --git a/include/storage/block.hpp b/include/storage/block.hpp
index 4482b2453..bf4c4b44a 100644
--- a/include/storage/block.hpp
+++ b/include/storage/block.hpp
@@ -35,6 +35,6 @@ template <typename T> Block make_block(uint64_t num_entries)
     static_assert(sizeof(T) % alignof(T) == 0, "aligned T* can't be used as an array pointer");
     return Block{num_entries, sizeof(T) * num_entries, 0};
 }
-} // namespace osrm
+} // namespace osrm::storage
 
 #endif
diff --git a/include/storage/io.hpp b/include/storage/io.hpp
index 782deb186..a172c660f 100644
--- a/include/storage/io.hpp
+++ b/include/storage/io.hpp
@@ -384,6 +384,6 @@ class BufferWriter
   private:
     std::ostringstream output_stream;
 };
-} // namespace osrm
+} // namespace osrm::storage::io
 
 #endif
diff --git a/include/storage/io_config.hpp b/include/storage/io_config.hpp
index 58847c60a..5f4be92ed 100644
--- a/include/storage/io_config.hpp
+++ b/include/storage/io_config.hpp
@@ -79,6 +79,6 @@ struct IOConfig
     std::vector<boost::filesystem::path> optional_input_files;
     std::vector<boost::filesystem::path> output_files;
 };
-} // namespace osrm
+} // namespace osrm::storage
 
 #endif
diff --git a/include/storage/io_fwd.hpp b/include/storage/io_fwd.hpp
index 685864604..6fcc15b70 100644
--- a/include/storage/io_fwd.hpp
+++ b/include/storage/io_fwd.hpp
@@ -7,6 +7,6 @@ namespace osrm::storage::io
 class FileReader;
 class FileWriter;
 
-} // namespace osrm
+} // namespace osrm::storage::io
 
 #endif
diff --git a/include/storage/serialization.hpp b/include/storage/serialization.hpp
index 800dc2196..8fd831d7d 100644
--- a/include/storage/serialization.hpp
+++ b/include/storage/serialization.hpp
@@ -264,6 +264,6 @@ inline void write(io::BufferWriter &writer, const BaseDataLayout &layout)
 {
     write(writer, layout.blocks);
 }
-} // namespace osrm
+} // namespace osrm::storage::serialization
 
 #endif
diff --git a/include/storage/shared_data_index.hpp b/include/storage/shared_data_index.hpp
index 9cfb716d5..fb156f988 100644
--- a/include/storage/shared_data_index.hpp
+++ b/include/storage/shared_data_index.hpp
@@ -93,6 +93,6 @@ class SharedDataIndex
     std::vector<AllocatedRegion> regions;
     std::unordered_map<std::string, std::uint32_t> block_to_region;
 };
-} // namespace osrm
+} // namespace osrm::storage
 
 #endif
diff --git a/include/storage/shared_datatype.hpp b/include/storage/shared_datatype.hpp
index a6f719456..82d185cec 100644
--- a/include/storage/shared_datatype.hpp
+++ b/include/storage/shared_datatype.hpp
@@ -296,6 +296,6 @@ struct SharedRegionRegister
     std::array<SharedRegion, MAX_SHARED_REGIONS> regions;
     std::array<bool, MAX_SHM_KEYS> shm_key_in_use;
 };
-} // namespace osrm
+} // namespace osrm::storage
 
 #endif /* SHARED_DATA_TYPE_HPP */
diff --git a/include/storage/shared_memory.hpp b/include/storage/shared_memory.hpp
index cc4429046..d5a661bd4 100644
--- a/include/storage/shared_memory.hpp
+++ b/include/storage/shared_memory.hpp
@@ -309,6 +309,6 @@ std::unique_ptr<SharedMemory> makeSharedMemory(const IdentifierT &id, const uint
         throw util::exception(e.what() + SOURCE_REF);
     }
 }
-} // namespace osrm
+} // namespace osrm::storage
 
 #endif // SHARED_MEMORY_HPP
diff --git a/include/storage/shared_memory_ownership.hpp b/include/storage/shared_memory_ownership.hpp
index f6d9793a6..f03ee06ad 100644
--- a/include/storage/shared_memory_ownership.hpp
+++ b/include/storage/shared_memory_ownership.hpp
@@ -10,6 +10,6 @@ enum class Ownership
     View,
     External
 };
-} // namespace osrm
+} // namespace osrm::storage
 
 #endif // SHARED_MEMORY_OWNERSHIP_HPP
diff --git a/include/storage/shared_monitor.hpp b/include/storage/shared_monitor.hpp
index 25516097a..ad33864ec 100644
--- a/include/storage/shared_monitor.hpp
+++ b/include/storage/shared_monitor.hpp
@@ -232,7 +232,7 @@ template <typename Data> struct SharedMonitor
     bi::shared_memory_object shmem;
     bi::mapped_region region;
 };
-} // namespace osrm
+} // namespace osrm::storage
 
 #undef USE_BOOST_INTERPROCESS_CONDITION
 
diff --git a/include/storage/storage.hpp b/include/storage/storage.hpp
index c799e1429..b9c22e509 100644
--- a/include/storage/storage.hpp
+++ b/include/storage/storage.hpp
@@ -59,6 +59,6 @@ class Storage
   private:
     StorageConfig config;
 };
-} // namespace osrm
+} // namespace osrm::storage
 
 #endif
diff --git a/include/storage/storage_config.hpp b/include/storage/storage_config.hpp
index 65f21fdf3..012f7784a 100644
--- a/include/storage/storage_config.hpp
+++ b/include/storage/storage_config.hpp
@@ -73,6 +73,6 @@ struct StorageConfig final : IOConfig
     {
     }
 };
-} // namespace osrm
+} // namespace osrm::storage
 
 #endif
diff --git a/include/storage/tar.hpp b/include/storage/tar.hpp
index 18ef499b6..9da7bcca0 100644
--- a/include/storage/tar.hpp
+++ b/include/storage/tar.hpp
@@ -308,6 +308,6 @@ class FileWriter
     boost::filesystem::path path;
     mtar_t handle;
 };
-} // namespace osrm
+} // namespace osrm::storage::tar
 
 #endif
diff --git a/include/storage/tar_fwd.hpp b/include/storage/tar_fwd.hpp
index 9ca199d99..fc8c4637d 100644
--- a/include/storage/tar_fwd.hpp
+++ b/include/storage/tar_fwd.hpp
@@ -7,6 +7,6 @@ namespace osrm::storage::tar
 class FileReader;
 class FileWriter;
 
-} // namespace osrm
+} // namespace osrm::storage::tar
 
 #endif
diff --git a/include/storage/view_factory.hpp b/include/storage/view_factory.hpp
index 7b994bbec..8279f84c5 100644
--- a/include/storage/view_factory.hpp
+++ b/include/storage/view_factory.hpp
@@ -362,6 +362,6 @@ inline auto make_filtered_graph_view(const SharedDataIndex &index,
 
     return util::FilteredGraphView<contractor::QueryGraphView>({node_list, edge_list}, edge_filter);
 }
-} // namespace osrm
+} // namespace osrm::storage
 
 #endif
diff --git a/include/updater/csv_file_parser.hpp b/include/updater/csv_file_parser.hpp
index 819eba6e4..59b7a47b4 100644
--- a/include/updater/csv_file_parser.hpp
+++ b/include/updater/csv_file_parser.hpp
@@ -136,6 +136,6 @@ template <typename Key, typename Value> struct CSVFilesParser
     const KeyRule key_rule;
     const ValueRule value_rule;
 };
-} // namespace osrm
+} // namespace osrm::updater
 
 #endif
diff --git a/include/updater/csv_source.hpp b/include/updater/csv_source.hpp
index f105537fd..d4c1f71be 100644
--- a/include/updater/csv_source.hpp
+++ b/include/updater/csv_source.hpp
@@ -7,6 +7,6 @@ namespace osrm::updater::csv
 {
 SegmentLookupTable readSegmentValues(const std::vector<std::string> &paths);
 TurnLookupTable readTurnValues(const std::vector<std::string> &paths);
-} // namespace osrm
+} // namespace osrm::updater::csv
 
 #endif
diff --git a/include/updater/source.hpp b/include/updater/source.hpp
index 61e7d1eed..0b3dec11b 100644
--- a/include/updater/source.hpp
+++ b/include/updater/source.hpp
@@ -86,6 +86,6 @@ struct PenaltySource final
 
 using SegmentLookupTable = LookupTable<Segment, SpeedSource>;
 using TurnLookupTable = LookupTable<Turn, PenaltySource>;
-} // namespace osrm
+} // namespace osrm::updater
 
 #endif
diff --git a/include/updater/updater.hpp b/include/updater/updater.hpp
index 55a1ebfb7..b9e291c99 100644
--- a/include/updater/updater.hpp
+++ b/include/updater/updater.hpp
@@ -35,6 +35,6 @@ class Updater
   private:
     UpdaterConfig config;
 };
-} // namespace osrm
+} // namespace osrm::updater
 
 #endif
diff --git a/include/updater/updater_config.hpp b/include/updater/updater_config.hpp
index 65467a6aa..cc4d2ad4b 100644
--- a/include/updater/updater_config.hpp
+++ b/include/updater/updater_config.hpp
@@ -71,6 +71,6 @@ struct UpdaterConfig final : storage::IOConfig
     std::vector<std::string> turn_penalty_lookup_paths;
     std::string tz_file_path;
 };
-} // namespace osrm
+} // namespace osrm::updater
 
 #endif // EXTRACTOR_OPTIONS_HPP
diff --git a/include/util/bearing.hpp b/include/util/bearing.hpp
index f3a663aa6..cc2cdfda4 100644
--- a/include/util/bearing.hpp
+++ b/include/util/bearing.hpp
@@ -142,6 +142,6 @@ inline double restrictAngleToValidRange(const double angle)
         return angle;
 }
 
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // BEARING_HPP
diff --git a/include/util/bit_range.hpp b/include/util/bit_range.hpp
index 5385a2fbb..52a74ac95 100644
--- a/include/util/bit_range.hpp
+++ b/include/util/bit_range.hpp
@@ -90,6 +90,6 @@ template <typename T> auto makeBitRange(const T value)
 {
     return boost::make_iterator_range(BitIterator<T>{value}, BitIterator<T>{});
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/concurrent_id_map.hpp b/include/util/concurrent_id_map.hpp
index bd265255e..ac398725a 100644
--- a/include/util/concurrent_id_map.hpp
+++ b/include/util/concurrent_id_map.hpp
@@ -72,6 +72,6 @@ struct ConcurrentIDMap
     }
 };
 
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // CONCURRENT_ID_MAP_HPP
diff --git a/include/util/conditional_restrictions.hpp b/include/util/conditional_restrictions.hpp
index 1d1614471..8dc9e5101 100644
--- a/include/util/conditional_restrictions.hpp
+++ b/include/util/conditional_restrictions.hpp
@@ -19,6 +19,6 @@ struct ConditionalRestriction
 
 std::vector<ConditionalRestriction> ParseConditionalRestrictions(const std::string &str);
 
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // OSRM_CONDITIONAL_RESTRICTIONS_HPP
diff --git a/include/util/connectivity_checksum.hpp b/include/util/connectivity_checksum.hpp
index 38819aba1..67e4d434f 100644
--- a/include/util/connectivity_checksum.hpp
+++ b/include/util/connectivity_checksum.hpp
@@ -82,6 +82,6 @@ struct ConnectivityChecksum
     std::size_t byte_number;
     unsigned char bit_number;
 };
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/coordinate_calculation.hpp b/include/util/coordinate_calculation.hpp
index d51c87795..4ebbafa5c 100644
--- a/include/util/coordinate_calculation.hpp
+++ b/include/util/coordinate_calculation.hpp
@@ -373,6 +373,6 @@ bool areParallel(const iterator_type lhs_begin,
 
 double computeArea(const std::vector<Coordinate> &polygon);
 
-} // namespace osrm
+} // namespace osrm::util::coordinate_calculation
 
 #endif // COORDINATE_CALCULATION
diff --git a/include/util/deallocating_vector.hpp b/include/util/deallocating_vector.hpp
index 8700ff17d..f5f3d1c7d 100644
--- a/include/util/deallocating_vector.hpp
+++ b/include/util/deallocating_vector.hpp
@@ -346,6 +346,6 @@ template <typename T> void swap(DeallocatingVector<T> &lhs, DeallocatingVector<T
 {
     lhs.swap(rhs);
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif /* DEALLOCATING_VECTOR_HPP */
diff --git a/include/util/debug.hpp b/include/util/debug.hpp
index 9db80e025..792c3be42 100644
--- a/include/util/debug.hpp
+++ b/include/util/debug.hpp
@@ -60,7 +60,7 @@ inline std::ostream &operator<<(std::ostream &out, const RouteStep &step)
 
     return out;
 }
-} // namespace engine
+} // namespace engine::guidance
 
 namespace guidance
 {
diff --git a/include/util/dist_table_wrapper.hpp b/include/util/dist_table_wrapper.hpp
index 33a4fc59d..8b1734a29 100644
--- a/include/util/dist_table_wrapper.hpp
+++ b/include/util/dist_table_wrapper.hpp
@@ -75,6 +75,6 @@ template <typename T> class DistTableWrapper
     std::vector<T> table_;
     const std::size_t number_of_nodes_;
 };
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // DIST_TABLE_WRAPPER_H
diff --git a/include/util/dynamic_graph.hpp b/include/util/dynamic_graph.hpp
index e0bce6d7f..bbb67a45a 100644
--- a/include/util/dynamic_graph.hpp
+++ b/include/util/dynamic_graph.hpp
@@ -466,6 +466,6 @@ template <typename EdgeDataT> class DynamicGraph
     std::vector<Node> node_array;
     DeallocatingVector<Edge> edge_list;
 };
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // DYNAMICGRAPH_HPP
diff --git a/include/util/exception.hpp b/include/util/exception.hpp
index 89b1d776b..702602039 100644
--- a/include/util/exception.hpp
+++ b/include/util/exception.hpp
@@ -122,6 +122,6 @@ class RuntimeError : public exception
         return result;
     }
 };
-} // namespace osrm
+} // namespace osrm::util
 
 #endif /* OSRM_EXCEPTION_HPP */
diff --git a/include/util/exclude_flag.hpp b/include/util/exclude_flag.hpp
index 0692f0b66..9a61d169c 100644
--- a/include/util/exclude_flag.hpp
+++ b/include/util/exclude_flag.hpp
@@ -27,6 +27,6 @@ excludeFlagsToNodeFilter(const NodeID number_of_nodes,
     }
     return filters;
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/filtered_graph.hpp b/include/util/filtered_graph.hpp
index fe5b11feb..cfab67102 100644
--- a/include/util/filtered_graph.hpp
+++ b/include/util/filtered_graph.hpp
@@ -157,6 +157,6 @@ template <typename GraphT>
 using FilteredGraphContainer = detail::FilteredGraphImpl<GraphT, storage::Ownership::Container>;
 template <typename GraphT>
 using FilteredGraphView = detail::FilteredGraphImpl<GraphT, storage::Ownership::View>;
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/filtered_integer_range.hpp b/include/util/filtered_integer_range.hpp
index 2d39404c2..eb86573a3 100644
--- a/include/util/filtered_integer_range.hpp
+++ b/include/util/filtered_integer_range.hpp
@@ -92,6 +92,6 @@ filtered_range<Integer, Filter> filtered_irange(
 {
     return filtered_range<Integer, Filter>(first, last, filter);
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // INTEGER_RANGE_HPP
diff --git a/include/util/fingerprint.hpp b/include/util/fingerprint.hpp
index 9f9fcd89f..7e9d0c825 100644
--- a/include/util/fingerprint.hpp
+++ b/include/util/fingerprint.hpp
@@ -34,6 +34,6 @@ struct FingerPrint
 static_assert(sizeof(FingerPrint) == 8, "FingerPrint has unexpected size");
 static_assert(std::is_trivial<FingerPrint>::value, "FingerPrint needs to be trivial.");
 static_assert(std::is_pod<FingerPrint>::value, "FingerPrint needs to be a POD.");
-} // namespace osrm
+} // namespace osrm::util
 
 #endif /* FingerPrint_H */
diff --git a/include/util/for_each_indexed.hpp b/include/util/for_each_indexed.hpp
index cf467d0e9..2ca86bfdf 100644
--- a/include/util/for_each_indexed.hpp
+++ b/include/util/for_each_indexed.hpp
@@ -23,6 +23,6 @@ void for_each_indexed(ContainerT &container, Function function)
     for_each_indexed(std::begin(container), std::end(container), function);
 }
 
-} // namespace osrm
+} // namespace osrm::util
 
 #endif /* FOR_EACH_INDEXED_HPP */
diff --git a/include/util/for_each_pair.hpp b/include/util/for_each_pair.hpp
index 58f9425c2..b1fb5b1bb 100644
--- a/include/util/for_each_pair.hpp
+++ b/include/util/for_each_pair.hpp
@@ -37,6 +37,6 @@ void for_each_pair(ContainerT &container, Function &&function)
     for_each_pair(begin(container), end(container), std::forward<Function>(function));
 }
 
-} // namespace osrm
+} // namespace osrm::util
 
 #endif /* FOR_EACH_PAIR_HPP */
diff --git a/include/util/for_each_range.hpp b/include/util/for_each_range.hpp
index 7200f009f..37942c51e 100644
--- a/include/util/for_each_range.hpp
+++ b/include/util/for_each_range.hpp
@@ -18,6 +18,6 @@ template <typename Iter, typename Func> void for_each_range(Iter begin, Iter end
         f(begin_range, iter);
     }
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/geojson_debug_logger.hpp b/include/util/geojson_debug_logger.hpp
index d66b87271..9d35803fa 100644
--- a/include/util/geojson_debug_logger.hpp
+++ b/include/util/geojson_debug_logger.hpp
@@ -181,6 +181,6 @@ std::ofstream GeojsonLogger<geojson_conversion_policy, scenario>::ofs;
 template <class geojson_conversion_policy, LoggingScenario scenario>
 geojson_conversion_policy *GeojsonLogger<geojson_conversion_policy, scenario>::policy;
 
-} // namespace osrm
+} // namespace osrm::util
 
 #endif /* OSRM_GEOJSON_DEBUG_LOGGER_HPP */
diff --git a/include/util/geojson_debug_policies.hpp b/include/util/geojson_debug_policies.hpp
index cc7ed16de..3a209db0a 100644
--- a/include/util/geojson_debug_policies.hpp
+++ b/include/util/geojson_debug_policies.hpp
@@ -50,6 +50,6 @@ struct CoordinateVectorToMultiPoint
                                   const boost::optional<json::Object> &properties = {}) const;
 };
 
-} /* namespace osrm */
+} // namespace osrm::util
 
 #endif /* OSRM_GEOJSON_DEBUG_POLICIES */
diff --git a/include/util/geojson_debug_policy_toolkit.hpp b/include/util/geojson_debug_policy_toolkit.hpp
index 98d3cc04f..62c1019ef 100644
--- a/include/util/geojson_debug_policy_toolkit.hpp
+++ b/include/util/geojson_debug_policy_toolkit.hpp
@@ -107,6 +107,6 @@ inline util::json::Array makeJsonArray(const std::vector<util::Coordinate> &inpu
                    CoordinateToJsonArray());
     return coordinates;
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif /* OSRM_GEOJSON_DEBUG_POLICY_TOOLKIT_HPP */
diff --git a/include/util/geojson_validation.hpp b/include/util/geojson_validation.hpp
index a808d35a1..718775e20 100644
--- a/include/util/geojson_validation.hpp
+++ b/include/util/geojson_validation.hpp
@@ -83,5 +83,5 @@ inline void validateFeature(const rapidjson::Value &feature)
         }
     }
 }
-} // namespace osrm
+} // namespace osrm::util
 #endif // OSRM_GEOJSON_VALIDATION_HPP
diff --git a/include/util/graph_traits.hpp b/include/util/graph_traits.hpp
index 3df91dea2..26c9d285e 100644
--- a/include/util/graph_traits.hpp
+++ b/include/util/graph_traits.hpp
@@ -44,6 +44,6 @@ struct HasFirstEdgeMember<T, decltype((void)(sizeof(std::declval<T>().first_edge
 {
 };
 
-} // namespace osrm
+} // namespace osrm::util::traits
 
 #endif // STATIC_GRAPH_TRAITS_HPP
diff --git a/include/util/graph_utils.hpp b/include/util/graph_utils.hpp
index 847cc26a2..b9fc253f8 100644
--- a/include/util/graph_utils.hpp
+++ b/include/util/graph_utils.hpp
@@ -94,6 +94,6 @@ std::vector<OutputEdgeT> directedEdgesFromCompressed(const std::vector<InputEdge
 
     return output_edge_list;
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/group_by.hpp b/include/util/group_by.hpp
index 71729c75c..dfa4dc53d 100644
--- a/include/util/group_by.hpp
+++ b/include/util/group_by.hpp
@@ -32,6 +32,6 @@ Fn group_by(Iter first, Iter last, Pred pred, Fn fn)
     return fn;
 }
 
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/guidance/bearing_class.hpp b/include/util/guidance/bearing_class.hpp
index 51c1d3d6f..9274a305c 100644
--- a/include/util/guidance/bearing_class.hpp
+++ b/include/util/guidance/bearing_class.hpp
@@ -13,7 +13,7 @@
 namespace osrm::util::guidance
 {
 class BearingClass;
-} // namespace osrm
+} // namespace osrm::util::guidance
 
 namespace std
 {
@@ -54,7 +54,7 @@ class BearingClass
     friend std::size_t std::hash<BearingClass>::operator()(const BearingClass &) const;
 };
 
-} // namespace osrm
+} // namespace osrm::util::guidance
 
 // make Bearing Class hasbable
 namespace std
diff --git a/include/util/guidance/entry_class.hpp b/include/util/guidance/entry_class.hpp
index c6d4db2cc..884ae6cdb 100644
--- a/include/util/guidance/entry_class.hpp
+++ b/include/util/guidance/entry_class.hpp
@@ -11,7 +11,7 @@
 namespace osrm::util::guidance
 {
 class EntryClass;
-} // namespace osrm
+} // namespace osrm::util::guidance
 
 namespace std
 {
@@ -63,7 +63,7 @@ static_assert(std::is_trivially_copyable<EntryClass>::value,
               "requires trivially copyable type");
 #endif
 
-} // namespace util
+} // namespace util::guidance
 
 constexpr const util::guidance::EntryClass EMPTY_ENTRY_CLASS{};
 } // namespace osrm
diff --git a/include/util/guidance/name_announcements.hpp b/include/util/guidance/name_announcements.hpp
index 79a1a2b7f..a3b1094e2 100644
--- a/include/util/guidance/name_announcements.hpp
+++ b/include/util/guidance/name_announcements.hpp
@@ -236,6 +236,6 @@ inline bool requiresNameAnnounced(const NameID from_name_id,
                                      suffix_table);
 }
 
-} // namespace osrm
+} // namespace osrm::util::guidance
 
 #endif /* OSRM_UTIL_GUIDANCE_NAME_ANNOUNCEMENT_HPP_ */
diff --git a/include/util/guidance/turn_lanes.hpp b/include/util/guidance/turn_lanes.hpp
index c09035078..c19a5086c 100644
--- a/include/util/guidance/turn_lanes.hpp
+++ b/include/util/guidance/turn_lanes.hpp
@@ -16,7 +16,7 @@ namespace osrm::util::guidance
 {
 class LaneTuple;
 class LaneTupleIdPair;
-} // namespace osrm
+} // namespace osrm::util::guidance
 
 namespace std
 {
@@ -90,6 +90,6 @@ class LaneTupleIdPair
 
 using LaneDataIdMap = ConcurrentIDMap<LaneTupleIdPair, LaneDataID, boost::hash<LaneTupleIdPair>>;
 
-} // namespace osrm
+} // namespace osrm::util::guidance
 
 #endif /* OSRM_UTIL_GUIDANCE_TURN_LANES_HPP */
diff --git a/include/util/hilbert_value.hpp b/include/util/hilbert_value.hpp
index 46807b1af..256685cd0 100644
--- a/include/util/hilbert_value.hpp
+++ b/include/util/hilbert_value.hpp
@@ -67,6 +67,6 @@ inline std::uint64_t GetHilbertCode(const Coordinate &coordinate)
                             static_cast<std::int32_t>(90 * COORDINATE_PRECISION);
     return HilbertToLinear(x, y);
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif /* HILBERT_VALUE_HPP */
diff --git a/include/util/indexed_data.hpp b/include/util/indexed_data.hpp
index 92cdc5875..486c68334 100644
--- a/include/util/indexed_data.hpp
+++ b/include/util/indexed_data.hpp
@@ -387,5 +387,5 @@ template <typename GroupBlockPolicy>
 using IndexedData = detail::IndexedDataImpl<GroupBlockPolicy, storage::Ownership::Container>;
 template <typename GroupBlockPolicy>
 using IndexedDataView = detail::IndexedDataImpl<GroupBlockPolicy, storage::Ownership::View>;
-} // namespace osrm
+} // namespace osrm::util
 #endif // OSRM_INDEXED_DATA_HPP
diff --git a/include/util/integer_range.hpp b/include/util/integer_range.hpp
index 125e8d3e7..20089708a 100644
--- a/include/util/integer_range.hpp
+++ b/include/util/integer_range.hpp
@@ -87,6 +87,6 @@ irange(const Integer first,
 {
     return range<Integer>(first, last);
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // INTEGER_RANGE_HPP
diff --git a/include/util/isatty.hpp b/include/util/isatty.hpp
index 151482a0b..05fbd5aaf 100644
--- a/include/util/isatty.hpp
+++ b/include/util/isatty.hpp
@@ -24,6 +24,6 @@ namespace osrm::util
 //   output is redirected to a logfile
 inline bool IsStdoutATTY() { return isatty(fileno(stdout)); }
 
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/json_container.hpp b/include/util/json_container.hpp
index 3241f9078..27436b7f8 100644
--- a/include/util/json_container.hpp
+++ b/include/util/json_container.hpp
@@ -124,6 +124,6 @@ struct Array
     std::vector<Value> values;
 };
 
-} // namespace osrm
+} // namespace osrm::util::json
 
 #endif // JSON_CONTAINER_HPP
diff --git a/include/util/json_deep_compare.hpp b/include/util/json_deep_compare.hpp
index b78add60a..810dcdfad 100644
--- a/include/util/json_deep_compare.hpp
+++ b/include/util/json_deep_compare.hpp
@@ -154,6 +154,6 @@ inline bool compare(const Value &reference, const Value &result, std::string &re
     return mapbox::util::apply_visitor(
         Comparator(reason, "reference", "result"), reference, result);
 }
-} // namespace osrm
+} // namespace osrm::util::json
 
 #endif
diff --git a/include/util/json_renderer.hpp b/include/util/json_renderer.hpp
index 2b2b50f58..8665c0fb6 100644
--- a/include/util/json_renderer.hpp
+++ b/include/util/json_renderer.hpp
@@ -161,6 +161,6 @@ inline void render(std::vector<char> &out, const Object &object)
     renderer(object);
 }
 
-} // namespace osrm
+} // namespace osrm::util::json
 
 #endif // JSON_RENDERER_HPP
diff --git a/include/util/json_util.hpp b/include/util/json_util.hpp
index d4071c0e1..527ead6f4 100644
--- a/include/util/json_util.hpp
+++ b/include/util/json_util.hpp
@@ -22,6 +22,6 @@ template <typename T> T clamp_float(T d)
 
     return d;
 }
-} // namespace osrm
+} // namespace osrm::util::json
 
 #endif // JSON_UTIL_HPP
diff --git a/include/util/log.hpp b/include/util/log.hpp
index 1085da3ed..20f33f64d 100644
--- a/include/util/log.hpp
+++ b/include/util/log.hpp
@@ -102,6 +102,6 @@ class UnbufferedLog : public Log
   public:
     UnbufferedLog(LogLevel level_ = logINFO);
 };
-} // namespace osrm
+} // namespace osrm::util
 
 #endif /* LOG_HPP */
diff --git a/include/util/lua_util.hpp b/include/util/lua_util.hpp
index 1980aff59..36af5a1f3 100644
--- a/include/util/lua_util.hpp
+++ b/include/util/lua_util.hpp
@@ -26,6 +26,6 @@ inline void luaAddScriptFolderToLoadPath(lua_State *lua_state, const char *file_
     const std::string lua_code = "package.path = \"" + folder + "/?.lua;\" .. package.path";
     luaL_dostring(lua_state, lua_code.c_str());
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // LUA_UTIL_HPP
diff --git a/include/util/matrix_graph_wrapper.hpp b/include/util/matrix_graph_wrapper.hpp
index 44261a1e3..2ff068392 100644
--- a/include/util/matrix_graph_wrapper.hpp
+++ b/include/util/matrix_graph_wrapper.hpp
@@ -44,6 +44,6 @@ template <typename T> class MatrixGraphWrapper
     const std::vector<T> table_;
     const std::size_t number_of_nodes_;
 };
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // MATRIX_GRAPH_WRAPPER_H
diff --git a/include/util/meminfo.hpp b/include/util/meminfo.hpp
index 9f6d30a67..e20599751 100644
--- a/include/util/meminfo.hpp
+++ b/include/util/meminfo.hpp
@@ -26,6 +26,6 @@ inline void DumpMemoryStats()
     util::Log() << "RAM: peak bytes used: <not implemented on Windows>";
 #endif // _WIN32
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/mmap_file.hpp b/include/util/mmap_file.hpp
index 11ea3d378..cdee22763 100644
--- a/include/util/mmap_file.hpp
+++ b/include/util/mmap_file.hpp
@@ -81,6 +81,6 @@ util::vector_view<T> mmapFile(const boost::filesystem::path &file,
 {
     return detail::mmapFile<T>(file, mmap_container, size);
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/mmap_tar.hpp b/include/util/mmap_tar.hpp
index 49a76762c..2fa7679ea 100644
--- a/include/util/mmap_tar.hpp
+++ b/include/util/mmap_tar.hpp
@@ -36,6 +36,6 @@ inline DataMap mmapTarFile(const boost::filesystem::path &path,
 
     return map;
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/msb.hpp b/include/util/msb.hpp
index 27d194724..8b09399f4 100644
--- a/include/util/msb.hpp
+++ b/include/util/msb.hpp
@@ -45,6 +45,6 @@ inline std::size_t msb(unsigned int v)
     return MSB_INDEX - __builtin_clz(v);
 }
 #endif
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/node_based_graph.hpp b/include/util/node_based_graph.hpp
index 4a66c501d..6f2760928 100644
--- a/include/util/node_based_graph.hpp
+++ b/include/util/node_based_graph.hpp
@@ -95,6 +95,6 @@ NodeBasedDynamicGraphFromEdges(NodeID number_of_nodes,
 
     return NodeBasedDynamicGraph(number_of_nodes, edges_list);
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // NODE_BASED_GRAPH_HPP
diff --git a/include/util/opening_hours.hpp b/include/util/opening_hours.hpp
index a3b7a0465..07b18836a 100644
--- a/include/util/opening_hours.hpp
+++ b/include/util/opening_hours.hpp
@@ -221,6 +221,6 @@ std::vector<OpeningHours> ParseOpeningHours(const std::string &str);
 
 bool CheckOpeningHours(const std::vector<OpeningHours> &input, const struct tm &time);
 
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // OSRM_OPENING_HOURS_HPP
diff --git a/include/util/packed_vector.hpp b/include/util/packed_vector.hpp
index 4e186482e..243f423e5 100644
--- a/include/util/packed_vector.hpp
+++ b/include/util/packed_vector.hpp
@@ -599,6 +599,6 @@ template <typename T, std::size_t Bits>
 using PackedVector = detail::PackedVector<T, Bits, storage::Ownership::Container>;
 template <typename T, std::size_t Bits>
 using PackedVectorView = detail::PackedVector<T, Bits, storage::Ownership::View>;
-} // namespace osrm
+} // namespace osrm::util
 
 #endif /* PACKED_VECTOR_HPP */
diff --git a/include/util/percent.hpp b/include/util/percent.hpp
index 13f9f3549..0285f40df 100644
--- a/include/util/percent.hpp
+++ b/include/util/percent.hpp
@@ -85,6 +85,6 @@ class Percent
         }
     }
 };
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // PERCENT_HPP
diff --git a/include/util/permutation.hpp b/include/util/permutation.hpp
index 4bc6134bf..ae046b014 100644
--- a/include/util/permutation.hpp
+++ b/include/util/permutation.hpp
@@ -65,6 +65,6 @@ std::vector<IndexT> orderingToPermutation(const std::vector<IndexT> &ordering)
 
     return permutation;
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/query_heap.hpp b/include/util/query_heap.hpp
index 8027bb150..463323efe 100644
--- a/include/util/query_heap.hpp
+++ b/include/util/query_heap.hpp
@@ -370,6 +370,6 @@ class QueryHeap
     HeapContainer heap;
     IndexStorage node_index;
 };
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // OSRM_UTIL_QUERY_HEAP_HPP
diff --git a/include/util/range_table.hpp b/include/util/range_table.hpp
index 3411875c1..7bb6497c8 100644
--- a/include/util/range_table.hpp
+++ b/include/util/range_table.hpp
@@ -213,6 +213,6 @@ unsigned RangeTable<BLOCK_SIZE, Ownership>::PrefixSumAtIndex(int index, const Bl
 
     return sum;
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // RANGE_TABLE_HPP
diff --git a/include/util/rectangle.hpp b/include/util/rectangle.hpp
index 59d03ed3f..65050f200 100644
--- a/include/util/rectangle.hpp
+++ b/include/util/rectangle.hpp
@@ -169,6 +169,6 @@ struct RectangleInt2D
                max_lat != FixedLatitude{std::numeric_limits<std::int32_t>::min()};
     }
 };
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/serialization.hpp b/include/util/serialization.hpp
index 290023063..30a1f0db6 100644
--- a/include/util/serialization.hpp
+++ b/include/util/serialization.hpp
@@ -139,6 +139,6 @@ void write(storage::tar::FileWriter &writer,
     storage::serialization::write(
         writer, name + "/search_tree_level_starts", rtree.m_tree_level_starts);
 }
-} // namespace osrm
+} // namespace osrm::util::serialization
 
 #endif
diff --git a/include/util/static_assert.hpp b/include/util/static_assert.hpp
index 1b2d5e2b3..234b26391 100644
--- a/include/util/static_assert.hpp
+++ b/include/util/static_assert.hpp
@@ -18,6 +18,6 @@ template <typename It, typename Category> inline void static_assert_iter_categor
     static_assert(std::is_base_of<Category, IterCategoryType>::value, "");
 }
 
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // OSRM_STATIC_ASSERT_HPP
diff --git a/include/util/static_graph.hpp b/include/util/static_graph.hpp
index 67004beb9..be713a1cd 100644
--- a/include/util/static_graph.hpp
+++ b/include/util/static_graph.hpp
@@ -318,6 +318,6 @@ class StaticGraph
     Vector<EdgeArrayEntry> edge_array;
 };
 
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // STATIC_GRAPH_HPP
diff --git a/include/util/static_rtree.hpp b/include/util/static_rtree.hpp
index 7d94f32ed..291c35f4d 100644
--- a/include/util/static_rtree.hpp
+++ b/include/util/static_rtree.hpp
@@ -772,6 +772,6 @@ class StaticRTree
 //[2] "Nearest Neighbor Queries", N. Roussopulos et al; 1995; DOI: 10.1145/223784.223794
 //[3] "Distance Browsing in Spatial Databases"; G. Hjaltason, H. Samet; 1999; ACM Trans. DB Sys
 // Vol.24 No.2, pp.265-318
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // STATIC_RTREE_HPP
diff --git a/include/util/string_util.hpp b/include/util/string_util.hpp
index a6bac54be..6133b2618 100644
--- a/include/util/string_util.hpp
+++ b/include/util/string_util.hpp
@@ -141,6 +141,6 @@ inline std::size_t URIDecode(const std::string &input, std::string &output)
 }
 
 inline std::size_t URIDecodeInPlace(std::string &URI) { return URIDecode(URI, URI); }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // STRING_UTIL_HPP
diff --git a/include/util/timed_histogram.hpp b/include/util/timed_histogram.hpp
index 176e4ba09..cd2b82235 100644
--- a/include/util/timed_histogram.hpp
+++ b/include/util/timed_histogram.hpp
@@ -86,6 +86,6 @@ template <std::size_t TimeBinSize = 1000, std::size_t IndexBinSize = 1000> class
     std::vector<std::uint32_t> frame_offsets;
     std::vector<std::uint32_t> frame_counters;
 };
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/timezones.hpp b/include/util/timezones.hpp
index 6c3a64e43..ff6b0bc98 100644
--- a/include/util/timezones.hpp
+++ b/include/util/timezones.hpp
@@ -42,6 +42,6 @@ class Timezoner
     rtree_t rtree;
     std::vector<local_time_t> local_times;
 };
-} // namespace osrm
+} // namespace osrm::updater
 
 #endif
diff --git a/include/util/timing_util.hpp b/include/util/timing_util.hpp
index 405c7358a..fe074d708 100644
--- a/include/util/timing_util.hpp
+++ b/include/util/timing_util.hpp
@@ -21,6 +21,6 @@ namespace osrm::util
      std::chrono::duration_cast<std::chrono::microseconds>(_X##_stop - _X##_start).count())
 #define TIMER_MIN(_X)                                                                              \
     std::chrono::duration_cast<std::chrono::minutes>(_X##_stop - _X##_start).count()
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // TIMING_UTIL_HPP
diff --git a/include/util/to_osm_link.hpp b/include/util/to_osm_link.hpp
index 7768372b1..f26605681 100644
--- a/include/util/to_osm_link.hpp
+++ b/include/util/to_osm_link.hpp
@@ -23,6 +23,6 @@ inline std::string toOSMLink(const util::Coordinate &c)
          << toFloating(c.lat) << "&mlon=" << toFloating(c.lon);
     return link.str();
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif
diff --git a/include/util/trigonometry_table.hpp b/include/util/trigonometry_table.hpp
index ff34b2200..eedfe59a5 100644
--- a/include/util/trigonometry_table.hpp
+++ b/include/util/trigonometry_table.hpp
@@ -429,6 +429,6 @@ inline double atan2_lookup(double y, double x)
     }
     return angle;
 }
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // TRIGONOMETRY_TABLE_HPP
diff --git a/include/util/vector_tile.hpp b/include/util/vector_tile.hpp
index d2047cd62..749d85505 100644
--- a/include/util/vector_tile.hpp
+++ b/include/util/vector_tile.hpp
@@ -8,5 +8,5 @@ namespace osrm::util::vector_tile
 // Vector tiles are 4096 virtual pixels on each side
 const constexpr double EXTENT = 4096.0;
 const constexpr double BUFFER = 128.0;
-} // namespace osrm
+} // namespace osrm::util::vector_tile
 #endif
diff --git a/include/util/vector_view.hpp b/include/util/vector_view.hpp
index 323b110eb..e2d7d038d 100644
--- a/include/util/vector_view.hpp
+++ b/include/util/vector_view.hpp
@@ -265,6 +265,6 @@ struct is_view_or_vector
                                  std::is_same<util::vector_view<ValueT>, VectorT>::value>
 {
 };
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // SHARED_MEMORY_VECTOR_WRAPPER_HPP
diff --git a/include/util/viewport.hpp b/include/util/viewport.hpp
index 7188e8a55..80598b870 100644
--- a/include/util/viewport.hpp
+++ b/include/util/viewport.hpp
@@ -40,6 +40,6 @@ inline unsigned getFittedZoom(util::Coordinate south_west, util::Coordinate nort
     else
         return detail::MIN_ZOOM;
 }
-} // namespace osrm
+} // namespace osrm::util::viewport
 
 #endif
diff --git a/include/util/web_mercator.hpp b/include/util/web_mercator.hpp
index 2a0f3c1d6..0d428486b 100644
--- a/include/util/web_mercator.hpp
+++ b/include/util/web_mercator.hpp
@@ -165,6 +165,6 @@ inline void xyzToMercator(
     maxx = static_cast<double>(clamp(util::FloatLongitude{maxx})) * DEGREE_TO_PX;
     maxy = latToY(util::FloatLatitude{maxy}) * DEGREE_TO_PX;
 }
-} // namespace osrm
+} // namespace osrm::util::web_mercator
 
 #endif
diff --git a/include/util/xor_fast_hash.hpp b/include/util/xor_fast_hash.hpp
index 089205459..c90d2e7d6 100644
--- a/include/util/xor_fast_hash.hpp
+++ b/include/util/xor_fast_hash.hpp
@@ -63,6 +63,6 @@ template <std::size_t MaxNumElements = (1u << 16u)> class XORFastHash
         return table1[lsb] ^ table2[msb];
     }
 };
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // XOR_FAST_HASH_HPP
diff --git a/include/util/xor_fast_hash_storage.hpp b/include/util/xor_fast_hash_storage.hpp
index 94f501aec..deb429705 100644
--- a/include/util/xor_fast_hash_storage.hpp
+++ b/include/util/xor_fast_hash_storage.hpp
@@ -76,6 +76,6 @@ class XORFastHashStorage
     XORFastHash<MaxNumElements> fast_hasher;
     unsigned current_timestamp;
 };
-} // namespace osrm
+} // namespace osrm::util
 
 #endif // XOR_FAST_HASH_STORAGE_HPP
diff --git a/src/benchmarks/static_rtree.cpp b/src/benchmarks/static_rtree.cpp
index 48eb5e5e0..fae84bb0f 100644
--- a/src/benchmarks/static_rtree.cpp
+++ b/src/benchmarks/static_rtree.cpp
@@ -72,7 +72,7 @@ void benchmark(BenchStaticRTree &rtree, unsigned num_queries)
         return rtree.Nearest(q, 10);
     });
 }
-} // namespace osrm
+} // namespace osrm::benchmarks
 
 int main(int argc, char **argv)
 {
diff --git a/src/contractor/contractor.cpp b/src/contractor/contractor.cpp
index 2db7c9470..87ab042cb 100644
--- a/src/contractor/contractor.cpp
+++ b/src/contractor/contractor.cpp
@@ -123,4 +123,4 @@ int Contractor::Run()
     return 0;
 }
 
-} // namespace osrm
+} // namespace osrm::contractor
diff --git a/src/contractor/contractor_search.cpp b/src/contractor/contractor_search.cpp
index 29fdf0eff..6fa860f46 100644
--- a/src/contractor/contractor_search.cpp
+++ b/src/contractor/contractor_search.cpp
@@ -83,4 +83,4 @@ void search(ContractorHeap &heap,
         relaxNode(heap, graph, node, node_weight, forbidden_node);
     }
 }
-} // namespace osrm
+} // namespace osrm::contractor
diff --git a/src/contractor/graph_contractor.cpp b/src/contractor/graph_contractor.cpp
index 063fe2872..0e02101fe 100644
--- a/src/contractor/graph_contractor.cpp
+++ b/src/contractor/graph_contractor.cpp
@@ -766,4 +766,4 @@ std::vector<bool> contractGraph(ContractorGraph &graph,
     return std::move(node_data.is_core);
 }
 
-} // namespace osrm
+} // namespace osrm::contractor
diff --git a/src/customize/customizer.cpp b/src/customize/customizer.cpp
index 53d2fd627..e9a3b08e5 100644
--- a/src/customize/customizer.cpp
+++ b/src/customize/customizer.cpp
@@ -181,4 +181,4 @@ int Customizer::Run(const CustomizationConfig &config)
     return 0;
 }
 
-} // namespace osrm
+} // namespace osrm::customizer
diff --git a/src/engine/api/json_factory.cpp b/src/engine/api/json_factory.cpp
index 7c3010d81..960bd13e3 100644
--- a/src/engine/api/json_factory.cpp
+++ b/src/engine/api/json_factory.cpp
@@ -288,4 +288,4 @@ util::json::Array makeRouteLegs(std::vector<guidance::RouteLeg> legs,
     }
     return json_legs;
 }
-} // namespace osrm
+} // namespace osrm::engine::api::json
diff --git a/src/engine/datafacade/mmap_memory_allocator.cpp b/src/engine/datafacade/mmap_memory_allocator.cpp
index aa0e2c6cb..e16331fa0 100644
--- a/src/engine/datafacade/mmap_memory_allocator.cpp
+++ b/src/engine/datafacade/mmap_memory_allocator.cpp
@@ -63,4 +63,4 @@ MMapMemoryAllocator::~MMapMemoryAllocator() {}
 
 const storage::SharedDataIndex &MMapMemoryAllocator::GetIndex() { return index; }
 
-} // namespace osrm
+} // namespace osrm::engine::datafacade
diff --git a/src/engine/datafacade/process_memory_allocator.cpp b/src/engine/datafacade/process_memory_allocator.cpp
index 0957bdf2b..54a26b970 100644
--- a/src/engine/datafacade/process_memory_allocator.cpp
+++ b/src/engine/datafacade/process_memory_allocator.cpp
@@ -34,4 +34,4 @@ ProcessMemoryAllocator::~ProcessMemoryAllocator() {}
 
 const storage::SharedDataIndex &ProcessMemoryAllocator::GetIndex() { return index; }
 
-} // namespace osrm
+} // namespace osrm::engine::datafacade
diff --git a/src/engine/datafacade/shared_memory_allocator.cpp b/src/engine/datafacade/shared_memory_allocator.cpp
index 3a99eef12..97c98b80d 100644
--- a/src/engine/datafacade/shared_memory_allocator.cpp
+++ b/src/engine/datafacade/shared_memory_allocator.cpp
@@ -37,4 +37,4 @@ SharedMemoryAllocator::~SharedMemoryAllocator() {}
 
 const storage::SharedDataIndex &SharedMemoryAllocator::GetIndex() { return index; }
 
-} // namespace osrm
+} // namespace osrm::engine::datafacade
diff --git a/src/engine/douglas_peucker.cpp b/src/engine/douglas_peucker.cpp
index c40f37fe9..75a6f121b 100644
--- a/src/engine/douglas_peucker.cpp
+++ b/src/engine/douglas_peucker.cpp
@@ -117,4 +117,4 @@ std::vector<util::Coordinate> douglasPeucker(std::vector<util::Coordinate>::cons
 
     return simplified_geometry;
 }
-} // namespace osrm
+} // namespace osrm::engine
diff --git a/src/engine/engine_config.cpp b/src/engine/engine_config.cpp
index 117fe2d25..23a5c5b5b 100644
--- a/src/engine/engine_config.cpp
+++ b/src/engine/engine_config.cpp
@@ -25,4 +25,4 @@ bool EngineConfig::IsValid() const
             storage_config.IsValid()) &&
            limits_valid;
 }
-} // namespace osrm
+} // namespace osrm::engine
diff --git a/src/engine/guidance/assemble_overview.cpp b/src/engine/guidance/assemble_overview.cpp
index 475a9c452..0f02c15cf 100644
--- a/src/engine/guidance/assemble_overview.cpp
+++ b/src/engine/guidance/assemble_overview.cpp
@@ -86,4 +86,4 @@ std::vector<util::Coordinate> assembleOverview(const std::vector<LegGeometry> &l
     return overview_geometry;
 }
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
diff --git a/src/engine/guidance/assemble_route.cpp b/src/engine/guidance/assemble_route.cpp
index 8db84504e..a5f7abef1 100644
--- a/src/engine/guidance/assemble_route.cpp
+++ b/src/engine/guidance/assemble_route.cpp
@@ -23,4 +23,4 @@ Route assembleRoute(const std::vector<RouteLeg> &route_legs)
     return Route{distance, duration, weight};
 }
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
diff --git a/src/engine/guidance/assemble_steps.cpp b/src/engine/guidance/assemble_steps.cpp
index e9d37259b..461500336 100644
--- a/src/engine/guidance/assemble_steps.cpp
+++ b/src/engine/guidance/assemble_steps.cpp
@@ -44,4 +44,4 @@ std::pair<short, short> getArriveBearings(const LegGeometry &leg_geometry,
     return std::make_pair<short, short>(
         std::round(util::coordinate_calculation::bearing(pre_turn_coordinate, turn_coordinate)), 0);
 }
-} // namespace osrm
+} // namespace osrm::engine::guidance::detail
diff --git a/src/engine/guidance/collapse_scenario_detection.cpp b/src/engine/guidance/collapse_scenario_detection.cpp
index e23c89f01..6b8517466 100644
--- a/src/engine/guidance/collapse_scenario_detection.cpp
+++ b/src/engine/guidance/collapse_scenario_detection.cpp
@@ -415,4 +415,4 @@ bool straightTurnFollowedByChoiceless(const RouteStepIterator step_entering_inte
            noIntermediaryIntersections(*step_entering_intersection);
 }
 
-} /* namespace osrm */
+} // namespace osrm::engine::guidance
diff --git a/src/engine/guidance/collapse_turns.cpp b/src/engine/guidance/collapse_turns.cpp
index 160797496..e15047fb2 100644
--- a/src/engine/guidance/collapse_turns.cpp
+++ b/src/engine/guidance/collapse_turns.cpp
@@ -663,4 +663,4 @@ RouteSteps collapseSegregatedTurnInstructions(RouteSteps steps)
     return steps;
 }
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
diff --git a/src/engine/guidance/lane_processing.cpp b/src/engine/guidance/lane_processing.cpp
index 3e253c450..105b3d53a 100644
--- a/src/engine/guidance/lane_processing.cpp
+++ b/src/engine/guidance/lane_processing.cpp
@@ -205,4 +205,4 @@ std::vector<RouteStep> anticipateLaneChange(std::vector<RouteStep> steps,
     return steps;
 }
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
diff --git a/src/engine/guidance/post_processing.cpp b/src/engine/guidance/post_processing.cpp
index b81936bd3..0e29b2e0c 100644
--- a/src/engine/guidance/post_processing.cpp
+++ b/src/engine/guidance/post_processing.cpp
@@ -714,4 +714,4 @@ void applyOverrides(const datafacade::BaseDataFacade &facade,
     }
 }
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
diff --git a/src/engine/guidance/verbosity_reduction.cpp b/src/engine/guidance/verbosity_reduction.cpp
index ad1da8f70..a138524eb 100644
--- a/src/engine/guidance/verbosity_reduction.cpp
+++ b/src/engine/guidance/verbosity_reduction.cpp
@@ -81,4 +81,4 @@ std::vector<RouteStep> suppressShortNameSegments(std::vector<RouteStep> steps)
     return removeNoTurnInstructions(std::move(steps));
 }
 
-} // namespace osrm
+} // namespace osrm::engine::guidance
diff --git a/src/engine/hint.cpp b/src/engine/hint.cpp
index 9f0cb70b1..16677a765 100644
--- a/src/engine/hint.cpp
+++ b/src/engine/hint.cpp
@@ -122,4 +122,4 @@ bool Hint::IsValid(const util::Coordinate new_input_coordinates,
     return true;
 }
 
-} // namespace osrm
+} // namespace osrm::engine
diff --git a/src/engine/plugins/match.cpp b/src/engine/plugins/match.cpp
index 79b8dcc88..8fe0d78e0 100644
--- a/src/engine/plugins/match.cpp
+++ b/src/engine/plugins/match.cpp
@@ -310,4 +310,4 @@ Status MatchPlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
 
     return Status::Ok;
 }
-} // namespace osrm
+} // namespace osrm::engine::plugins
diff --git a/src/engine/plugins/nearest.cpp b/src/engine/plugins/nearest.cpp
index 6f910e153..bd6dd8e54 100644
--- a/src/engine/plugins/nearest.cpp
+++ b/src/engine/plugins/nearest.cpp
@@ -53,4 +53,4 @@ Status NearestPlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms
 
     return Status::Ok;
 }
-} // namespace osrm
+} // namespace osrm::engine::plugins
diff --git a/src/engine/plugins/table.cpp b/src/engine/plugins/table.cpp
index d25bbf888..150cefb34 100644
--- a/src/engine/plugins/table.cpp
+++ b/src/engine/plugins/table.cpp
@@ -153,4 +153,4 @@ Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
 
     return Status::Ok;
 }
-} // namespace osrm
+} // namespace osrm::engine::plugins
diff --git a/src/engine/plugins/tile.cpp b/src/engine/plugins/tile.cpp
index 59b6ec7d8..3ed573798 100644
--- a/src/engine/plugins/tile.cpp
+++ b/src/engine/plugins/tile.cpp
@@ -691,4 +691,4 @@ Status TilePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
 
     return Status::Ok;
 }
-} // namespace osrm
+} // namespace osrm::engine::plugins
diff --git a/src/engine/plugins/trip.cpp b/src/engine/plugins/trip.cpp
index 793fb67ba..64b1be8bf 100644
--- a/src/engine/plugins/trip.cpp
+++ b/src/engine/plugins/trip.cpp
@@ -293,4 +293,4 @@ Status TripPlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
 
     return Status::Ok;
 }
-} // namespace osrm
+} // namespace osrm::engine::plugins
diff --git a/src/engine/plugins/viaroute.cpp b/src/engine/plugins/viaroute.cpp
index 5ec5edeaf..aa533d96a 100644
--- a/src/engine/plugins/viaroute.cpp
+++ b/src/engine/plugins/viaroute.cpp
@@ -182,4 +182,4 @@ Status ViaRoutePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithm
 
     return Status::Ok;
 }
-} // namespace osrm
+} // namespace osrm::engine::plugins
diff --git a/src/engine/polyline_compressor.cpp b/src/engine/polyline_compressor.cpp
index a46e19eef..3d4500643 100644
--- a/src/engine/polyline_compressor.cpp
+++ b/src/engine/polyline_compressor.cpp
@@ -71,4 +71,4 @@ std::int32_t decode_polyline_integer(std::string::const_iterator &first,
     result = ((result & 1) == 1) ? ~(result >> 1) : (result >> 1);
     return static_cast<std::int32_t>(result);
 }
-} // namespace osrm
+} // namespace osrm::engine::detail
diff --git a/src/engine/routing_algorithms/alternative_path_ch.cpp b/src/engine/routing_algorithms/alternative_path_ch.cpp
index 2337d00fc..10ccfe28c 100644
--- a/src/engine/routing_algorithms/alternative_path_ch.cpp
+++ b/src/engine/routing_algorithms/alternative_path_ch.cpp
@@ -850,4 +850,4 @@ InternalManyRoutesResult alternativePathSearch(SearchEngineData<Algorithm> &engi
     return InternalManyRoutesResult{{std::move(primary_route), std::move(secondary_route)}};
 }
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
diff --git a/src/engine/routing_algorithms/alternative_path_mld.cpp b/src/engine/routing_algorithms/alternative_path_mld.cpp
index 350238061..cffd325a2 100644
--- a/src/engine/routing_algorithms/alternative_path_mld.cpp
+++ b/src/engine/routing_algorithms/alternative_path_mld.cpp
@@ -956,4 +956,4 @@ InternalManyRoutesResult alternativePathSearch(SearchEngineData<Algorithm> &sear
     return InternalManyRoutesResult{std::move(routes)};
 }
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
diff --git a/src/engine/routing_algorithms/direct_shortest_path.cpp b/src/engine/routing_algorithms/direct_shortest_path.cpp
index 3bcb2e840..598bd4449 100644
--- a/src/engine/routing_algorithms/direct_shortest_path.cpp
+++ b/src/engine/routing_algorithms/direct_shortest_path.cpp
@@ -87,4 +87,4 @@ InternalRouteResult directShortestPathSearch(SearchEngineData<mld::Algorithm> &e
     return extractRoute(facade, weight, endpoint_candidates, unpacked_nodes, unpacked_edges);
 }
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
diff --git a/src/engine/routing_algorithms/many_to_many_ch.cpp b/src/engine/routing_algorithms/many_to_many_ch.cpp
index 616f8da2d..d021a52e7 100644
--- a/src/engine/routing_algorithms/many_to_many_ch.cpp
+++ b/src/engine/routing_algorithms/many_to_many_ch.cpp
@@ -247,4 +247,4 @@ manyToManySearch(SearchEngineData<ch::Algorithm> &engine_working_data,
     return std::make_pair(std::move(durations_table), std::move(distances_table));
 }
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
diff --git a/src/engine/routing_algorithms/many_to_many_mld.cpp b/src/engine/routing_algorithms/many_to_many_mld.cpp
index 4ebdc97fe..500b7d2f4 100644
--- a/src/engine/routing_algorithms/many_to_many_mld.cpp
+++ b/src/engine/routing_algorithms/many_to_many_mld.cpp
@@ -672,4 +672,4 @@ manyToManySearch(SearchEngineData<mld::Algorithm> &engine_working_data,
                                                     calculate_distance);
 }
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
diff --git a/src/engine/routing_algorithms/map_matching.cpp b/src/engine/routing_algorithms/map_matching.cpp
index e9c1534a3..32d71b9ad 100644
--- a/src/engine/routing_algorithms/map_matching.cpp
+++ b/src/engine/routing_algorithms/map_matching.cpp
@@ -453,7 +453,7 @@ mapMatching(SearchEngineData<mld::Algorithm> &engine_working_data,
             const std::vector<boost::optional<double>> &trace_gps_precision,
             const bool allow_splitting);
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
 
 //[1] "Hidden Markov Map Matching Through Noise and Sparseness"; P. Newson and J. Krumm; 2009; ACM
 // GIS
diff --git a/src/engine/routing_algorithms/routing_base.cpp b/src/engine/routing_algorithms/routing_base.cpp
index 6f22b097c..6d5eec88f 100644
--- a/src/engine/routing_algorithms/routing_base.cpp
+++ b/src/engine/routing_algorithms/routing_base.cpp
@@ -103,4 +103,4 @@ PhantomEndpoints endpointsFromCandidates(const PhantomEndpointCandidates &candid
     return PhantomEndpoints{*source_it, *target_it};
 }
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
diff --git a/src/engine/routing_algorithms/routing_base_ch.cpp b/src/engine/routing_algorithms/routing_base_ch.cpp
index a97e76275..a882dab20 100644
--- a/src/engine/routing_algorithms/routing_base_ch.cpp
+++ b/src/engine/routing_algorithms/routing_base_ch.cpp
@@ -202,4 +202,4 @@ double getNetworkDistance(SearchEngineData<Algorithm> &engine_working_data,
 
     return getPathDistance(facade, unpacked_path, source_phantom, target_phantom);
 }
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms::ch
diff --git a/src/engine/routing_algorithms/shortest_path.cpp b/src/engine/routing_algorithms/shortest_path.cpp
index e4bd78e72..fc3481066 100644
--- a/src/engine/routing_algorithms/shortest_path.cpp
+++ b/src/engine/routing_algorithms/shortest_path.cpp
@@ -17,4 +17,4 @@ shortestPathSearch(SearchEngineData<mld::Algorithm> &engine_working_data,
                    const std::vector<PhantomNodeCandidates> &waypoint_candidates,
                    const boost::optional<bool> continue_straight_at_waypoint);
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
diff --git a/src/engine/routing_algorithms/tile_turns.cpp b/src/engine/routing_algorithms/tile_turns.cpp
index 917387bfb..8171f7e7b 100644
--- a/src/engine/routing_algorithms/tile_turns.cpp
+++ b/src/engine/routing_algorithms/tile_turns.cpp
@@ -265,4 +265,4 @@ std::vector<TurnData> getTileTurns(const DataFacade<mld::Algorithm> &facade,
     return generateTurns(facade, edges, sorted_edge_indexes, edge_finder);
 }
 
-} // namespace osrm
+} // namespace osrm::engine::routing_algorithms
diff --git a/src/engine/search_engine_data.cpp b/src/engine/search_engine_data.cpp
index 38d9a33f2..a4a2bc5dd 100644
--- a/src/engine/search_engine_data.cpp
+++ b/src/engine/search_engine_data.cpp
@@ -128,4 +128,4 @@ void SearchEngineData<MLD>::InitializeOrClearManyToManyThreadLocalStorage(
         many_to_many_heap.reset(new ManyToManyQueryHeap(number_of_nodes, number_of_boundary_nodes));
     }
 }
-} // namespace osrm
+} // namespace osrm::engine
diff --git a/src/extractor/compressed_edge_container.cpp b/src/extractor/compressed_edge_container.cpp
index caf0b5867..8504c8d02 100644
--- a/src/extractor/compressed_edge_container.cpp
+++ b/src/extractor/compressed_edge_container.cpp
@@ -397,4 +397,4 @@ std::unique_ptr<SegmentDataContainer> CompressedEdgeContainer::ToSegmentData()
 
     return std::move(segment_data);
 }
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/edge_based_graph_factory.cpp b/src/extractor/edge_based_graph_factory.cpp
index 60c961ff6..0e44276f2 100644
--- a/src/extractor/edge_based_graph_factory.cpp
+++ b/src/extractor/edge_based_graph_factory.cpp
@@ -1289,4 +1289,4 @@ EdgeBasedGraphFactory::IndexConditionals(std::vector<Conditional> &&conditionals
     return indexed_restrictions;
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp
index d3e9b33c7..d75122d48 100644
--- a/src/extractor/extraction_containers.cpp
+++ b/src/extractor/extraction_containers.cpp
@@ -1308,4 +1308,4 @@ void ExtractionContainers::PrepareRestrictions(const ReferencedWays &restriction
     }
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/extractor.cpp b/src/extractor/extractor.cpp
index 48ef315b1..b2107bef1 100644
--- a/src/extractor/extractor.cpp
+++ b/src/extractor/extractor.cpp
@@ -909,4 +909,4 @@ void Extractor::ProcessGuidanceTurns(
     util::Log() << "ok, after " << TIMER_SEC(write_guidance_data) << "s";
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/extractor_callbacks.cpp b/src/extractor/extractor_callbacks.cpp
index b9411bbf2..3601fc402 100644
--- a/src/extractor/extractor_callbacks.cpp
+++ b/src/extractor/extractor_callbacks.cpp
@@ -490,4 +490,4 @@ void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const Extracti
     external_memory.way_node_id_offsets.push_back(external_memory.used_node_id_list.size());
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/graph_compressor.cpp b/src/extractor/graph_compressor.cpp
index 26875562e..9c933ef4f 100644
--- a/src/extractor/graph_compressor.cpp
+++ b/src/extractor/graph_compressor.cpp
@@ -417,4 +417,4 @@ void GraphCompressor::PrintStatistics(unsigned original_number_of_nodes,
     util::Log() << "Node compression ratio: " << new_node_count / (double)original_number_of_nodes;
     util::Log() << "Edge compression ratio: " << new_edge_count / (double)original_number_of_edges;
 }
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/intersection/coordinate_extractor.cpp b/src/extractor/intersection/coordinate_extractor.cpp
index 96bb1d77a..c84272363 100644
--- a/src/extractor/intersection/coordinate_extractor.cpp
+++ b/src/extractor/intersection/coordinate_extractor.cpp
@@ -1167,4 +1167,4 @@ CoordinateExtractor::RegressionLine(const std::vector<util::Coordinate> &coordin
     return {coord_between_front, coord_between_back};
 }
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
diff --git a/src/extractor/intersection/have_identical_names.cpp b/src/extractor/intersection/have_identical_names.cpp
index 4384e498c..b1f3e5c79 100644
--- a/src/extractor/intersection/have_identical_names.cpp
+++ b/src/extractor/intersection/have_identical_names.cpp
@@ -21,4 +21,4 @@ bool HaveIdenticalNames(const NameID lhs,
            !util::guidance::requiresNameAnnounced(rhs, lhs, name_table, street_name_suffix_table);
 }
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
diff --git a/src/extractor/intersection/intersection.cpp b/src/extractor/intersection/intersection.cpp
index 44f9918a4..f48668aea 100644
--- a/src/extractor/intersection/intersection.cpp
+++ b/src/extractor/intersection/intersection.cpp
@@ -33,4 +33,4 @@ std::string toString(const IntersectionViewData &view)
     return result;
 }
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
diff --git a/src/extractor/intersection/intersection_analysis.cpp b/src/extractor/intersection/intersection_analysis.cpp
index 9dc00e971..e73b90d1d 100644
--- a/src/extractor/intersection/intersection_analysis.cpp
+++ b/src/extractor/intersection/intersection_analysis.cpp
@@ -852,4 +852,4 @@ IntersectionEdge skipDegreeTwoNodes(const util::NodeBasedDynamicGraph &graph, In
 
     return road;
 }
-} // namespace osrm
+} // namespace osrm::extractor::intersection
diff --git a/src/extractor/intersection/mergable_road_detector.cpp b/src/extractor/intersection/mergable_road_detector.cpp
index edda82cfc..eba2319df 100644
--- a/src/extractor/intersection/mergable_road_detector.cpp
+++ b/src/extractor/intersection/mergable_road_detector.cpp
@@ -612,4 +612,4 @@ bool MergableRoadDetector::IsLinkRoad(const NodeID intersection_node,
                        .annotation_data));
 }
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
diff --git a/src/extractor/intersection/node_based_graph_walker.cpp b/src/extractor/intersection/node_based_graph_walker.cpp
index 2a8defe8e..72dd8ff23 100644
--- a/src/extractor/intersection/node_based_graph_walker.cpp
+++ b/src/extractor/intersection/node_based_graph_walker.cpp
@@ -285,4 +285,4 @@ void IntersectionFinderAccumulator::update(const NodeID from_node,
                                                          {from_node, via_edge});
 }
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
diff --git a/src/extractor/location_dependent_data.cpp b/src/extractor/location_dependent_data.cpp
index 97edd10bc..fe80e0b5f 100644
--- a/src/extractor/location_dependent_data.cpp
+++ b/src/extractor/location_dependent_data.cpp
@@ -273,4 +273,4 @@ std::vector<std::size_t> LocationDependentData::GetPropertyIndexes(const point_t
 
     return result;
 }
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/maneuver_override_relation_parser.cpp b/src/extractor/maneuver_override_relation_parser.cpp
index 8c919e0c7..737edf670 100644
--- a/src/extractor/maneuver_override_relation_parser.cpp
+++ b/src/extractor/maneuver_override_relation_parser.cpp
@@ -134,4 +134,4 @@ ManeuverOverrideRelationParser::TryParse(const osmium::Relation &relation) const
     }
     return maneuver_override;
 }
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/node_based_graph_factory.cpp b/src/extractor/node_based_graph_factory.cpp
index acac1a00a..9819a9778 100644
--- a/src/extractor/node_based_graph_factory.cpp
+++ b/src/extractor/node_based_graph_factory.cpp
@@ -236,4 +236,4 @@ void NodeBasedGraphFactory::ReleaseOsmNodes()
     extractor::PackedOSMIDs().swap(osm_node_ids);
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/raster_source.cpp b/src/extractor/raster_source.cpp
index 041acd514..72e9f8f5b 100644
--- a/src/extractor/raster_source.cpp
+++ b/src/extractor/raster_source.cpp
@@ -167,4 +167,4 @@ RasterContainer::GetRasterInterpolateFromSource(unsigned int source_id, double l
 }
 
 RasterCache *RasterCache::g_instance = NULL;
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/restriction_graph.cpp b/src/extractor/restriction_graph.cpp
index f3b205d3d..041a0d9ad 100644
--- a/src/extractor/restriction_graph.cpp
+++ b/src/extractor/restriction_graph.cpp
@@ -282,4 +282,4 @@ RestrictionGraph::EdgeRange RestrictionGraph::GetEdges(RestrictionID id) const
                                       edges.begin() + node.edges_begin_idx + node.num_edges);
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/restriction_parser.cpp b/src/extractor/restriction_parser.cpp
index 606600011..96b393935 100644
--- a/src/extractor/restriction_parser.cpp
+++ b/src/extractor/restriction_parser.cpp
@@ -282,4 +282,4 @@ bool RestrictionParser::ShouldIgnoreRestriction(const std::string &except_tag_st
     }
     return restrictions.find(current_string) != restrictions.end();
 }
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/scripting_environment_lua.cpp b/src/extractor/scripting_environment_lua.cpp
index 1919caa97..0ab3df52d 100644
--- a/src/extractor/scripting_environment_lua.cpp
+++ b/src/extractor/scripting_environment_lua.cpp
@@ -1249,4 +1249,4 @@ void LuaScriptingContext::ProcessWay(const osmium::Way &way,
     }
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/suffix_table.cpp b/src/extractor/suffix_table.cpp
index aa5e0efb0..10b421a5c 100644
--- a/src/extractor/suffix_table.cpp
+++ b/src/extractor/suffix_table.cpp
@@ -31,4 +31,4 @@ bool SuffixTable::isSuffix(std::string_view possible_suffix) const
     return suffix_set.count(possible_suffix) > 0;
 }
 
-} /* namespace osrm */
+} // namespace osrm::extractor
diff --git a/src/extractor/turn_path_compressor.cpp b/src/extractor/turn_path_compressor.cpp
index 5c20915d8..f46b07718 100644
--- a/src/extractor/turn_path_compressor.cpp
+++ b/src/extractor/turn_path_compressor.cpp
@@ -158,4 +158,4 @@ void TurnPathCompressor::Compress(const NodeID from, const NodeID via, const Nod
     vias.erase(via);
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/turn_path_filter.cpp b/src/extractor/turn_path_filter.cpp
index fcea38ec8..190fec514 100644
--- a/src/extractor/turn_path_filter.cpp
+++ b/src/extractor/turn_path_filter.cpp
@@ -82,4 +82,4 @@ template std::vector<UnresolvedManeuverOverride>
 removeInvalidTurnPaths<>(std::vector<UnresolvedManeuverOverride>,
                          const util::NodeBasedDynamicGraph &);
 
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/extractor/way_restriction_map.cpp b/src/extractor/way_restriction_map.cpp
index 0bd6a6c85..98ebf19df 100644
--- a/src/extractor/way_restriction_map.cpp
+++ b/src/extractor/way_restriction_map.cpp
@@ -119,4 +119,4 @@ NodeID WayRestrictionMap::RemapIfRestrictionVia(const NodeID edge_based_target_n
     return edge_based_target_node;
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
diff --git a/src/guidance/driveway_handler.cpp b/src/guidance/driveway_handler.cpp
index 18f40d567..58f07600d 100644
--- a/src/guidance/driveway_handler.cpp
+++ b/src/guidance/driveway_handler.cpp
@@ -89,4 +89,4 @@ Intersection DrivewayHandler::operator()(const NodeID nid,
     return intersection;
 }
 
-} // namespace osrm
+} // namespace osrm::guidance
diff --git a/src/guidance/guidance_processing.cpp b/src/guidance/guidance_processing.cpp
index 5175295d3..0c510b54b 100644
--- a/src/guidance/guidance_processing.cpp
+++ b/src/guidance/guidance_processing.cpp
@@ -347,4 +347,4 @@ void annotateTurns(const util::NodeBasedDynamicGraph &node_based_graph,
                 << bearing_class_hash.data.size() << " Bearing Classes";
 }
 
-} // namespace osrm
+} // namespace osrm::guidance
diff --git a/src/guidance/intersection_handler.cpp b/src/guidance/intersection_handler.cpp
index 73d523e99..6cbd016a0 100644
--- a/src/guidance/intersection_handler.cpp
+++ b/src/guidance/intersection_handler.cpp
@@ -486,4 +486,4 @@ bool IntersectionHandler::isSameName(const EdgeID source_edge_id, const EdgeID t
                                                   street_name_suffix_table); //
 }
 
-} // namespace osrm
+} // namespace osrm::guidance
diff --git a/src/guidance/motorway_handler.cpp b/src/guidance/motorway_handler.cpp
index ad79d6670..f2138c813 100644
--- a/src/guidance/motorway_handler.cpp
+++ b/src/guidance/motorway_handler.cpp
@@ -560,4 +560,4 @@ Intersection MotorwayHandler::fallback(Intersection intersection) const
     return intersection;
 }
 
-} // namespace osrm
+} // namespace osrm::guidance
diff --git a/src/guidance/roundabout_handler.cpp b/src/guidance/roundabout_handler.cpp
index 745771d49..99fcfc1c7 100644
--- a/src/guidance/roundabout_handler.cpp
+++ b/src/guidance/roundabout_handler.cpp
@@ -498,4 +498,4 @@ Intersection RoundaboutHandler::handleRoundabouts(const RoundaboutType roundabou
     return intersection;
 }
 
-} // namespace osrm
+} // namespace osrm::guidance
diff --git a/src/guidance/segregated_intersection_classification.cpp b/src/guidance/segregated_intersection_classification.cpp
index f3292b16c..bee364bb4 100644
--- a/src/guidance/segregated_intersection_classification.cpp
+++ b/src/guidance/segregated_intersection_classification.cpp
@@ -286,4 +286,4 @@ std::unordered_set<EdgeID> findSegregatedNodes(const extractor::NodeBasedGraphFa
     return segregated_edges;
 }
 
-} // namespace osrm
+} // namespace osrm::guidance
diff --git a/src/guidance/sliproad_handler.cpp b/src/guidance/sliproad_handler.cpp
index 5f4bea3b7..702bdf59a 100644
--- a/src/guidance/sliproad_handler.cpp
+++ b/src/guidance/sliproad_handler.cpp
@@ -874,4 +874,4 @@ SliproadHandler::scaledThresholdByRoadClass(const double max_threshold,
     return scaled;
 }
 
-} // namespace osrm
+} // namespace osrm::guidance
diff --git a/src/guidance/suppress_mode_handler.cpp b/src/guidance/suppress_mode_handler.cpp
index a966dda59..b808abc6e 100644
--- a/src/guidance/suppress_mode_handler.cpp
+++ b/src/guidance/suppress_mode_handler.cpp
@@ -75,4 +75,4 @@ SuppressModeHandler::operator()(const NodeID, const EdgeID, Intersection interse
 
     return intersection;
 }
-} // namespace osrm
+} // namespace osrm::guidance
diff --git a/src/guidance/turn_analysis.cpp b/src/guidance/turn_analysis.cpp
index a65af3cc4..ca50f203f 100644
--- a/src/guidance/turn_analysis.cpp
+++ b/src/guidance/turn_analysis.cpp
@@ -197,4 +197,4 @@ Intersection TurnAnalysis::setTurnTypes(const NodeID node_prior_to_intersection,
     return intersection;
 }
 
-} // namespace osrm
+} // namespace osrm::guidance
diff --git a/src/guidance/turn_classification.cpp b/src/guidance/turn_classification.cpp
index d192520f2..c191b65e0 100644
--- a/src/guidance/turn_classification.cpp
+++ b/src/guidance/turn_classification.cpp
@@ -91,4 +91,4 @@ classifyIntersection(Intersection intersection, const osrm::util::Coordinate &lo
     return std::make_pair(entry_class, bearing_class);
 }
 
-} // namespace osrm
+} // namespace osrm::guidance
diff --git a/src/guidance/turn_discovery.cpp b/src/guidance/turn_discovery.cpp
index e31ebb69f..20005dd12 100644
--- a/src/guidance/turn_discovery.cpp
+++ b/src/guidance/turn_discovery.cpp
@@ -141,4 +141,4 @@ bool findPreviousIntersection(const NodeID node_v,
     return true;
 }
 
-} // namespace osrm
+} // namespace osrm::guidance::lanes
diff --git a/src/guidance/turn_handler.cpp b/src/guidance/turn_handler.cpp
index 8b6e54929..b13cbf1c9 100644
--- a/src/guidance/turn_handler.cpp
+++ b/src/guidance/turn_handler.cpp
@@ -843,4 +843,4 @@ void TurnHandler::handleDistinctConflict(const EdgeID via_edge,
     }
 }
 
-} // namespace osrm
+} // namespace osrm::guidance
diff --git a/src/guidance/turn_lane_augmentation.cpp b/src/guidance/turn_lane_augmentation.cpp
index e4309303a..862f9c35e 100644
--- a/src/guidance/turn_lane_augmentation.cpp
+++ b/src/guidance/turn_lane_augmentation.cpp
@@ -345,4 +345,4 @@ LaneDataVector handleNoneValueAtSimpleTurn(LaneDataVector lane_data,
     return lane_data;
 }
 
-} // namespace osrm
+} // namespace osrm::guidance::lanes
diff --git a/src/guidance/turn_lane_data.cpp b/src/guidance/turn_lane_data.cpp
index 98c3b0654..3be149442 100644
--- a/src/guidance/turn_lane_data.cpp
+++ b/src/guidance/turn_lane_data.cpp
@@ -150,4 +150,4 @@ bool hasTag(const TurnLaneType::Mask tag, const LaneDataVector &data)
     return findTag(tag, data) != data.cend();
 }
 
-} // namespace osrm
+} // namespace osrm::guidance::lanes
diff --git a/src/guidance/turn_lane_handler.cpp b/src/guidance/turn_lane_handler.cpp
index 460927b00..e9891c861 100644
--- a/src/guidance/turn_lane_handler.cpp
+++ b/src/guidance/turn_lane_handler.cpp
@@ -809,4 +809,4 @@ Intersection TurnLaneHandler::handleSliproadTurn(Intersection intersection,
     return simpleMatchTuplesToTurns(std::move(intersection), lane_data, combined_id);
 }
 
-} // namespace osrm
+} // namespace osrm::guidance::lanes
diff --git a/src/guidance/turn_lane_matcher.cpp b/src/guidance/turn_lane_matcher.cpp
index e338a2074..ede330426 100644
--- a/src/guidance/turn_lane_matcher.cpp
+++ b/src/guidance/turn_lane_matcher.cpp
@@ -268,4 +268,4 @@ Intersection triviallyMatchLanesToTurns(Intersection intersection,
     return intersection;
 }
 
-} // namespace osrm
+} // namespace osrm::guidance::lanes
diff --git a/src/partitioner/bisection_graph_view.cpp b/src/partitioner/bisection_graph_view.cpp
index 4a344f5d4..f5f35b4f9 100644
--- a/src/partitioner/bisection_graph_view.cpp
+++ b/src/partitioner/bisection_graph_view.cpp
@@ -50,4 +50,4 @@ const BisectionGraphView::EdgeT &BisectionGraphView::Edge(const EdgeID eid) cons
     return bisection_graph.Edge(eid);
 }
 
-} // namespace osrm
+} // namespace osrm::partitioner
diff --git a/src/partitioner/bisection_to_partition.cpp b/src/partitioner/bisection_to_partition.cpp
index ffca8f0ef..a567dc524 100644
--- a/src/partitioner/bisection_to_partition.cpp
+++ b/src/partitioner/bisection_to_partition.cpp
@@ -138,4 +138,4 @@ bisectionToPartition(const std::vector<BisectionID> &node_to_bisection_id,
 
     return std::make_tuple(std::move(partitions), std::move(num_cells));
 }
-} // namespace osrm
+} // namespace osrm::partitioner
diff --git a/src/partitioner/dinic_max_flow.cpp b/src/partitioner/dinic_max_flow.cpp
index 6a3654c63..ad96f6605 100644
--- a/src/partitioner/dinic_max_flow.cpp
+++ b/src/partitioner/dinic_max_flow.cpp
@@ -307,4 +307,4 @@ bool DinicMaxFlow::Validate(const BisectionGraphView &view,
     return separated && in_range_source && in_range_sink;
 }
 
-} // namespace osrm
+} // namespace osrm::partitioner
diff --git a/src/partitioner/inertial_flow.cpp b/src/partitioner/inertial_flow.cpp
index 9e91f73e3..6bc5cf1b7 100644
--- a/src/partitioner/inertial_flow.cpp
+++ b/src/partitioner/inertial_flow.cpp
@@ -157,4 +157,4 @@ DinicMaxFlow::MinCut computeInertialFlowCut(const BisectionGraphView &view,
     return bestMinCut(view, num_slopes, source_sink_rate, balance);
 }
 
-} // namespace osrm
+} // namespace osrm::partitioner
diff --git a/src/partitioner/partitioner.cpp b/src/partitioner/partitioner.cpp
index 4eddec260..636bd290e 100644
--- a/src/partitioner/partitioner.cpp
+++ b/src/partitioner/partitioner.cpp
@@ -198,4 +198,4 @@ int Partitioner::Run(const PartitionerConfig &config)
     return 0;
 }
 
-} // namespace osrm
+} // namespace osrm::partitioner
diff --git a/src/partitioner/recursive_bisection.cpp b/src/partitioner/recursive_bisection.cpp
index f3c8991ff..de9e509d9 100644
--- a/src/partitioner/recursive_bisection.cpp
+++ b/src/partitioner/recursive_bisection.cpp
@@ -105,4 +105,4 @@ const std::vector<BisectionID> &RecursiveBisection::BisectionIDs() const
 
 std::uint32_t RecursiveBisection::SCCDepth() const { return internal_state.SCCDepth(); }
 
-} // namespace osrm
+} // namespace osrm::partitioner
diff --git a/src/partitioner/recursive_bisection_state.cpp b/src/partitioner/recursive_bisection_state.cpp
index cb3d30a72..e5cb9226a 100644
--- a/src/partitioner/recursive_bisection_state.cpp
+++ b/src/partitioner/recursive_bisection_state.cpp
@@ -179,4 +179,4 @@ const std::vector<BisectionID> &RecursiveBisectionState::BisectionIDs() const
 
 std::uint32_t RecursiveBisectionState::SCCDepth() const { return scc_levels; }
 
-} // namespace osrm
+} // namespace osrm::partitioner
diff --git a/src/partitioner/renumber.cpp b/src/partitioner/renumber.cpp
index 70d9bf558..278a0ea81 100644
--- a/src/partitioner/renumber.cpp
+++ b/src/partitioner/renumber.cpp
@@ -64,4 +64,4 @@ std::vector<std::uint32_t> makePermutation(const DynamicEdgeBasedGraph &graph,
 
     return util::orderingToPermutation(ordering);
 }
-} // namespace osrm
+} // namespace osrm::partitioner
diff --git a/src/partitioner/tarjan_graph_wrapper.cpp b/src/partitioner/tarjan_graph_wrapper.cpp
index 79435fbb9..f1e693ec2 100644
--- a/src/partitioner/tarjan_graph_wrapper.cpp
+++ b/src/partitioner/tarjan_graph_wrapper.cpp
@@ -20,4 +20,4 @@ NodeID TarjanGraphWrapper::GetTarget(const EdgeID eid) const
     return bisection_graph.Edge(eid).target;
 }
 
-} // namespace osrm
+} // namespace osrm::partitioner
diff --git a/src/server/api/parameters_parser.cpp b/src/server/api/parameters_parser.cpp
index 795d62156..7d3db1d16 100644
--- a/src/server/api/parameters_parser.cpp
+++ b/src/server/api/parameters_parser.cpp
@@ -106,4 +106,4 @@ boost::optional<engine::api::TileParameters> parseParameters(std::string::iterat
     return detail::parseParameters<engine::api::TileParameters, TileParametersGrammar<>>(iter, end);
 }
 
-} // namespace osrm
+} // namespace osrm::server::api
diff --git a/src/server/api/url_parser.cpp b/src/server/api/url_parser.cpp
index e244884ab..1eb59270a 100644
--- a/src/server/api/url_parser.cpp
+++ b/src/server/api/url_parser.cpp
@@ -89,4 +89,4 @@ boost::optional<ParsedURL> parseURL(std::string::iterator &iter, const std::stri
     return boost::none;
 }
 
-} // namespace osrm
+} // namespace osrm::server::api
diff --git a/src/server/connection.cpp b/src/server/connection.cpp
index 0e7eda0cb..c67b40be8 100644
--- a/src/server/connection.cpp
+++ b/src/server/connection.cpp
@@ -218,4 +218,4 @@ std::vector<char> Connection::compress_buffers(const std::vector<char> &uncompre
 
     return compressed_data;
 }
-} // namespace osrm
+} // namespace osrm::server
diff --git a/src/server/http/reply.cpp b/src/server/http/reply.cpp
index c7ff80094..66b8d5c7e 100644
--- a/src/server/http/reply.cpp
+++ b/src/server/http/reply.cpp
@@ -100,4 +100,4 @@ boost::asio::const_buffer reply::status_to_buffer(const reply::status_type statu
 }
 
 reply::reply() : status(ok) {}
-} // namespace osrm
+} // namespace osrm::server::http
diff --git a/src/server/request_handler.cpp b/src/server/request_handler.cpp
index 8f54d27c8..0565e99a9 100644
--- a/src/server/request_handler.cpp
+++ b/src/server/request_handler.cpp
@@ -175,4 +175,4 @@ void RequestHandler::HandleRequest(const http::request &current_request, http::r
                               << ", uri: " << current_request.uri;
     }
 }
-} // namespace osrm
+} // namespace osrm::server
diff --git a/src/server/request_parser.cpp b/src/server/request_parser.cpp
index 211f33b00..fa953febf 100644
--- a/src/server/request_parser.cpp
+++ b/src/server/request_parser.cpp
@@ -296,4 +296,4 @@ bool RequestParser::is_digit(const int character) const
 {
     return character >= '0' && character <= '9';
 }
-} // namespace osrm
+} // namespace osrm::server
diff --git a/src/server/service/match_service.cpp b/src/server/service/match_service.cpp
index 4dfbe9e7b..3a74ec90b 100644
--- a/src/server/service/match_service.cpp
+++ b/src/server/service/match_service.cpp
@@ -74,4 +74,4 @@ engine::Status MatchService::RunQuery(std::size_t prefix_length,
     }
     return BaseService::routing_machine.Match(*parameters, result);
 }
-} // namespace osrm
+} // namespace osrm::server::service
diff --git a/src/server/service/nearest_service.cpp b/src/server/service/nearest_service.cpp
index ac3bce3d9..28aa75d69 100644
--- a/src/server/service/nearest_service.cpp
+++ b/src/server/service/nearest_service.cpp
@@ -68,4 +68,4 @@ engine::Status NearestService::RunQuery(std::size_t prefix_length,
     }
     return BaseService::routing_machine.Nearest(*parameters, result);
 }
-} // namespace osrm
+} // namespace osrm::server::service
diff --git a/src/server/service/route_service.cpp b/src/server/service/route_service.cpp
index 27a2c44aa..f5b61e82a 100644
--- a/src/server/service/route_service.cpp
+++ b/src/server/service/route_service.cpp
@@ -72,4 +72,4 @@ engine::Status RouteService::RunQuery(std::size_t prefix_length,
     }
     return BaseService::routing_machine.Route(*parameters, result);
 }
-} // namespace osrm
+} // namespace osrm::server::service
diff --git a/src/server/service/table_service.cpp b/src/server/service/table_service.cpp
index 44fa1878a..27341f6aa 100644
--- a/src/server/service/table_service.cpp
+++ b/src/server/service/table_service.cpp
@@ -103,4 +103,4 @@ engine::Status TableService::RunQuery(std::size_t prefix_length,
     }
     return BaseService::routing_machine.Table(*parameters, result);
 }
-} // namespace osrm
+} // namespace osrm::server::service
diff --git a/src/server/service/tile_service.cpp b/src/server/service/tile_service.cpp
index 2bc449d9b..d90a0861d 100644
--- a/src/server/service/tile_service.cpp
+++ b/src/server/service/tile_service.cpp
@@ -43,4 +43,4 @@ engine::Status TileService::RunQuery(std::size_t prefix_length,
     result = std::string();
     return BaseService::routing_machine.Tile(*parameters, result);
 }
-} // namespace osrm
+} // namespace osrm::server::service
diff --git a/src/server/service/trip_service.cpp b/src/server/service/trip_service.cpp
index 68d910d87..a9e44b896 100644
--- a/src/server/service/trip_service.cpp
+++ b/src/server/service/trip_service.cpp
@@ -76,4 +76,4 @@ engine::Status TripService::RunQuery(std::size_t prefix_length,
     }
     return BaseService::routing_machine.Trip(*parameters, result);
 }
-} // namespace osrm
+} // namespace osrm::server::service
diff --git a/src/server/service_handler.cpp b/src/server/service_handler.cpp
index 3ed47ba49..675c3be09 100644
--- a/src/server/service_handler.cpp
+++ b/src/server/service_handler.cpp
@@ -49,4 +49,4 @@ engine::Status ServiceHandler::RunQuery(api::ParsedURL parsed_url,
 
     return service->RunQuery(parsed_url.prefix_length, parsed_url.query, result);
 }
-} // namespace osrm
+} // namespace osrm::server
diff --git a/src/storage/io_config.cpp b/src/storage/io_config.cpp
index c64081cc1..4ad810295 100644
--- a/src/storage/io_config.cpp
+++ b/src/storage/io_config.cpp
@@ -38,4 +38,4 @@ std::vector<std::string> IOConfig::GetMissingFiles() const
     }
     return missingFiles;
 }
-} // namespace osrm
+} // namespace osrm::storage
diff --git a/src/storage/storage.cpp b/src/storage/storage.cpp
index 13a411e09..a24d67af1 100644
--- a/src/storage/storage.cpp
+++ b/src/storage/storage.cpp
@@ -585,4 +585,4 @@ void Storage::PopulateUpdatableData(const SharedDataIndex &index)
         }
     }
 }
-} // namespace osrm
+} // namespace osrm::storage
diff --git a/src/tools/components.cpp b/src/tools/components.cpp
index 1a1f16ed4..a9b50419c 100644
--- a/src/tools/components.cpp
+++ b/src/tools/components.cpp
@@ -101,7 +101,7 @@ struct FeatureWriter
 };
 
 //
-} // namespace osrm
+} // namespace osrm::tools
 
 int main(int argc, char *argv[])
 {
diff --git a/src/tools/routed.cpp b/src/tools/routed.cpp
index 7d250dcb0..943475052 100644
--- a/src/tools/routed.cpp
+++ b/src/tools/routed.cpp
@@ -68,7 +68,7 @@ std::istream &operator>>(std::istream &in, EngineConfig::Algorithm &algorithm)
         throw util::RuntimeError(token, ErrorCode::UnknownAlgorithm, SOURCE_REF);
     return in;
 }
-} // namespace osrm
+} // namespace osrm::engine
 
 // generate boost::program_options object for the routing part
 inline unsigned generateServerProgramOptions(const int argc,
diff --git a/src/updater/csv_source.cpp b/src/updater/csv_source.cpp
index 49f0efb4f..973162487 100644
--- a/src/updater/csv_source.cpp
+++ b/src/updater/csv_source.cpp
@@ -59,4 +59,4 @@ TurnLookupTable readTurnValues(const std::vector<std::string> &paths)
                                                qi::double_ >> -(',' >> qi::double_));
     return parser(paths);
 }
-} // namespace osrm
+} // namespace osrm::updater::csv
diff --git a/src/updater/updater.cpp b/src/updater/updater.cpp
index 40eb3d80f..a9ec31a6f 100644
--- a/src/updater/updater.cpp
+++ b/src/updater/updater.cpp
@@ -841,4 +841,4 @@ Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &e
     util::Log() << "Done reading edges in " << TIMER_MSEC(load_edges) << "ms.";
     return number_of_edge_based_nodes;
 }
-} // namespace osrm
+} // namespace osrm::updater
diff --git a/src/util/conditional_restrictions.cpp b/src/util/conditional_restrictions.cpp
index d7c138b92..71ff41dd6 100644
--- a/src/util/conditional_restrictions.cpp
+++ b/src/util/conditional_restrictions.cpp
@@ -14,7 +14,7 @@ inline std::ostream &operator<<(std::ostream &stream, const ConditionalRestricti
     return stream << restriction.value << "=" << restriction.condition;
 }
 #endif
-} // namespace osrm
+} // namespace osrm::util
 
 BOOST_FUSION_ADAPT_STRUCT(osrm::util::ConditionalRestriction,
                           (std::string, value)(std::string, condition))
@@ -86,4 +86,4 @@ std::vector<ConditionalRestriction> ParseConditionalRestrictions(const std::stri
     return result;
 }
 
-} // namespace osrm
+} // namespace osrm::util
diff --git a/src/util/coordinate.cpp b/src/util/coordinate.cpp
index 42c80b28b..11e76074c 100644
--- a/src/util/coordinate.cpp
+++ b/src/util/coordinate.cpp
@@ -40,4 +40,4 @@ bool operator==(const FloatCoordinate lhs, const FloatCoordinate rhs)
 
 bool operator!=(const Coordinate lhs, const Coordinate rhs) { return !(lhs == rhs); }
 bool operator!=(const FloatCoordinate lhs, const FloatCoordinate rhs) { return !(lhs == rhs); }
-} // namespace osrm
+} // namespace osrm::util
diff --git a/src/util/coordinate_calculation.cpp b/src/util/coordinate_calculation.cpp
index 01b2be2a6..3bc172664 100644
--- a/src/util/coordinate_calculation.cpp
+++ b/src/util/coordinate_calculation.cpp
@@ -413,4 +413,4 @@ double computeArea(const std::vector<Coordinate> &polygon)
     return area / 2.;
 }
 
-} // namespace osrm
+} // namespace osrm::util::coordinate_calculation
diff --git a/src/util/exception.cpp b/src/util/exception.cpp
index a157ddb0c..f96fd43ff 100644
--- a/src/util/exception.cpp
+++ b/src/util/exception.cpp
@@ -16,4 +16,4 @@ namespace osrm::util
 
 void exception::anchor() const {}
 void RuntimeError::anchor() const {}
-} // namespace osrm
+} // namespace osrm::util
diff --git a/src/util/fingerprint.cpp b/src/util/fingerprint.cpp
index 7daf61a78..caaa85f52 100644
--- a/src/util/fingerprint.cpp
+++ b/src/util/fingerprint.cpp
@@ -89,4 +89,4 @@ bool FingerPrint::IsDataCompatible(const FingerPrint &other) const
     return IsValid() && other.major_version == major_version &&
            other.minor_version == minor_version;
 }
-} // namespace osrm
+} // namespace osrm::util
diff --git a/src/util/geojson_debug_policies.cpp b/src/util/geojson_debug_policies.cpp
index 62cf546ec..afdba87ab 100644
--- a/src/util/geojson_debug_policies.cpp
+++ b/src/util/geojson_debug_policies.cpp
@@ -66,4 +66,4 @@ CoordinateVectorToLineString::operator()(const std::vector<util::Coordinate> &in
     return makeFeature("LineString", std::move(coordinates), properties);
 }
 
-} /* namespace osrm */
+} // namespace osrm::util
diff --git a/src/util/guidance/bearing_class.cpp b/src/util/guidance/bearing_class.cpp
index 56869b480..f2e6714a6 100644
--- a/src/util/guidance/bearing_class.cpp
+++ b/src/util/guidance/bearing_class.cpp
@@ -73,4 +73,4 @@ std::size_t BearingClass::findMatchingBearing(const double bearing) const
     return std::distance(available_bearings.begin(), max_element);
 }
 
-} // namespace osrm
+} // namespace osrm::util::guidance
diff --git a/src/util/guidance/entry_class.cpp b/src/util/guidance/entry_class.cpp
index d85b92140..6fe304123 100644
--- a/src/util/guidance/entry_class.cpp
+++ b/src/util/guidance/entry_class.cpp
@@ -32,4 +32,4 @@ bool EntryClass::operator<(const EntryClass &other) const
     return enabled_entries_flags < other.enabled_entries_flags;
 }
 
-} // namespace osrm
+} // namespace osrm::util::guidance
diff --git a/src/util/guidance/turn_lanes.cpp b/src/util/guidance/turn_lanes.cpp
index 46091aa43..c4594ecf9 100644
--- a/src/util/guidance/turn_lanes.cpp
+++ b/src/util/guidance/turn_lanes.cpp
@@ -32,4 +32,4 @@ bool LaneTupleIdPair::operator==(const LaneTupleIdPair &other) const
     return other.first == first && other.second == second;
 }
 
-} // namespace osrm
+} // namespace osrm::util::guidance
diff --git a/src/util/log.cpp b/src/util/log.cpp
index 765ed8e44..17196ec18 100644
--- a/src/util/log.cpp
+++ b/src/util/log.cpp
@@ -161,4 +161,4 @@ UnbufferedLog::UnbufferedLog(LogLevel level_)
 {
     stream.flags(std::ios_base::unitbuf);
 }
-} // namespace osrm
+} // namespace osrm::util
diff --git a/src/util/opening_hours.cpp b/src/util/opening_hours.cpp
index cd3cb94cc..c4ad2d800 100644
--- a/src/util/opening_hours.cpp
+++ b/src/util/opening_hours.cpp
@@ -429,4 +429,4 @@ bool CheckOpeningHours(const std::vector<OpeningHours> &input, const struct tm &
     return is_open;
 }
 
-} // namespace osrm
+} // namespace osrm::util
diff --git a/src/util/timed_histogram.cpp b/src/util/timed_histogram.cpp
index a015cca49..888618414 100644
--- a/src/util/timed_histogram.cpp
+++ b/src/util/timed_histogram.cpp
@@ -3,4 +3,4 @@
 namespace osrm::util::detail
 {
 std::atomic_uint operation = {0};
-} // namespace osrm
+} // namespace osrm::util::detail
diff --git a/src/util/timezones.cpp b/src/util/timezones.cpp
index 6cd2867d5..179e2d11a 100644
--- a/src/util/timezones.cpp
+++ b/src/util/timezones.cpp
@@ -169,4 +169,4 @@ boost::optional<struct tm> Timezoner::operator()(const point_t &point) const
     }
     return boost::none;
 }
-} // namespace osrm
+} // namespace osrm::updater
diff --git a/unit_tests/contractor/contracted_edge_container.cpp b/unit_tests/contractor/contracted_edge_container.cpp
index 603c04b63..a18549516 100644
--- a/unit_tests/contractor/contracted_edge_container.cpp
+++ b/unit_tests/contractor/contracted_edge_container.cpp
@@ -25,7 +25,7 @@ std::ostream &operator<<(std::ostream &out, const QueryEdge &edge)
     out << "{" << edge.source << ", " << edge.target << ", " << edge.data << "}";
     return out;
 }
-} // namespace osrm
+} // namespace osrm::contractor
 
 BOOST_AUTO_TEST_SUITE(contracted_edge_container)
 
diff --git a/unit_tests/contractor/helper.hpp b/unit_tests/contractor/helper.hpp
index b598fc867..ab005bd3a 100644
--- a/unit_tests/contractor/helper.hpp
+++ b/unit_tests/contractor/helper.hpp
@@ -36,6 +36,6 @@ inline contractor::ContractorGraph makeGraph(const std::vector<TestEdge> &edges)
 
     return contractor::ContractorGraph{max_id + 1, input_edges};
 }
-} // namespace osrm
+} // namespace osrm::unit_test
 
 #endif
diff --git a/unit_tests/engine/offline_facade.cpp b/unit_tests/engine/offline_facade.cpp
index cfde4e91c..c09d4c0d6 100644
--- a/unit_tests/engine/offline_facade.cpp
+++ b/unit_tests/engine/offline_facade.cpp
@@ -12,7 +12,7 @@ namespace routing_algorithms::offline
 struct Algorithm final
 {
 };
-} // namespace routing_algorithms
+} // namespace routing_algorithms::offline
 
 // Define engine data for offline data facade
 template <> struct SearchEngineData<routing_algorithms::offline::Algorithm>
@@ -361,9 +361,9 @@ void unpackPath(const FacadeT &facade,
     mld::unpackPath(facade, packed_path_begin, packed_path_end, endpoints, unpacked_path);
 }
 
-} // namespace routing_algorithms
+} // namespace routing_algorithms::offline
 
-} // namespace osrm
+} // namespace osrm::engine
 
 BOOST_AUTO_TEST_SUITE(offline_facade)
 
diff --git a/unit_tests/mocks/mock_datafacade.hpp b/unit_tests/mocks/mock_datafacade.hpp
index a393f98eb..a0de5a245 100644
--- a/unit_tests/mocks/mock_datafacade.hpp
+++ b/unit_tests/mocks/mock_datafacade.hpp
@@ -258,6 +258,6 @@ class MockDataFacade final : public MockBaseDataFacade, public MockAlgorithmData
 {
 };
 
-} // namespace osrm
+} // namespace osrm::test
 
 #endif // MOCK_DATAFACADE_HPP
diff --git a/unit_tests/mocks/mock_scripting_environment.hpp b/unit_tests/mocks/mock_scripting_environment.hpp
index 66530534e..e56a6f9fa 100644
--- a/unit_tests/mocks/mock_scripting_environment.hpp
+++ b/unit_tests/mocks/mock_scripting_environment.hpp
@@ -47,6 +47,6 @@ class MockScriptingEnvironment : public extractor::ScriptingEnvironment
     bool HasLocationDependentData() const override { return false; };
 };
 
-} // namespace osrm
+} // namespace osrm::test
 
 #endif // MOCK_SCRIPTING_ENVIRONMENT_HPP_
diff --git a/unit_tests/server/parameters_io.hpp b/unit_tests/server/parameters_io.hpp
index ed1243650..075610b3a 100644
--- a/unit_tests/server/parameters_io.hpp
+++ b/unit_tests/server/parameters_io.hpp
@@ -58,6 +58,6 @@ inline std::ostream &operator<<(std::ostream &out, Approach approach)
     out << static_cast<int>(approach);
     return out;
 }
-} // namespace osrm
+} // namespace osrm::engine
 
 #endif
diff --git a/unit_tests/server/url_parser.cpp b/unit_tests/server/url_parser.cpp
index d2f83f99b..5f8af8680 100644
--- a/unit_tests/server/url_parser.cpp
+++ b/unit_tests/server/url_parser.cpp
@@ -11,7 +11,7 @@ std::ostream &operator<<(std::ostream &out, const osrm::server::api::ParsedURL &
 
     return out;
 }
-} // namespace osrm
+} // namespace osrm::server::api
 
 #include <boost/test/test_tools.hpp>
 #include <boost/test/unit_test.hpp>