diff --git a/LibCarla/source/carla/trafficmanager/AtomicActorSet.h b/LibCarla/source/carla/trafficmanager/AtomicActorSet.h
index ff02af5a7..5525d0fea 100644
--- a/LibCarla/source/carla/trafficmanager/AtomicActorSet.h
+++ b/LibCarla/source/carla/trafficmanager/AtomicActorSet.h
@@ -13,6 +13,7 @@
 #include "carla/client/Actor.h"
 #include "carla/Memory.h"
 
+namespace carla {
 namespace traffic_manager {
 
   namespace cc = carla::client;
@@ -80,3 +81,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/AtomicMap.h b/LibCarla/source/carla/trafficmanager/AtomicMap.h
index 2438b90dd..c8fc5e6ef 100644
--- a/LibCarla/source/carla/trafficmanager/AtomicMap.h
+++ b/LibCarla/source/carla/trafficmanager/AtomicMap.h
@@ -9,6 +9,7 @@
 #include <mutex>
 #include <unordered_map>
 
+namespace carla {
 namespace traffic_manager {
 
   template <typename Key, typename Value>
@@ -50,3 +51,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/BatchControlStage.cpp b/LibCarla/source/carla/trafficmanager/BatchControlStage.cpp
index cf39560f1..e67a462f7 100644
--- a/LibCarla/source/carla/trafficmanager/BatchControlStage.cpp
+++ b/LibCarla/source/carla/trafficmanager/BatchControlStage.cpp
@@ -6,6 +6,7 @@
 
 #include "BatchControlStage.h"
 
+namespace carla {
 namespace traffic_manager {
 
   BatchControlStage::BatchControlStage(
@@ -69,3 +70,4 @@ namespace traffic_manager {
   }
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/BatchControlStage.h b/LibCarla/source/carla/trafficmanager/BatchControlStage.h
index 41bd61bfb..5d45a8445 100644
--- a/LibCarla/source/carla/trafficmanager/BatchControlStage.h
+++ b/LibCarla/source/carla/trafficmanager/BatchControlStage.h
@@ -17,6 +17,7 @@
 #include "carla/trafficmanager/MessengerAndDataTypes.h"
 #include "carla/trafficmanager/PipelineStage.h"
 
+namespace carla {
 namespace traffic_manager {
 
   namespace cc = carla::client;
@@ -59,3 +60,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/CarlaDataAccessLayer.cpp b/LibCarla/source/carla/trafficmanager/CarlaDataAccessLayer.cpp
index 5430665ce..a37b6221e 100644
--- a/LibCarla/source/carla/trafficmanager/CarlaDataAccessLayer.cpp
+++ b/LibCarla/source/carla/trafficmanager/CarlaDataAccessLayer.cpp
@@ -6,6 +6,7 @@
 
 #include "CarlaDataAccessLayer.h"
 
+namespace carla {
 namespace traffic_manager {
 
   CarlaDataAccessLayer::CarlaDataAccessLayer(carla::SharedPtr<cc::Map> _world_map) {
@@ -17,3 +18,4 @@ namespace traffic_manager {
     return world_map->GetTopology();
   }
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/CarlaDataAccessLayer.h b/LibCarla/source/carla/trafficmanager/CarlaDataAccessLayer.h
index 075f8ada5..0a8d7aebf 100644
--- a/LibCarla/source/carla/trafficmanager/CarlaDataAccessLayer.h
+++ b/LibCarla/source/carla/trafficmanager/CarlaDataAccessLayer.h
@@ -12,6 +12,7 @@
 #include "carla/client/Waypoint.h"
 #include "carla/Memory.h"
 
+namespace carla {
 namespace traffic_manager {
 
   namespace cc = carla::client;
@@ -35,3 +36,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/CollisionStage.cpp b/LibCarla/source/carla/trafficmanager/CollisionStage.cpp
index 04695eb9c..67da0d3cd 100644
--- a/LibCarla/source/carla/trafficmanager/CollisionStage.cpp
+++ b/LibCarla/source/carla/trafficmanager/CollisionStage.cpp
@@ -6,6 +6,7 @@
 
 #include "CollisionStage.h"
 
+namespace carla {
 namespace traffic_manager {
 
 namespace CollisionStageConstants {
@@ -441,3 +442,4 @@ namespace CollisionStageConstants {
   }
 
 } // namespace traffic_manager
+} // namespace carla
\ No newline at end of file
diff --git a/LibCarla/source/carla/trafficmanager/CollisionStage.h b/LibCarla/source/carla/trafficmanager/CollisionStage.h
index 5fbb20709..f417f7d7e 100644
--- a/LibCarla/source/carla/trafficmanager/CollisionStage.h
+++ b/LibCarla/source/carla/trafficmanager/CollisionStage.h
@@ -34,6 +34,7 @@
 #include "carla/trafficmanager/PipelineStage.h"
 #include "carla/trafficmanager/VicinityGrid.h"
 
+namespace carla {
 namespace traffic_manager {
 
   namespace cc = carla::client;
@@ -131,3 +132,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
\ No newline at end of file
diff --git a/LibCarla/source/carla/trafficmanager/InMemoryMap.cpp b/LibCarla/source/carla/trafficmanager/InMemoryMap.cpp
index 3f5758396..214fc2a70 100644
--- a/LibCarla/source/carla/trafficmanager/InMemoryMap.cpp
+++ b/LibCarla/source/carla/trafficmanager/InMemoryMap.cpp
@@ -6,6 +6,7 @@
 
 #include "InMemoryMap.h"
 
+namespace carla {
 namespace traffic_manager {
 
 namespace MapConstants {
@@ -255,3 +256,4 @@ namespace MapConstants {
   }
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/InMemoryMap.h b/LibCarla/source/carla/trafficmanager/InMemoryMap.h
index 129b53ad4..0d79b855b 100644
--- a/LibCarla/source/carla/trafficmanager/InMemoryMap.h
+++ b/LibCarla/source/carla/trafficmanager/InMemoryMap.h
@@ -21,6 +21,7 @@
 
 #include "carla/trafficmanager/SimpleWaypoint.h"
 
+namespace carla {
 namespace traffic_manager {
 
   namespace cg = carla::geom;
@@ -78,3 +79,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/LocalizationStage.cpp b/LibCarla/source/carla/trafficmanager/LocalizationStage.cpp
index 1f2e53f70..f98ac737b 100644
--- a/LibCarla/source/carla/trafficmanager/LocalizationStage.cpp
+++ b/LibCarla/source/carla/trafficmanager/LocalizationStage.cpp
@@ -6,6 +6,7 @@
 
 #include "LocalizationStage.h"
 
+namespace carla {
 namespace traffic_manager {
 
 namespace LocalizationConstants {
@@ -519,3 +520,4 @@ namespace LocalizationConstants {
   }
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/LocalizationStage.h b/LibCarla/source/carla/trafficmanager/LocalizationStage.h
index c52127903..cf9b2cc6b 100644
--- a/LibCarla/source/carla/trafficmanager/LocalizationStage.h
+++ b/LibCarla/source/carla/trafficmanager/LocalizationStage.h
@@ -32,6 +32,7 @@
 #include "carla/trafficmanager/PipelineStage.h"
 #include "carla/trafficmanager/SimpleWaypoint.h"
 
+namespace carla {
 namespace traffic_manager {
 
   using namespace std::chrono;
@@ -133,3 +134,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/LocalizationUtils.cpp b/LibCarla/source/carla/trafficmanager/LocalizationUtils.cpp
index 380241cb6..fa7b92361 100644
--- a/LibCarla/source/carla/trafficmanager/LocalizationUtils.cpp
+++ b/LibCarla/source/carla/trafficmanager/LocalizationUtils.cpp
@@ -6,6 +6,7 @@
 
 #include "carla/trafficmanager/LocalizationUtils.h"
 
+namespace carla {
 namespace traffic_manager {
 
   float DeviationCrossProduct(Actor actor, const cg::Location &target_location) {
@@ -124,3 +125,4 @@ namespace traffic_manager {
   }
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/LocalizationUtils.h b/LibCarla/source/carla/trafficmanager/LocalizationUtils.h
index 15508eee5..d55382c86 100644
--- a/LibCarla/source/carla/trafficmanager/LocalizationUtils.h
+++ b/LibCarla/source/carla/trafficmanager/LocalizationUtils.h
@@ -13,6 +13,7 @@
 
 #include "carla/trafficmanager/SimpleWaypoint.h"
 
+namespace carla {
 namespace traffic_manager {
 
   namespace cc = carla::client;
@@ -58,3 +59,4 @@ namespace traffic_manager {
   float DeviationDotProduct(Actor actor, const cg::Location &target_location, bool rear_offset=false);
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/Messenger.h b/LibCarla/source/carla/trafficmanager/Messenger.h
index b4662fd14..3e9cad66c 100644
--- a/LibCarla/source/carla/trafficmanager/Messenger.h
+++ b/LibCarla/source/carla/trafficmanager/Messenger.h
@@ -11,6 +11,7 @@
 #include <condition_variable>
 #include <mutex>
 
+namespace carla {
 namespace traffic_manager {
 
   using namespace std::chrono_literals;
@@ -104,3 +105,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/MessengerAndDataTypes.h b/LibCarla/source/carla/trafficmanager/MessengerAndDataTypes.h
index 0b5f9e207..cd240536b 100644
--- a/LibCarla/source/carla/trafficmanager/MessengerAndDataTypes.h
+++ b/LibCarla/source/carla/trafficmanager/MessengerAndDataTypes.h
@@ -16,6 +16,7 @@
 #include "carla/trafficmanager/Messenger.h"
 #include "carla/trafficmanager/SimpleWaypoint.h"
 
+namespace carla {
 namespace traffic_manager {
 
   namespace cc = carla::client;
@@ -90,3 +91,4 @@ namespace traffic_manager {
   using TrafficLightToPlannerMessenger = Messenger<std::shared_ptr<TrafficLightToPlannerFrame>>;
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/MotionPlannerStage.cpp b/LibCarla/source/carla/trafficmanager/MotionPlannerStage.cpp
index bb7577fd7..6f5595617 100644
--- a/LibCarla/source/carla/trafficmanager/MotionPlannerStage.cpp
+++ b/LibCarla/source/carla/trafficmanager/MotionPlannerStage.cpp
@@ -6,6 +6,7 @@
 
 #include "MotionPlannerStage.h"
 
+namespace carla {
 namespace traffic_manager {
 
 namespace PlannerConstants {
@@ -190,3 +191,4 @@ namespace PlannerConstants {
   }
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/MotionPlannerStage.h b/LibCarla/source/carla/trafficmanager/MotionPlannerStage.h
index 09fbaa029..b5094ab96 100644
--- a/LibCarla/source/carla/trafficmanager/MotionPlannerStage.h
+++ b/LibCarla/source/carla/trafficmanager/MotionPlannerStage.h
@@ -18,6 +18,7 @@
 #include "carla/trafficmanager/PIDController.h"
 #include "carla/trafficmanager/PipelineStage.h"
 
+namespace carla {
 namespace traffic_manager {
 
   namespace chr = std::chrono;
@@ -102,3 +103,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/PIDController.cpp b/LibCarla/source/carla/trafficmanager/PIDController.cpp
index 5072f2a4f..67034d5b9 100644
--- a/LibCarla/source/carla/trafficmanager/PIDController.cpp
+++ b/LibCarla/source/carla/trafficmanager/PIDController.cpp
@@ -7,6 +7,7 @@
 #include "PIDController.h"
 #include <algorithm>
 
+namespace carla {
 namespace traffic_manager {
 
 namespace PIDControllerConstants {
@@ -91,3 +92,4 @@ namespace PIDControllerConstants {
   }
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/PIDController.h b/LibCarla/source/carla/trafficmanager/PIDController.h
index 403a180db..79e8cc700 100644
--- a/LibCarla/source/carla/trafficmanager/PIDController.h
+++ b/LibCarla/source/carla/trafficmanager/PIDController.h
@@ -10,6 +10,7 @@
 #include <cmath>
 #include <vector>
 
+namespace carla {
 namespace traffic_manager {
 
   namespace chr = std::chrono;
@@ -64,3 +65,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/Parameters.cpp b/LibCarla/source/carla/trafficmanager/Parameters.cpp
index 3f56281f9..ed327b28e 100644
--- a/LibCarla/source/carla/trafficmanager/Parameters.cpp
+++ b/LibCarla/source/carla/trafficmanager/Parameters.cpp
@@ -8,6 +8,7 @@
 
 #include "Parameters.h"
 
+namespace carla {
 namespace traffic_manager {
 
 Parameters::Parameters() {}
@@ -179,3 +180,4 @@ float Parameters::GetPercentageIgnoreActors(const ActorPtr &actor) {
 }
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/Parameters.h b/LibCarla/source/carla/trafficmanager/Parameters.h
index 35649ada5..82f93e00d 100644
--- a/LibCarla/source/carla/trafficmanager/Parameters.h
+++ b/LibCarla/source/carla/trafficmanager/Parameters.h
@@ -14,6 +14,7 @@
 #include "carla/trafficmanager/AtomicActorSet.h"
 #include "carla/trafficmanager/AtomicMap.h"
 
+namespace carla {
 namespace traffic_manager {
 
   namespace cc = carla::client;
@@ -104,3 +105,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/PerformanceDiagnostics.cpp b/LibCarla/source/carla/trafficmanager/PerformanceDiagnostics.cpp
index 67ddce27c..ce97e6f26 100644
--- a/LibCarla/source/carla/trafficmanager/PerformanceDiagnostics.cpp
+++ b/LibCarla/source/carla/trafficmanager/PerformanceDiagnostics.cpp
@@ -6,6 +6,7 @@
 
 #include "carla/trafficmanager/PerformanceDiagnostics.h"
 
+namespace carla {
 namespace traffic_manager {
 
   PerformanceDiagnostics::PerformanceDiagnostics(std::string stage_name)
@@ -37,3 +38,4 @@ namespace traffic_manager {
   }
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/PerformanceDiagnostics.h b/LibCarla/source/carla/trafficmanager/PerformanceDiagnostics.h
index be72185bf..0f26668ea 100644
--- a/LibCarla/source/carla/trafficmanager/PerformanceDiagnostics.h
+++ b/LibCarla/source/carla/trafficmanager/PerformanceDiagnostics.h
@@ -11,6 +11,7 @@
 
 #include "carla/Logging.h"
 
+namespace carla {
 namespace traffic_manager {
 
   namespace chr = std::chrono;
@@ -36,3 +37,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/PipelineStage.cpp b/LibCarla/source/carla/trafficmanager/PipelineStage.cpp
index e3814de95..deef33c4d 100644
--- a/LibCarla/source/carla/trafficmanager/PipelineStage.cpp
+++ b/LibCarla/source/carla/trafficmanager/PipelineStage.cpp
@@ -6,6 +6,7 @@
 
 #include "PipelineStage.h"
 
+namespace carla {
 namespace traffic_manager {
 
   PipelineStage::PipelineStage(std::string stage_name)
@@ -106,3 +107,4 @@ namespace traffic_manager {
   }
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/PipelineStage.h b/LibCarla/source/carla/trafficmanager/PipelineStage.h
index 7de1949ef..4e278bde4 100644
--- a/LibCarla/source/carla/trafficmanager/PipelineStage.h
+++ b/LibCarla/source/carla/trafficmanager/PipelineStage.h
@@ -22,6 +22,7 @@
 #include "carla/trafficmanager/Messenger.h"
 #include "carla/trafficmanager/PerformanceDiagnostics.h"
 
+namespace carla {
 namespace traffic_manager {
 
   namespace chr = std::chrono;
@@ -91,3 +92,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/SimpleWaypoint.cpp b/LibCarla/source/carla/trafficmanager/SimpleWaypoint.cpp
index 8f1f184bb..0c6a11838 100644
--- a/LibCarla/source/carla/trafficmanager/SimpleWaypoint.cpp
+++ b/LibCarla/source/carla/trafficmanager/SimpleWaypoint.cpp
@@ -6,6 +6,7 @@
 
 #include "SimpleWaypoint.h"
 
+namespace carla {
 namespace traffic_manager {
 
   using SimpleWaypointPtr = std::shared_ptr<SimpleWaypoint>;
@@ -99,3 +100,4 @@ namespace traffic_manager {
   }
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/SimpleWaypoint.h b/LibCarla/source/carla/trafficmanager/SimpleWaypoint.h
index 0e891a50f..1923cb40b 100644
--- a/LibCarla/source/carla/trafficmanager/SimpleWaypoint.h
+++ b/LibCarla/source/carla/trafficmanager/SimpleWaypoint.h
@@ -15,6 +15,7 @@
 #include "carla/geom/Vector3D.h"
 #include "carla/Memory.h"
 
+namespace carla {
 namespace traffic_manager {
 
   namespace cc = carla::client;
@@ -95,3 +96,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/TrafficLightStage.cpp b/LibCarla/source/carla/trafficmanager/TrafficLightStage.cpp
index f11711b86..9eace92a4 100644
--- a/LibCarla/source/carla/trafficmanager/TrafficLightStage.cpp
+++ b/LibCarla/source/carla/trafficmanager/TrafficLightStage.cpp
@@ -8,6 +8,7 @@
 
 #include "TrafficLightStage.h"
 
+namespace carla {
 namespace traffic_manager {
 
   static const uint64_t NO_SIGNAL_PASSTHROUGH_INTERVAL = 5u;
@@ -206,3 +207,4 @@ namespace traffic_manager {
   }
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/TrafficLightStage.h b/LibCarla/source/carla/trafficmanager/TrafficLightStage.h
index 956e6c438..0226598c9 100644
--- a/LibCarla/source/carla/trafficmanager/TrafficLightStage.h
+++ b/LibCarla/source/carla/trafficmanager/TrafficLightStage.h
@@ -23,6 +23,7 @@
 #include "carla/trafficmanager/PipelineStage.h"
 
 
+namespace carla {
 namespace traffic_manager {
 
   namespace chr = std::chrono;
@@ -93,3 +94,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/TrafficManager.cpp b/LibCarla/source/carla/trafficmanager/TrafficManager.cpp
index e1a801ee0..afc4e62e0 100644
--- a/LibCarla/source/carla/trafficmanager/TrafficManager.cpp
+++ b/LibCarla/source/carla/trafficmanager/TrafficManager.cpp
@@ -8,6 +8,7 @@
 
 #include "carla/client/TrafficLight.h"
 
+namespace carla {
 namespace traffic_manager {
 
   TrafficManager::TrafficManager(
@@ -248,3 +249,4 @@ namespace traffic_manager {
   }
 
 } // namespace traffic_manager
+} // namespace carla
diff --git a/LibCarla/source/carla/trafficmanager/TrafficManager.h b/LibCarla/source/carla/trafficmanager/TrafficManager.h
index ee08a8efa..cbbd4fe10 100644
--- a/LibCarla/source/carla/trafficmanager/TrafficManager.h
+++ b/LibCarla/source/carla/trafficmanager/TrafficManager.h
@@ -31,6 +31,7 @@
 #include "carla/trafficmanager/Parameters.h"
 #include "carla/trafficmanager/TrafficLightStage.h"
 
+namespace carla {
 namespace traffic_manager {
 
   namespace cc = carla::client;
@@ -153,3 +154,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
\ No newline at end of file
diff --git a/LibCarla/source/carla/trafficmanager/VicinityGrid.cpp b/LibCarla/source/carla/trafficmanager/VicinityGrid.cpp
index 5d4670a75..d0311d003 100644
--- a/LibCarla/source/carla/trafficmanager/VicinityGrid.cpp
+++ b/LibCarla/source/carla/trafficmanager/VicinityGrid.cpp
@@ -6,6 +6,7 @@
 
 #include "VicinityGrid.h"
 
+namespace carla {
 namespace traffic_manager {
 
   static const float GRID_SIZE = 10.0f;
@@ -93,3 +94,4 @@ namespace traffic_manager {
   }
 
 } // namespace traffic_manager
+} // namespace carla
\ No newline at end of file
diff --git a/LibCarla/source/carla/trafficmanager/VicinityGrid.h b/LibCarla/source/carla/trafficmanager/VicinityGrid.h
index 1ca67235f..93f1da349 100644
--- a/LibCarla/source/carla/trafficmanager/VicinityGrid.h
+++ b/LibCarla/source/carla/trafficmanager/VicinityGrid.h
@@ -20,6 +20,7 @@
 
 #include "carla/trafficmanager/SimpleWaypoint.h"
 
+namespace carla {
 namespace traffic_manager {
 
   namespace cc = carla::client;
@@ -63,3 +64,4 @@ namespace traffic_manager {
   };
 
 } // namespace traffic_manager
+} // namespace carla
\ No newline at end of file
diff --git a/PythonAPI/carla/source/libcarla/TrafficManager.cpp b/PythonAPI/carla/source/libcarla/TrafficManager.cpp
index fa401349e..24fd0fb36 100644
--- a/PythonAPI/carla/source/libcarla/TrafficManager.cpp
+++ b/PythonAPI/carla/source/libcarla/TrafficManager.cpp
@@ -22,20 +22,20 @@ void export_trafficmanager() {
 
     class_<Parameters>("TM_Parameters").def(vector_indexing_suite<Parameters>());
 
-    class_<traffic_manager::TrafficManager, boost::noncopyable>("TrafficManager", no_init)
-        .def("register_vehicles", &traffic_manager::TrafficManager::RegisterVehicles)
-        .def("unregister_vehicles", &traffic_manager::TrafficManager::UnregisterVehicles)
-        .def("set_vehicle_max_speed_difference", &traffic_manager::TrafficManager::SetPercentageSpeedDifference)
-        .def("set_global_max_speed_difference", &traffic_manager::TrafficManager::SetGlobalPercentageSpeedDifference)
-        .def("set_collision_detection", &traffic_manager::TrafficManager::SetCollisionDetection)
-        .def("force_lane_change", &traffic_manager::TrafficManager::SetForceLaneChange)
-        .def("set_auto_lane_change", &traffic_manager::TrafficManager::SetAutoLaneChange)
-        .def("set_distance_to_leading_vehicle", &traffic_manager::TrafficManager::SetDistanceToLeadingVehicle)
-        .def("reset_traffic_lights", &traffic_manager::TrafficManager::ResetAllTrafficLights)
-        .def("destroy_vehicle", &traffic_manager::TrafficManager::DestroyVehicle)
-        .def("ignore_actors_percentage", &traffic_manager::TrafficManager::SetPercentageIgnoreActors)
-        .def("ignore_lights_percentage", &traffic_manager::TrafficManager::SetPercentageRunningLight);
+    class_<carla::traffic_manager::TrafficManager, boost::noncopyable>("TrafficManager", no_init)
+        .def("register_vehicles", &carla::traffic_manager::TrafficManager::RegisterVehicles)
+        .def("unregister_vehicles", &carla::traffic_manager::TrafficManager::UnregisterVehicles)
+        .def("set_vehicle_max_speed_difference", &carla::traffic_manager::TrafficManager::SetPercentageSpeedDifference)
+        .def("set_global_max_speed_difference", &carla::traffic_manager::TrafficManager::SetGlobalPercentageSpeedDifference)
+        .def("set_collision_detection", &carla::traffic_manager::TrafficManager::SetCollisionDetection)
+        .def("force_lane_change", &carla::traffic_manager::TrafficManager::SetForceLaneChange)
+        .def("set_auto_lane_change", &carla::traffic_manager::TrafficManager::SetAutoLaneChange)
+        .def("set_distance_to_leading_vehicle", &carla::traffic_manager::TrafficManager::SetDistanceToLeadingVehicle)
+        .def("reset_traffic_lights", &carla::traffic_manager::TrafficManager::ResetAllTrafficLights)
+        .def("destroy_vehicle", &carla::traffic_manager::TrafficManager::DestroyVehicle)
+        .def("ignore_actors_percentage", &carla::traffic_manager::TrafficManager::SetPercentageIgnoreActors)
+        .def("ignore_lights_percentage", &carla::traffic_manager::TrafficManager::SetPercentageRunningLight);
 
-    def("GetTrafficManager", &traffic_manager::TrafficManager::GetInstance, return_value_policy<reference_existing_object>());
+    def("GetTrafficManager", &carla::traffic_manager::TrafficManager::GetInstance, return_value_policy<reference_existing_object>());
 
 }
diff --git a/PythonAPI/examples/tm_spawn_npc.py b/PythonAPI/examples/tm_spawn_npc.py
index cef28c448..2fb5fe3db 100644
--- a/PythonAPI/examples/tm_spawn_npc.py
+++ b/PythonAPI/examples/tm_spawn_npc.py
@@ -176,10 +176,8 @@ def main():
         traffic_manager = carla.GetTrafficManager(client)
         time.sleep(1)
 
-        vehicle_vec = carla.TM_ActorList()
-        vehicle_vec.extend(vehicles_list)
-
-        traffic_manager.register_vehicles(vehicle_vec)
+        for v in vehicles_list:
+            v.set_autopilot(True)
 
         while True:
             time.sleep(1)