diff --git a/examples/cpp/random_tsp.cc b/examples/cpp/random_tsp.cc
index 9dae715f68b..d76e907c6bf 100644
--- a/examples/cpp/random_tsp.cc
+++ b/examples/cpp/random_tsp.cc
@@ -53,7 +53,7 @@ ABSL_FLAG(std::string, routing_search_parameters,
           "Text proto RoutingSearchParameters (possibly partial) that will "
           "override the DefaultRoutingSearchParameters()");
 
-namespace operations_research {
+namespace operations_research::routing {
 
 // Random seed generator.
 int32_t GetSeed() {
@@ -179,10 +179,10 @@ void Tsp() {
     LOG(INFO) << "Specify an instance size greater than 0.";
   }
 }
-}  // namespace operations_research
+}  // namespace operations_research::routing
 
 int main(int argc, char** argv) {
   absl::ParseCommandLine(argc, argv);
-  operations_research::Tsp();
+  operations_research::routing::Tsp();
   return EXIT_SUCCESS;
 }
diff --git a/ortools/routing/samples/simple_routing_program.cc b/ortools/routing/samples/simple_routing_program.cc
index 169a54e2869..8577c7b8e6a 100644
--- a/ortools/routing/samples/simple_routing_program.cc
+++ b/ortools/routing/samples/simple_routing_program.cc
@@ -91,7 +91,7 @@ void SimpleRoutingProgram() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::SimpleRoutingProgram();
+  operations_research::routing::SimpleRoutingProgram();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/tsp.cc b/ortools/routing/samples/tsp.cc
index cd0b6213ee6..6b1756cf96d 100644
--- a/ortools/routing/samples/tsp.cc
+++ b/ortools/routing/samples/tsp.cc
@@ -155,7 +155,7 @@ void Tsp() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::Tsp();
+  operations_research::routing::Tsp();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/tsp_circuit_board.cc b/ortools/routing/samples/tsp_circuit_board.cc
index 638e8253fc8..5c56a90cce1 100644
--- a/ortools/routing/samples/tsp_circuit_board.cc
+++ b/ortools/routing/samples/tsp_circuit_board.cc
@@ -181,7 +181,7 @@ void Tsp() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::Tsp();
+  operations_research::routing::Tsp();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/tsp_cities.cc b/ortools/routing/samples/tsp_cities.cc
index 90f1a1ddce8..517d755e093 100644
--- a/ortools/routing/samples/tsp_cities.cc
+++ b/ortools/routing/samples/tsp_cities.cc
@@ -128,7 +128,7 @@ void Tsp() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::Tsp();
+  operations_research::routing::Tsp();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/tsp_cities_routes.cc b/ortools/routing/samples/tsp_cities_routes.cc
index 005e2281de9..db19fd17686 100644
--- a/ortools/routing/samples/tsp_cities_routes.cc
+++ b/ortools/routing/samples/tsp_cities_routes.cc
@@ -131,7 +131,7 @@ void Tsp() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::Tsp();
+  operations_research::routing::Tsp();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/tsp_distance_matrix.cc b/ortools/routing/samples/tsp_distance_matrix.cc
index ecea62c640c..d2540ac6331 100644
--- a/ortools/routing/samples/tsp_distance_matrix.cc
+++ b/ortools/routing/samples/tsp_distance_matrix.cc
@@ -149,7 +149,7 @@ void Tsp() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::Tsp();
+  operations_research::routing::Tsp();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp.cc b/ortools/routing/samples/vrp.cc
index a762ac07f65..7a44a94d83e 100644
--- a/ortools/routing/samples/vrp.cc
+++ b/ortools/routing/samples/vrp.cc
@@ -164,7 +164,7 @@ void Vrp() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::Vrp();
+  operations_research::routing::Vrp();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_breaks.cc b/ortools/routing/samples/vrp_breaks.cc
index a5eabe80f6b..f1ca83cc157 100644
--- a/ortools/routing/samples/vrp_breaks.cc
+++ b/ortools/routing/samples/vrp_breaks.cc
@@ -200,7 +200,7 @@ void VrpBreaks() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpBreaks();
+  operations_research::routing::VrpBreaks();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_capacity.cc b/ortools/routing/samples/vrp_capacity.cc
index 86e512dc623..4d458be8446 100644
--- a/ortools/routing/samples/vrp_capacity.cc
+++ b/ortools/routing/samples/vrp_capacity.cc
@@ -186,7 +186,7 @@ void VrpCapacity() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpCapacity();
+  operations_research::routing::VrpCapacity();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_drop_nodes.cc b/ortools/routing/samples/vrp_drop_nodes.cc
index 9d91aea6ce1..4f858d8b298 100644
--- a/ortools/routing/samples/vrp_drop_nodes.cc
+++ b/ortools/routing/samples/vrp_drop_nodes.cc
@@ -202,7 +202,7 @@ void VrpDropNodes() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpDropNodes();
+  operations_research::routing::VrpDropNodes();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_global_span.cc b/ortools/routing/samples/vrp_global_span.cc
index 502ef1ba6d5..c8ae3f34abb 100644
--- a/ortools/routing/samples/vrp_global_span.cc
+++ b/ortools/routing/samples/vrp_global_span.cc
@@ -165,7 +165,7 @@ void VrpGlobalSpan() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpGlobalSpan();
+  operations_research::routing::VrpGlobalSpan();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_initial_routes.cc b/ortools/routing/samples/vrp_initial_routes.cc
index c15583b7cba..e6d2fb159c2 100644
--- a/ortools/routing/samples/vrp_initial_routes.cc
+++ b/ortools/routing/samples/vrp_initial_routes.cc
@@ -193,6 +193,6 @@ void VrpInitialRoutes() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpInitialRoutes();
+  operations_research::routing::VrpInitialRoutes();
   return EXIT_SUCCESS;
 }
diff --git a/ortools/routing/samples/vrp_pickup_delivery.cc b/ortools/routing/samples/vrp_pickup_delivery.cc
index 403bb43aeac..f48bfa6636a 100644
--- a/ortools/routing/samples/vrp_pickup_delivery.cc
+++ b/ortools/routing/samples/vrp_pickup_delivery.cc
@@ -197,7 +197,7 @@ void VrpGlobalSpan() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpGlobalSpan();
+  operations_research::routing::VrpGlobalSpan();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_pickup_delivery_fifo.cc b/ortools/routing/samples/vrp_pickup_delivery_fifo.cc
index 22c7a509bf4..f37c81e4cab 100644
--- a/ortools/routing/samples/vrp_pickup_delivery_fifo.cc
+++ b/ortools/routing/samples/vrp_pickup_delivery_fifo.cc
@@ -199,7 +199,7 @@ void VrpGlobalSpan() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpGlobalSpan();
+  operations_research::routing::VrpGlobalSpan();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_pickup_delivery_lifo.cc b/ortools/routing/samples/vrp_pickup_delivery_lifo.cc
index a97c50a6249..f69e4771e11 100644
--- a/ortools/routing/samples/vrp_pickup_delivery_lifo.cc
+++ b/ortools/routing/samples/vrp_pickup_delivery_lifo.cc
@@ -199,7 +199,7 @@ void VrpGlobalSpan() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpGlobalSpan();
+  operations_research::routing::VrpGlobalSpan();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_resources.cc b/ortools/routing/samples/vrp_resources.cc
index 718adf7ad09..70256591b8a 100644
--- a/ortools/routing/samples/vrp_resources.cc
+++ b/ortools/routing/samples/vrp_resources.cc
@@ -221,7 +221,7 @@ void VrpTimeWindows() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpTimeWindows();
+  operations_research::routing::VrpTimeWindows();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_routes.cc b/ortools/routing/samples/vrp_routes.cc
index a96726511a2..05c3591dd12 100644
--- a/ortools/routing/samples/vrp_routes.cc
+++ b/ortools/routing/samples/vrp_routes.cc
@@ -154,7 +154,7 @@ void Vrp() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::Vrp();
+  operations_research::routing::Vrp();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_solution_callback.cc b/ortools/routing/samples/vrp_solution_callback.cc
index 2b5b949e0e8..761c3f8c6a8 100644
--- a/ortools/routing/samples/vrp_solution_callback.cc
+++ b/ortools/routing/samples/vrp_solution_callback.cc
@@ -216,7 +216,7 @@ void VrpSolutionCallback() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpSolutionCallback();
+  operations_research::routing::VrpSolutionCallback();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_starts_ends.cc b/ortools/routing/samples/vrp_starts_ends.cc
index d0e4b441774..cbbfb0da0a5 100644
--- a/ortools/routing/samples/vrp_starts_ends.cc
+++ b/ortools/routing/samples/vrp_starts_ends.cc
@@ -173,7 +173,7 @@ void VrpStartsEnds() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpStartsEnds();
+  operations_research::routing::VrpStartsEnds();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_time_windows.cc b/ortools/routing/samples/vrp_time_windows.cc
index ea4cb53554b..d21229a6b9b 100644
--- a/ortools/routing/samples/vrp_time_windows.cc
+++ b/ortools/routing/samples/vrp_time_windows.cc
@@ -195,7 +195,7 @@ void VrpTimeWindows() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpTimeWindows();
+  operations_research::routing::VrpTimeWindows();
   return EXIT_SUCCESS;
 }
 // [END program_part1]
diff --git a/ortools/routing/samples/vrp_with_time_limit.cc b/ortools/routing/samples/vrp_with_time_limit.cc
index 6f73174c5ad..a535effb789 100644
--- a/ortools/routing/samples/vrp_with_time_limit.cc
+++ b/ortools/routing/samples/vrp_with_time_limit.cc
@@ -125,7 +125,7 @@ void VrpGlobalSpan() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpGlobalSpan();
+  operations_research::routing::VrpGlobalSpan();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrptw_store_solution_data.cc b/ortools/routing/samples/vrptw_store_solution_data.cc
index de1b311cead..dd040c68ade 100644
--- a/ortools/routing/samples/vrptw_store_solution_data.cc
+++ b/ortools/routing/samples/vrptw_store_solution_data.cc
@@ -235,7 +235,7 @@ void VrpTimeWindows() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpTimeWindows();
+  operations_research::routing::VrpTimeWindows();
   return EXIT_SUCCESS;
 }
 // [END program_part1]
diff --git a/ortools/routing/sat.cc b/ortools/routing/sat.cc
index 50de8df0e43..f5d5ceb85bb 100644
--- a/ortools/routing/sat.cc
+++ b/ortools/routing/sat.cc
@@ -54,7 +54,7 @@ using operations_research::sat::CpSolverResponse;
 using operations_research::sat::CpSolverStatus;
 using operations_research::sat::IntegerVariableProto;
 using operations_research::sat::kMaxIntegerValue;
-using operations_research::sat::kMinxIntegerValue;
+using operations_research::sat::kMinIntegerValue;
 using operations_research::sat::LinearConstraintProto;
 using operations_research::sat::Model;
 using operations_research::sat::NewSatParameters;