diff --git a/.clang-tidy b/.clang-tidy
index 993819fb3d20c2424aed5c9d84e1e2fd1ef71e52..c6046c518c3f6d53b05c8e54f2d0a6992e99bfc6 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -3,13 +3,10 @@ Checks: >
   -*,
   boost-*,
   bugprone-*,
-  -bugprone-easily-swappable-parameters,
   cppcoreguidelines-*,
   -cppcoreguidelines-explicit-virtual-functions,
   -cppcoreguidelines-non-private-member-variables-in-classes,
-  -cppcoreguidelines-pro-type-static-cast-downcast,
   -cppcoreguidelines-special-member-functions,
-  -cppcoreguidelines-virtual-class-destructor,
   google-*,
   -google-build-using-namespace,
   -google-default-arguments,
@@ -20,10 +17,8 @@ Checks: >
   misc-*,
   -misc-non-private-member-variables-in-classes,
   modernize-*,
-  -modernize-return-braced-init-list,
-  -modernize-use-equals-default,
   -modernize-use-nodiscard,
-  -modernize-use-override,
+  -modernize-use-equals-default,
   -modernize-use-trailing-return-type,
   -modernize-use-using,
   performance-*,
diff --git a/include/MantleAPI/Common/bounding_box.h b/include/MantleAPI/Common/bounding_box.h
index c7bc0505961c7cf529422349b07783c7a4c477de..1b7d6943b984f971fa00c9cb62d2c0186f1c89b6 100644
--- a/include/MantleAPI/Common/bounding_box.h
+++ b/include/MantleAPI/Common/bounding_box.h
@@ -12,8 +12,8 @@
 /** @file  bounding_box.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_COMMON_BOUNDINGBOX_H
-#define MANTLEAPI_COMMON_BOUNDINGBOX_H
+#ifndef MANTLEAPI_COMMON_BOUNDING_BOX_H
+#define MANTLEAPI_COMMON_BOUNDING_BOX_H
 
 #include <MantleAPI/Common/dimension.h>
 #include <MantleAPI/Common/vector.h>
@@ -38,4 +38,4 @@ inline bool operator==(const BoundingBox& lhs, const BoundingBox& rhs) noexcept
 
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_COMMON_BOUNDINGBOX_H
+#endif  // MANTLEAPI_COMMON_BOUNDING_BOX_H
diff --git a/include/MantleAPI/Common/i_geometry_helper.h b/include/MantleAPI/Common/i_geometry_helper.h
index 32c35dd019b0523eb35219736c9dfaa386736342..214c68598f7d206665905b022df7d7cc0a8e85a3 100644
--- a/include/MantleAPI/Common/i_geometry_helper.h
+++ b/include/MantleAPI/Common/i_geometry_helper.h
@@ -12,8 +12,8 @@
 /** @file  i_geometry_helper.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_COMMON_IGEOMETRYHELPER_H
-#define MANTLEAPI_COMMON_IGEOMETRYHELPER_H
+#ifndef MANTLEAPI_COMMON_I_GEOMETRY_HELPER_H
+#define MANTLEAPI_COMMON_I_GEOMETRY_HELPER_H
 
 #include <MantleAPI/Common/pose.h>
 
@@ -62,4 +62,4 @@ public:
 
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_COMMON_IGEOMETRYHELPER_H
+#endif  // MANTLEAPI_COMMON_I_GEOMETRY_HELPER_H
diff --git a/include/MantleAPI/Common/i_identifiable.h b/include/MantleAPI/Common/i_identifiable.h
index cb256f747739ed08a80f52ac6d315497b7758aa5..a46500c74f6e0aa779284fbf11aa4bff424b7bc0 100644
--- a/include/MantleAPI/Common/i_identifiable.h
+++ b/include/MantleAPI/Common/i_identifiable.h
@@ -12,8 +12,8 @@
 /** @file  i_identifiable.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_COMMON_IIDENTIFIABLE_H
-#define MANTLEAPI_COMMON_IIDENTIFIABLE_H
+#ifndef MANTLEAPI_COMMON_I_IDENTIFIABLE_H
+#define MANTLEAPI_COMMON_I_IDENTIFIABLE_H
 
 #include <cstdint>
 #include <string>
@@ -41,4 +41,4 @@ public:
 
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_COMMON_IIDENTIFIABLE_H
+#endif  // MANTLEAPI_COMMON_I_IDENTIFIABLE_H
diff --git a/include/MantleAPI/Common/position.h b/include/MantleAPI/Common/position.h
index 430b5dbcf1773baf0c08db8c62454d83665268f3..c1acb83eddcc583113200f6ae24aaa847a6cd3da 100644
--- a/include/MantleAPI/Common/position.h
+++ b/include/MantleAPI/Common/position.h
@@ -12,8 +12,8 @@
 /** @file  position.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_COMMON_IPOSITION_H
-#define MANTLEAPI_COMMON_IPOSITION_H
+#ifndef MANTLEAPI_COMMON_POSITION_H
+#define MANTLEAPI_COMMON_POSITION_H
 
 #include <MantleAPI/Common/floating_point_helper.h>
 #include <MantleAPI/Common/vector.h>
@@ -103,4 +103,4 @@ inline bool operator!=(const LatLonPosition& lhs, const LatLonPosition& rhs) noe
 }
 
 }  // namespace mantle_api
-#endif  // MANTLEAPI_COMMON_IPOSITION_H
+#endif  // MANTLEAPI_COMMON_POSITION_H
diff --git a/include/MantleAPI/EnvironmentalConditions/road_condition.h b/include/MantleAPI/EnvironmentalConditions/road_condition.h
index a9e3c8d394120bd14fc151f1b626ee3ed85a7c97..dbea4b068b93173e2a562015197a11d7f1f77553 100644
--- a/include/MantleAPI/EnvironmentalConditions/road_condition.h
+++ b/include/MantleAPI/EnvironmentalConditions/road_condition.h
@@ -12,8 +12,8 @@
 /** @file  road_condition.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_ENVIRONMENTALCONDITIONS_ROADCONDITION_H
-#define MANTLEAPI_ENVIRONMENTALCONDITIONS_ROADCONDITION_H
+#ifndef MANTLEAPI_ENVIRONMENTALCONDITIONS_ROAD_CONDITION_H
+#define MANTLEAPI_ENVIRONMENTALCONDITIONS_ROAD_CONDITION_H
 
 #include <MantleAPI/Common/position.h>
 #include <units.h>
@@ -32,4 +32,4 @@ struct FrictionPatch
   units::concentration::percent_t friction{100.0};
 };
 }  // namespace mantle_api
-#endif  // MANTLEAPI_ENVIRONMENTALCONDITIONS_ROADCONDITION_H
+#endif  // MANTLEAPI_ENVIRONMENTALCONDITIONS_ROAD_CONDITION_H
diff --git a/include/MantleAPI/Execution/i_environment.h b/include/MantleAPI/Execution/i_environment.h
index f3e33a01c48576d4d4ae7769724dba53f73147bc..2b24453446d7be5a6d86b454467d2f8882f6e550 100644
--- a/include/MantleAPI/Execution/i_environment.h
+++ b/include/MantleAPI/Execution/i_environment.h
@@ -12,8 +12,8 @@
 /** @file  i_environment.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_EXECUTION_IENVIRONMENT_H
-#define MANTLEAPI_EXECUTION_IENVIRONMENT_H
+#ifndef MANTLEAPI_EXECUTION_I_ENVIRONMENT_H
+#define MANTLEAPI_EXECUTION_I_ENVIRONMENT_H
 
 #include <MantleAPI/Common/i_geometry_helper.h>
 #include <MantleAPI/Common/route_definition.h>
@@ -48,7 +48,7 @@ public:
   ///
   /// @param entity The entity to be manipulated by the specified controller.
   /// @param controller_id Identifies the controller to manipulate the entity.
-  virtual void AddEntityToController(IEntity& entity, UniqueId controller_id) = 0;
+  virtual void AddEntityToController(IEntity* entity, UniqueId controller_id) = 0;
 
   virtual void RemoveControllerFromEntity(UniqueId entity_id) = 0;
 
@@ -119,4 +119,4 @@ public:
 };
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_EXECUTION_IENVIRONMENT_H
+#endif  // MANTLEAPI_EXECUTION_I_ENVIRONMENT_H
diff --git a/include/MantleAPI/Execution/i_scenario_engine.h b/include/MantleAPI/Execution/i_scenario_engine.h
index 0c0015603dde70a63413393e064c4d8f5ba18b73..f4cbff8184fb6c8fba25267fc3778d918d077b5b 100644
--- a/include/MantleAPI/Execution/i_scenario_engine.h
+++ b/include/MantleAPI/Execution/i_scenario_engine.h
@@ -12,8 +12,8 @@
 /** @file  i_scenario_engine.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_EXECUTION_ISCENARIOENGINE_H
-#define MANTLEAPI_EXECUTION_ISCENARIOENGINE_H
+#ifndef MANTLEAPI_EXECUTION_I_SCENARIO_ENGINE_H
+#define MANTLEAPI_EXECUTION_I_SCENARIO_ENGINE_H
 
 #include <MantleAPI/Execution/scenario_info.h>
 
@@ -51,4 +51,4 @@ public:
 };
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_EXECUTION_ISCENARIOENGINE_H
+#endif  // MANTLEAPI_EXECUTION_I_SCENARIO_ENGINE_H
diff --git a/include/MantleAPI/Execution/scenario_info.h b/include/MantleAPI/Execution/scenario_info.h
index 43670dbf90961bd71177ea29ed7dff68890e433f..6f5f374f1d312e82de57ba3e56b08bc10a3adbba 100644
--- a/include/MantleAPI/Execution/scenario_info.h
+++ b/include/MantleAPI/Execution/scenario_info.h
@@ -12,8 +12,8 @@
 /** @file  scenario_info.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_EXECUTION_SCENARIOINFO_H
-#define MANTLEAPI_EXECUTION_SCENARIOINFO_H
+#ifndef MANTLEAPI_EXECUTION_SCENARIO_INFO_H
+#define MANTLEAPI_EXECUTION_SCENARIO_INFO_H
 
 #include <MantleAPI/Common/time_utils.h>
 
@@ -31,4 +31,4 @@ struct ScenarioInfo
 
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_EXECUTION_SCENARIOINFO_H
+#endif  // MANTLEAPI_EXECUTION_SCENARIO_INFO_H
diff --git a/include/MantleAPI/Map/i_coord_converter.h b/include/MantleAPI/Map/i_coord_converter.h
index bdb6fe5b3da0f0a6bd15fbe445054dceae6903e6..1b03af12dd18d35309ccdf5b231b29296f759e1b 100644
--- a/include/MantleAPI/Map/i_coord_converter.h
+++ b/include/MantleAPI/Map/i_coord_converter.h
@@ -12,8 +12,8 @@
 /** @file  i_coord_converter.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_MAP_ICOORDCONVERTER_H
-#define MANTLEAPI_MAP_ICOORDCONVERTER_H
+#ifndef MANTLEAPI_MAP_I_COORD_CONVERTER_H
+#define MANTLEAPI_MAP_I_COORD_CONVERTER_H
 
 #include <MantleAPI/Common/position.h>
 #include <MantleAPI/Common/vector.h>
@@ -33,4 +33,4 @@ public:
 
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_MAP_ICOORDCONVERTER_H
+#endif  // MANTLEAPI_MAP_I_COORD_CONVERTER_H
diff --git a/include/MantleAPI/Map/i_lane_location_query_service.h b/include/MantleAPI/Map/i_lane_location_query_service.h
index 505f83f792caca0ba70c649e563874eaa5942403..61eaef358730694902e0b9435284e786f43788fb 100644
--- a/include/MantleAPI/Map/i_lane_location_query_service.h
+++ b/include/MantleAPI/Map/i_lane_location_query_service.h
@@ -12,8 +12,8 @@
 /** @file  i_lane_location_query_service.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_MAP_ILANELOCATIONQUERYSERVICE_H
-#define MANTLEAPI_MAP_ILANELOCATIONQUERYSERVICE_H
+#ifndef MANTLEAPI_MAP_I_LANE_LOCATION_QUERY_SERVICE_H
+#define MANTLEAPI_MAP_I_LANE_LOCATION_QUERY_SERVICE_H
 
 #include <MantleAPI/Common/i_identifiable.h>
 #include <MantleAPI/Common/orientation.h>
@@ -145,4 +145,4 @@ public:
 
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_MAP_ILANELOCATIONQUERYSERVICE_H
+#endif  // MANTLEAPI_MAP_I_LANE_LOCATION_QUERY_SERVICE_H
diff --git a/include/MantleAPI/Map/i_route.h b/include/MantleAPI/Map/i_route.h
index 1b4ebbda339ac0077980d3d26802a362b1f1ec6b..eee882f8d28b8347236aa1a39e84ef52cb2401f4 100644
--- a/include/MantleAPI/Map/i_route.h
+++ b/include/MantleAPI/Map/i_route.h
@@ -12,8 +12,8 @@
 /** @file  i_route.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_MAP_IROUTE_H
-#define MANTLEAPI_MAP_IROUTE_H
+#ifndef MANTLEAPI_MAP_I_ROUTE_H
+#define MANTLEAPI_MAP_I_ROUTE_H
 
 #include <MantleAPI/Common/i_identifiable.h>
 #include <MantleAPI/Common/vector.h>
@@ -40,4 +40,4 @@ public:
 
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_MAP_IROUTE_H
+#endif  // MANTLEAPI_MAP_I_ROUTE_H
diff --git a/include/MantleAPI/Map/map_details.h b/include/MantleAPI/Map/map_details.h
index 3f62e1b0aedff19d48caed18ae8869ffbb85d42a..64b118bda9e7149e7b5ef184ef64e0dcc4f0d4d9 100644
--- a/include/MantleAPI/Map/map_details.h
+++ b/include/MantleAPI/Map/map_details.h
@@ -12,8 +12,8 @@
 /** @file  map_details.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_MAP_MAPDETAILS_H
-#define MANTLEAPI_MAP_MAPDETAILS_H
+#ifndef MANTLEAPI_MAP_MAP_DETAILS_H
+#define MANTLEAPI_MAP_MAP_DETAILS_H
 
 #include <MantleAPI/Common/position.h>
 
@@ -29,4 +29,4 @@ struct MapDetails
 };
 
 }  // namespace mantle_api
-#endif  // MANTLEAPI_MAP_MAPDETAILS_H
+#endif  // MANTLEAPI_MAP_MAP_DETAILS_H
diff --git a/include/MantleAPI/Traffic/control_strategy.h b/include/MantleAPI/Traffic/control_strategy.h
index 85f87a5962b01324b1e66bf5564c445237a30796..89e3e25d9c6d5ab98dc56f5f631e84782fe41556 100644
--- a/include/MantleAPI/Traffic/control_strategy.h
+++ b/include/MantleAPI/Traffic/control_strategy.h
@@ -12,8 +12,8 @@
 /** @file  control_strategy.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_TRAFFIC_CONTROLSTRATEGY_H
-#define MANTLEAPI_TRAFFIC_CONTROLSTRATEGY_H
+#ifndef MANTLEAPI_TRAFFIC_CONTROL_STRATEGY_H
+#define MANTLEAPI_TRAFFIC_CONTROL_STRATEGY_H
 
 #include <MantleAPI/Common/i_identifiable.h>
 #include <MantleAPI/Common/spline.h>
@@ -228,4 +228,4 @@ struct PerformLaneChangeControlStrategy : public ControlStrategy
 
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_TRAFFIC_CONTROLSTRATEGY_H
+#endif  // MANTLEAPI_TRAFFIC_CONTROL_STRATEGY_H
diff --git a/include/MantleAPI/Traffic/default_routing_behavior.h b/include/MantleAPI/Traffic/default_routing_behavior.h
index cb5604c1efc17ac6f1f005e8649fbea02d513dfa..4c70ceaff06adc8247eb1bb57208a763acc5abba 100644
--- a/include/MantleAPI/Traffic/default_routing_behavior.h
+++ b/include/MantleAPI/Traffic/default_routing_behavior.h
@@ -22,4 +22,4 @@ enum class DefaultRoutingBehavior
 
 }
 
-#endif //MANTLEAPI_TRAFFIC_DEFAULT_ROUTING_BEHAVIOR_H
\ No newline at end of file
+#endif  // MANTLEAPI_TRAFFIC_DEFAULT_ROUTING_BEHAVIOR_H
\ No newline at end of file
diff --git a/include/MantleAPI/Traffic/entity_properties.h b/include/MantleAPI/Traffic/entity_properties.h
index 65c3b5e4be8b715c1e12765a27a5154cdfedc7e6..e40094d6a1aa9f5b56742ca1786ff96dce31c018 100644
--- a/include/MantleAPI/Traffic/entity_properties.h
+++ b/include/MantleAPI/Traffic/entity_properties.h
@@ -12,8 +12,8 @@
 /** @file  entity_properties.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_TRAFFIC_ENTITYPROPERTIES_H
-#define MANTLEAPI_TRAFFIC_ENTITYPROPERTIES_H
+#ifndef MANTLEAPI_TRAFFIC_ENTITY_PROPERTIES_H
+#define MANTLEAPI_TRAFFIC_ENTITY_PROPERTIES_H
 
 #include <MantleAPI/Common/bounding_box.h>
 #include <MantleAPI/Common/floating_point_helper.h>
@@ -185,4 +185,4 @@ struct StaticObjectProperties : public EntityProperties
 
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_TRAFFIC_ENTITYPROPERTIES_H
+#endif  // MANTLEAPI_TRAFFIC_ENTITY_PROPERTIES_H
diff --git a/include/MantleAPI/Traffic/i_controller.h b/include/MantleAPI/Traffic/i_controller.h
index fd4a5eb068a49064c003814768951afe1c2aa4fe..33b6066c0cb793ca9529ebdc84d912f3e515d0da 100644
--- a/include/MantleAPI/Traffic/i_controller.h
+++ b/include/MantleAPI/Traffic/i_controller.h
@@ -1,3 +1,6 @@
+#ifndef MANTLEAPI_TRAFFIC_I_CONTROLLER_H
+#define MANTLEAPI_TRAFFIC_I_CONTROLLER_H
+
 /********************************************************************************
  * Copyright (c) 2021 in-tech GmbH
  *
@@ -23,4 +26,5 @@ class IController : public IIdentifiable
 {
 };
 
-}  // namespace mantle_api
\ No newline at end of file
+}  // namespace mantle_api
+#endif
diff --git a/include/MantleAPI/Traffic/i_controller_config.h b/include/MantleAPI/Traffic/i_controller_config.h
index 946197252fc3aceee976004e5f31d84d230cd333..ce35330991812a507ce3eaba15601c23332a1eaa 100644
--- a/include/MantleAPI/Traffic/i_controller_config.h
+++ b/include/MantleAPI/Traffic/i_controller_config.h
@@ -12,8 +12,8 @@
 /** @file  i_controller_config.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_TRAFFIC_ICONTROLLERCONFIG_H
-#define MANTLEAPI_TRAFFIC_ICONTROLLERCONFIG_H
+#ifndef MANTLEAPI_TRAFFIC_I_CONTROLLER_CONFIG_H
+#define MANTLEAPI_TRAFFIC_I_CONTROLLER_CONFIG_H
 
 #include <MantleAPI/Common/route_definition.h>
 #include <MantleAPI/Common/spline.h>
@@ -86,4 +86,4 @@ struct ExternalControllerConfig : public IControllerConfig
 
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_TRAFFIC_ICONTROLLERCONFIG_H
+#endif  // MANTLEAPI_TRAFFIC_I_CONTROLLER_CONFIG_H
diff --git a/include/MantleAPI/Traffic/i_controller_repository.h b/include/MantleAPI/Traffic/i_controller_repository.h
index 1ccec9e256da466ba369669b4dd0a77e9db312c8..d245c9a25647c9153665c93622958119ed482e88 100644
--- a/include/MantleAPI/Traffic/i_controller_repository.h
+++ b/include/MantleAPI/Traffic/i_controller_repository.h
@@ -1,3 +1,6 @@
+#ifndef MANTLEAPI_TRAFFIC_I_CONTROLLER_REPOSITORY_H
+#define MANTLEAPI_TRAFFIC_I_CONTROLLER_REPOSITORY_H
+
 /********************************************************************************
  * Copyright (c) 2021 in-tech GmbH
  *
@@ -33,4 +36,5 @@ public:
 
 };
 
-}  // namespace mantle_api
\ No newline at end of file
+}  // namespace mantle_api
+#endif
diff --git a/include/MantleAPI/Traffic/i_entity.h b/include/MantleAPI/Traffic/i_entity.h
index c13881e205f3d5b04893200e7c799b78830d1772..3918b9d2c9bd38e428d2b026770ed364527793a9 100644
--- a/include/MantleAPI/Traffic/i_entity.h
+++ b/include/MantleAPI/Traffic/i_entity.h
@@ -12,8 +12,8 @@
 /** @file  i_entity.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_TRAFFIC_IENTITY_H
-#define MANTLEAPI_TRAFFIC_IENTITY_H
+#ifndef MANTLEAPI_TRAFFIC_I_ENTITY_H
+#define MANTLEAPI_TRAFFIC_I_ENTITY_H
 
 #include <MantleAPI/Common/bounding_box.h>
 #include <MantleAPI/Common/i_identifiable.h>
@@ -86,7 +86,7 @@ public:
 class IVehicle : public virtual IEntity
 {
 public:
-  virtual VehicleProperties* GetProperties() const = 0;
+  VehicleProperties* GetProperties() const override = 0;
 
   virtual void SetIndicatorState(IndicatorState state) = 0;
   virtual IndicatorState GetIndicatorState() const = 0;
@@ -98,15 +98,15 @@ public:
 class IPedestrian : public virtual IEntity
 {
 public:
-  virtual PedestrianProperties* GetProperties() const = 0;
+  PedestrianProperties* GetProperties() const override = 0;
 };
 
 class IStaticObject : public virtual IEntity
 {
 public:
-  virtual StaticObjectProperties* GetProperties() const = 0;
+  StaticObjectProperties* GetProperties() const override = 0;
 };
 
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_TRAFFIC_IENTITY_H
+#endif  // MANTLEAPI_TRAFFIC_I_ENTITY_H
diff --git a/include/MantleAPI/Traffic/i_entity_repository.h b/include/MantleAPI/Traffic/i_entity_repository.h
index 7a83b561da31bb7b12afb9e5f1bee232e5107ef5..080d38277fef0e486d3cba85b69e5c2015701eb2 100644
--- a/include/MantleAPI/Traffic/i_entity_repository.h
+++ b/include/MantleAPI/Traffic/i_entity_repository.h
@@ -12,8 +12,8 @@
 /** @file  i_entity_repository.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_TRAFFIC_IENTITYREPOSITORY_H
-#define MANTLEAPI_TRAFFIC_IENTITYREPOSITORY_H
+#ifndef MANTLEAPI_TRAFFIC_I_ENTITY_REPOSITORY_H
+#define MANTLEAPI_TRAFFIC_I_ENTITY_REPOSITORY_H
 
 #include <MantleAPI/Traffic/entity_properties.h>
 #include <MantleAPI/Traffic/i_entity.h>
@@ -55,4 +55,4 @@ public:
 
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_TRAFFIC_IENTITYREPOSITORY_H
+#endif  // MANTLEAPI_TRAFFIC_I_ENTITY_REPOSITORY_H
diff --git a/include/MantleAPI/Traffic/traffic_light_properties.h b/include/MantleAPI/Traffic/traffic_light_properties.h
index 593a7f3f6c6814cb6441a3b4a7a86d48a8d82e03..a6c13f7a0c945fdd0bbe12e2470b7968e1d134db 100644
--- a/include/MantleAPI/Traffic/traffic_light_properties.h
+++ b/include/MantleAPI/Traffic/traffic_light_properties.h
@@ -12,8 +12,8 @@
 /** @file  traffic_light_properties.h */
 //-----------------------------------------------------------------------------
 
-#ifndef MANTLEAPI_TRAFFIC_TRAFFICLIGHTPROPERTIES_H
-#define MANTLEAPI_TRAFFIC_TRAFFICLIGHTPROPERTIES_H
+#ifndef MANTLEAPI_TRAFFIC_TRAFFIC_LIGHT_PROPERTIES_H
+#define MANTLEAPI_TRAFFIC_TRAFFIC_LIGHT_PROPERTIES_H
 
 #include <MantleAPI/Common/time_utils.h>
 #include <vector>
@@ -56,4 +56,4 @@ struct TrafficLightPhase
 
 }  // namespace mantle_api
 
-#endif  // MANTLEAPI_TRAFFIC_TRAFFICLIGHTPROPERTIES_H
+#endif  // MANTLEAPI_TRAFFIC_TRAFFIC_LIGHT_PROPERTIES_H