From a2a2c856e9cc80ef604d2ce49b0dbea9d4dae570 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 2 May 2023 16:25:12 -0700
Subject: [PATCH] Use ignition::gazebo:: in class instantiation (#1967)

Fixes macOS build.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 src/EntityComponentManager.cc                                 | 2 +-
 src/Link.cc                                                   | 2 +-
 src/Model.cc                                                  | 2 +-
 src/SdfEntityCreator.cc                                       | 2 +-
 src/ServerConfig.cc                                           | 4 ++--
 src/SystemLoader.cc                                           | 2 +-
 src/TestFixture.cc                                            | 2 +-
 src/World.cc                                                  | 2 +-
 src/rendering/MarkerManager.cc                                | 2 +-
 src/rendering/RenderUtil.cc                                   | 2 +-
 src/rendering/SceneManager.cc                                 | 2 +-
 src/systems/ackermann_steering/AckermannSteering.cc           | 2 +-
 src/systems/air_pressure/AirPressure.cc                       | 2 +-
 src/systems/altimeter/Altimeter.cc                            | 2 +-
 src/systems/apply_joint_force/ApplyJointForce.cc              | 2 +-
 src/systems/apply_link_wrench/ApplyLinkWrench.cc              | 2 +-
 src/systems/battery_plugin/LinearBatteryPlugin.cc             | 2 +-
 src/systems/buoyancy/Buoyancy.cc                              | 2 +-
 src/systems/camera_video_recorder/CameraVideoRecorder.cc      | 2 +-
 src/systems/collada_world_exporter/ColladaWorldExporter.cc    | 2 +-
 src/systems/contact/Contact.cc                                | 2 +-
 src/systems/diff_drive/DiffDrive.cc                           | 2 +-
 src/systems/imu/Imu.cc                                        | 2 +-
 src/systems/joint_controller/JointController.cc               | 2 +-
 .../joint_position_controller/JointPositionController.cc      | 2 +-
 src/systems/kinetic_energy_monitor/KineticEnergyMonitor.cc    | 2 +-
 src/systems/lift_drag/LiftDrag.cc                             | 2 +-
 src/systems/log/LogPlayback.cc                                | 2 +-
 src/systems/log/LogRecord.cc                                  | 2 +-
 src/systems/log_video_recorder/LogVideoRecorder.cc            | 2 +-
 .../logical_audio_sensor_plugin/LogicalAudioSensorPlugin.cc   | 2 +-
 src/systems/logical_camera/LogicalCamera.cc                   | 2 +-
 src/systems/magnetometer/Magnetometer.cc                      | 2 +-
 src/systems/multicopter_motor_model/MulticopterMotorModel.cc  | 2 +-
 src/systems/physics/Physics.cc                                | 2 +-
 src/systems/pose_publisher/PosePublisher.cc                   | 2 +-
 src/systems/scene_broadcaster/SceneBroadcaster.cc             | 2 +-
 src/systems/sensors/Sensors.cc                                | 2 +-
 src/systems/thermal/Thermal.cc                                | 2 +-
 src/systems/touch_plugin/TouchPlugin.cc                       | 2 +-
 src/systems/track_controller/TrackController.cc               | 2 +-
 src/systems/tracked_vehicle/TrackedVehicle.cc                 | 2 +-
 src/systems/user_commands/UserCommands.cc                     | 2 +-
 src/systems/velocity_control/VelocityControl.cc               | 2 +-
 src/systems/wheel_slip/WheelSlip.cc                           | 2 +-
 src/systems/wind_effects/WindEffects.cc                       | 2 +-
 46 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/EntityComponentManager.cc b/src/EntityComponentManager.cc
index 67c76857ec..916ac90781 100644
--- a/src/EntityComponentManager.cc
+++ b/src/EntityComponentManager.cc
@@ -32,7 +32,7 @@
 using namespace gz;
 using namespace gz::sim;
 
-class gz::sim::EntityComponentManagerPrivate
+class ignition::gazebo::EntityComponentManagerPrivate
 {
   /// \brief Implementation of the CreateEntity function, which takes a specific
   /// entity as input.
diff --git a/src/Link.cc b/src/Link.cc
index 904d769d98..491e40210e 100644
--- a/src/Link.cc
+++ b/src/Link.cc
@@ -36,7 +36,7 @@
 
 #include "gz/sim/Link.hh"
 
-class gz::sim::LinkPrivate
+class ignition::gazebo::LinkPrivate
 {
   /// \brief Id of link entity.
   public: Entity id{kNullEntity};
diff --git a/src/Model.cc b/src/Model.cc
index 5f63074151..d4d0d6653e 100644
--- a/src/Model.cc
+++ b/src/Model.cc
@@ -28,7 +28,7 @@
 #include "gz/sim/components/WindMode.hh"
 #include "gz/sim/Model.hh"
 
-class gz::sim::ModelPrivate
+class ignition::gazebo::ModelPrivate
 {
   /// \brief Id of model entity.
   public: Entity id{kNullEntity};
diff --git a/src/SdfEntityCreator.cc b/src/SdfEntityCreator.cc
index e40978a5b5..8b5f9698f3 100644
--- a/src/SdfEntityCreator.cc
+++ b/src/SdfEntityCreator.cc
@@ -70,7 +70,7 @@
 #include "gz/sim/components/WindMode.hh"
 #include "gz/sim/components/World.hh"
 
-class gz::sim::SdfEntityCreatorPrivate
+class ignition::gazebo::SdfEntityCreatorPrivate
 {
   /// \brief Pointer to entity component manager. We don't assume ownership.
   public: EntityComponentManager *ecm{nullptr};
diff --git a/src/ServerConfig.cc b/src/ServerConfig.cc
index f61447e839..5535ea62d6 100644
--- a/src/ServerConfig.cc
+++ b/src/ServerConfig.cc
@@ -31,7 +31,7 @@ using namespace gz;
 using namespace gz::sim;
 
 /// \brief Private data for PluginInfoConfig.
-class gz::sim::ServerConfig::PluginInfoPrivate
+class ignition::gazebo::ServerConfig::PluginInfoPrivate
 {
   /// \brief Default constructor.
   public: PluginInfoPrivate() = default;
@@ -192,7 +192,7 @@ void ServerConfig::PluginInfo::SetSdf(const sdf::ElementPtr &_sdf)
 }
 
 /// \brief Private data for ServerConfig.
-class gz::sim::ServerConfigPrivate
+class ignition::gazebo::ServerConfigPrivate
 {
   /// \brief Default constructor.
   public: ServerConfigPrivate()
diff --git a/src/SystemLoader.cc b/src/SystemLoader.cc
index 72d8ac701b..f63dcb427a 100644
--- a/src/SystemLoader.cc
+++ b/src/SystemLoader.cc
@@ -35,7 +35,7 @@
 
 using namespace gz::sim;
 
-class gz::sim::SystemLoaderPrivate
+class ignition::gazebo::SystemLoaderPrivate
 {
   //////////////////////////////////////////////////
   public: explicit SystemLoaderPrivate() = default;
diff --git a/src/TestFixture.cc b/src/TestFixture.cc
index dafd7b94d2..7e05455ed2 100644
--- a/src/TestFixture.cc
+++ b/src/TestFixture.cc
@@ -106,7 +106,7 @@ void HelperSystem::PostUpdate(const UpdateInfo &_info,
 }
 
 //////////////////////////////////////////////////
-class gz::sim::TestFixturePrivate
+class ignition::gazebo::TestFixturePrivate
 {
   /// \brief Initialize fixture
   /// \param[in] _config Server config
diff --git a/src/World.cc b/src/World.cc
index 5f776f0551..002e5729a9 100644
--- a/src/World.cc
+++ b/src/World.cc
@@ -28,7 +28,7 @@
 #include "gz/sim/components/World.hh"
 #include "gz/sim/World.hh"
 
-class gz::sim::WorldPrivate
+class ignition::gazebo::WorldPrivate
 {
   /// \brief Id of world entity.
   public: Entity id{kNullEntity};
diff --git a/src/rendering/MarkerManager.cc b/src/rendering/MarkerManager.cc
index 1c057e3720..3e06e7c935 100644
--- a/src/rendering/MarkerManager.cc
+++ b/src/rendering/MarkerManager.cc
@@ -37,7 +37,7 @@ using namespace gz;
 using namespace gz::sim;
 
 /// Private data for the MarkerManager class
-class gz::sim::MarkerManagerPrivate
+class ignition::gazebo::MarkerManagerPrivate
 {
   /// \brief Processes a marker message.
   /// \param[in] _msg The message data.
diff --git a/src/rendering/RenderUtil.cc b/src/rendering/RenderUtil.cc
index f35c6bedfa..d29dbd56b2 100644
--- a/src/rendering/RenderUtil.cc
+++ b/src/rendering/RenderUtil.cc
@@ -75,7 +75,7 @@ using namespace gz;
 using namespace gz::sim;
 
 // Private data class.
-class gz::sim::RenderUtilPrivate
+class ignition::gazebo::RenderUtilPrivate
 {
   /// True if the rendering component is initialized
   public: bool initialized = false;
diff --git a/src/rendering/SceneManager.cc b/src/rendering/SceneManager.cc
index 67c93485c4..2a1f7e509c 100644
--- a/src/rendering/SceneManager.cc
+++ b/src/rendering/SceneManager.cc
@@ -50,7 +50,7 @@ using namespace gz::sim;
 using namespace std::chrono_literals;
 
 /// \brief Private data class.
-class gz::sim::SceneManagerPrivate
+class ignition::gazebo::SceneManagerPrivate
 {
   /// \brief Keep track of world ID, which is equivalent to the scene's
   /// root visual.
diff --git a/src/systems/ackermann_steering/AckermannSteering.cc b/src/systems/ackermann_steering/AckermannSteering.cc
index dbc8225e66..5d61fca244 100644
--- a/src/systems/ackermann_steering/AckermannSteering.cc
+++ b/src/systems/ackermann_steering/AckermannSteering.cc
@@ -54,7 +54,7 @@ struct Commands
   Commands() : lin(0.0), ang(0.0) {}
 };
 
-class gz::sim::systems::AckermannSteeringPrivate
+class ignition::gazebo::systems::AckermannSteeringPrivate
 {
   /// \brief Callback for velocity subscription
   /// \param[in] _msg Velocity message
diff --git a/src/systems/air_pressure/AirPressure.cc b/src/systems/air_pressure/AirPressure.cc
index 6e47bcd7bf..a28b44f7d9 100644
--- a/src/systems/air_pressure/AirPressure.cc
+++ b/src/systems/air_pressure/AirPressure.cc
@@ -48,7 +48,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private AirPressure data class.
-class gz::sim::systems::AirPressurePrivate
+class ignition::gazebo::systems::AirPressurePrivate
 {
   /// \brief A map of air pressure entity to its sensor
   public: std::unordered_map<Entity,
diff --git a/src/systems/altimeter/Altimeter.cc b/src/systems/altimeter/Altimeter.cc
index c4134a4f95..29427048c0 100644
--- a/src/systems/altimeter/Altimeter.cc
+++ b/src/systems/altimeter/Altimeter.cc
@@ -50,7 +50,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private Altimeter data class.
-class gz::sim::systems::AltimeterPrivate
+class ignition::gazebo::systems::AltimeterPrivate
 {
   /// \brief A map of altimeter entity to its sensor
   public: std::unordered_map<Entity,
diff --git a/src/systems/apply_joint_force/ApplyJointForce.cc b/src/systems/apply_joint_force/ApplyJointForce.cc
index 036cd8d0cb..c454ca5458 100644
--- a/src/systems/apply_joint_force/ApplyJointForce.cc
+++ b/src/systems/apply_joint_force/ApplyJointForce.cc
@@ -30,7 +30,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::ApplyJointForcePrivate
+class ignition::gazebo::systems::ApplyJointForcePrivate
 {
   /// \brief Callback for joint force subscription
   /// \param[in] _msg Joint force message
diff --git a/src/systems/apply_link_wrench/ApplyLinkWrench.cc b/src/systems/apply_link_wrench/ApplyLinkWrench.cc
index 7ca6a3bc6c..295dd8e644 100644
--- a/src/systems/apply_link_wrench/ApplyLinkWrench.cc
+++ b/src/systems/apply_link_wrench/ApplyLinkWrench.cc
@@ -41,7 +41,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::ApplyLinkWrenchPrivate
+class ignition::gazebo::systems::ApplyLinkWrenchPrivate
 {
   /// \brief Callback for wrench subscription
   /// \param[in] _msg Wrench message
diff --git a/src/systems/battery_plugin/LinearBatteryPlugin.cc b/src/systems/battery_plugin/LinearBatteryPlugin.cc
index e8944f54bb..d7d906df66 100644
--- a/src/systems/battery_plugin/LinearBatteryPlugin.cc
+++ b/src/systems/battery_plugin/LinearBatteryPlugin.cc
@@ -52,7 +52,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::LinearBatteryPluginPrivate
+class ignition::gazebo::systems::LinearBatteryPluginPrivate
 {
   /// \brief Reset the plugin
   public: void Reset();
diff --git a/src/systems/buoyancy/Buoyancy.cc b/src/systems/buoyancy/Buoyancy.cc
index adbbdf6e15..f341ff3a22 100644
--- a/src/systems/buoyancy/Buoyancy.cc
+++ b/src/systems/buoyancy/Buoyancy.cc
@@ -52,7 +52,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::BuoyancyPrivate
+class ignition::gazebo::systems::BuoyancyPrivate
 {
   /// \brief Get the fluid density based on a pose. This function can be
   /// used to adjust the fluid density based on the pose of an object in the
diff --git a/src/systems/camera_video_recorder/CameraVideoRecorder.cc b/src/systems/camera_video_recorder/CameraVideoRecorder.cc
index 18d2b9ca0b..dcfe5f13e9 100644
--- a/src/systems/camera_video_recorder/CameraVideoRecorder.cc
+++ b/src/systems/camera_video_recorder/CameraVideoRecorder.cc
@@ -51,7 +51,7 @@ using namespace gz::sim;
 using namespace systems;
 
 // Private data class.
-class gz::sim::systems::CameraVideoRecorderPrivate
+class ignition::gazebo::systems::CameraVideoRecorderPrivate
 {
   /// \brief Callback for the video recorder service
   public: bool OnRecordVideo(const msgs::VideoRecord &_msg,
diff --git a/src/systems/collada_world_exporter/ColladaWorldExporter.cc b/src/systems/collada_world_exporter/ColladaWorldExporter.cc
index fff1f5337a..2c8e21fecb 100644
--- a/src/systems/collada_world_exporter/ColladaWorldExporter.cc
+++ b/src/systems/collada_world_exporter/ColladaWorldExporter.cc
@@ -53,7 +53,7 @@ using namespace gz::sim;
 using namespace systems;
 
 
-class gz::sim::systems::ColladaWorldExporterPrivate
+class ignition::gazebo::systems::ColladaWorldExporterPrivate
 {
   // Default constructor
   public: ColladaWorldExporterPrivate() = default;
diff --git a/src/systems/contact/Contact.cc b/src/systems/contact/Contact.cc
index 4d85889ac5..0487c6d3e9 100644
--- a/src/systems/contact/Contact.cc
+++ b/src/systems/contact/Contact.cc
@@ -81,7 +81,7 @@ class ContactSensor
   public: std::vector<Entity> collisionEntities;
 };
 
-class gz::sim::systems::ContactPrivate
+class ignition::gazebo::systems::ContactPrivate
 {
   /// \brief Create sensors that correspond to entities in the simulation
   /// \param[in] _ecm Mutable reference to ECM.
diff --git a/src/systems/diff_drive/DiffDrive.cc b/src/systems/diff_drive/DiffDrive.cc
index ae0878d663..e2fc82492b 100644
--- a/src/systems/diff_drive/DiffDrive.cc
+++ b/src/systems/diff_drive/DiffDrive.cc
@@ -53,7 +53,7 @@ struct Commands
   Commands() : lin(0.0), ang(0.0) {}
 };
 
-class gz::sim::systems::DiffDrivePrivate
+class ignition::gazebo::systems::DiffDrivePrivate
 {
   /// \brief Callback for velocity subscription
   /// \param[in] _msg Velocity message
diff --git a/src/systems/imu/Imu.cc b/src/systems/imu/Imu.cc
index d596bb79bf..ce384d69ab 100644
--- a/src/systems/imu/Imu.cc
+++ b/src/systems/imu/Imu.cc
@@ -48,7 +48,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private Imu data class.
-class gz::sim::systems::ImuPrivate
+class ignition::gazebo::systems::ImuPrivate
 {
   /// \brief A map of IMU entity to its IMU sensor.
   public: std::unordered_map<Entity,
diff --git a/src/systems/joint_controller/JointController.cc b/src/systems/joint_controller/JointController.cc
index 291ea31ae2..a7903f8179 100644
--- a/src/systems/joint_controller/JointController.cc
+++ b/src/systems/joint_controller/JointController.cc
@@ -35,7 +35,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::JointControllerPrivate
+class ignition::gazebo::systems::JointControllerPrivate
 {
   /// \brief Callback for velocity subscription
   /// \param[in] _msg Velocity message
diff --git a/src/systems/joint_position_controller/JointPositionController.cc b/src/systems/joint_position_controller/JointPositionController.cc
index 27c67c6dc1..fd105782b2 100644
--- a/src/systems/joint_position_controller/JointPositionController.cc
+++ b/src/systems/joint_position_controller/JointPositionController.cc
@@ -35,7 +35,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::JointPositionControllerPrivate
+class ignition::gazebo::systems::JointPositionControllerPrivate
 {
   /// \brief Callback for position subscription
   /// \param[in] _msg Position message
diff --git a/src/systems/kinetic_energy_monitor/KineticEnergyMonitor.cc b/src/systems/kinetic_energy_monitor/KineticEnergyMonitor.cc
index de28a21d03..b412902a7d 100644
--- a/src/systems/kinetic_energy_monitor/KineticEnergyMonitor.cc
+++ b/src/systems/kinetic_energy_monitor/KineticEnergyMonitor.cc
@@ -43,7 +43,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private data class
-class gz::sim::systems::KineticEnergyMonitorPrivate
+class ignition::gazebo::systems::KineticEnergyMonitorPrivate
 {
   /// \brief Link of the model.
   public: Entity linkEntity;
diff --git a/src/systems/lift_drag/LiftDrag.cc b/src/systems/lift_drag/LiftDrag.cc
index bfeb37551e..64fb82f383 100644
--- a/src/systems/lift_drag/LiftDrag.cc
+++ b/src/systems/lift_drag/LiftDrag.cc
@@ -44,7 +44,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::LiftDragPrivate
+class ignition::gazebo::systems::LiftDragPrivate
 {
   // Initialize the system
   public: void Load(const EntityComponentManager &_ecm,
diff --git a/src/systems/log/LogPlayback.cc b/src/systems/log/LogPlayback.cc
index 813417051f..5b72a4eb05 100644
--- a/src/systems/log/LogPlayback.cc
+++ b/src/systems/log/LogPlayback.cc
@@ -53,7 +53,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private LogPlayback data class.
-class gz::sim::systems::LogPlaybackPrivate
+class ignition::gazebo::systems::LogPlaybackPrivate
 {
   /// \brief Extract model resource files and state file from compression.
   /// \return True if extraction was successful.
diff --git a/src/systems/log/LogRecord.cc b/src/systems/log/LogRecord.cc
index 8b3b3fee87..6538de0c73 100644
--- a/src/systems/log/LogRecord.cc
+++ b/src/systems/log/LogRecord.cc
@@ -65,7 +65,7 @@ using namespace gz;
 using namespace ignition::gazebo::systems;
 
 // Private data class.
-class gz::sim::systems::LogRecordPrivate
+class ignition::gazebo::systems::LogRecordPrivate
 {
   /// \brief Start recording
   /// \param[in] _logPath Path to record to.
diff --git a/src/systems/log_video_recorder/LogVideoRecorder.cc b/src/systems/log_video_recorder/LogVideoRecorder.cc
index 3577000819..3013c97f30 100644
--- a/src/systems/log_video_recorder/LogVideoRecorder.cc
+++ b/src/systems/log_video_recorder/LogVideoRecorder.cc
@@ -45,7 +45,7 @@ using namespace gz::sim;
 using namespace systems;
 
 // Private data class.
-class gz::sim::systems::LogVideoRecorderPrivate
+class ignition::gazebo::systems::LogVideoRecorderPrivate
 {
   /// \brief Rewind the log
   public: void Rewind();
diff --git a/src/systems/logical_audio_sensor_plugin/LogicalAudioSensorPlugin.cc b/src/systems/logical_audio_sensor_plugin/LogicalAudioSensorPlugin.cc
index 5ed52f05e2..b7dad50104 100644
--- a/src/systems/logical_audio_sensor_plugin/LogicalAudioSensorPlugin.cc
+++ b/src/systems/logical_audio_sensor_plugin/LogicalAudioSensorPlugin.cc
@@ -43,7 +43,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::LogicalAudioSensorPluginPrivate
+class ignition::gazebo::systems::LogicalAudioSensorPluginPrivate
 {
   /// \brief Creates an audio source with attributes specified in an SDF file.
   /// \param[in] _elem A pointer to the source element in the SDF file.
diff --git a/src/systems/logical_camera/LogicalCamera.cc b/src/systems/logical_camera/LogicalCamera.cc
index 37b3e599cf..5a5283a4b8 100644
--- a/src/systems/logical_camera/LogicalCamera.cc
+++ b/src/systems/logical_camera/LogicalCamera.cc
@@ -51,7 +51,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private LogicalCamera data class.
-class gz::sim::systems::LogicalCameraPrivate
+class ignition::gazebo::systems::LogicalCameraPrivate
 {
   /// \brief A map of logicalCamera entities
   public: std::unordered_map<Entity,
diff --git a/src/systems/magnetometer/Magnetometer.cc b/src/systems/magnetometer/Magnetometer.cc
index be72521884..d911cb438e 100644
--- a/src/systems/magnetometer/Magnetometer.cc
+++ b/src/systems/magnetometer/Magnetometer.cc
@@ -48,7 +48,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private Magnetometer data class.
-class gz::sim::systems::MagnetometerPrivate
+class ignition::gazebo::systems::MagnetometerPrivate
 {
   /// \brief A map of magnetometer entity to its sensor.
   public: std::unordered_map<Entity,
diff --git a/src/systems/multicopter_motor_model/MulticopterMotorModel.cc b/src/systems/multicopter_motor_model/MulticopterMotorModel.cc
index 6722f9a305..43d7b3a579 100644
--- a/src/systems/multicopter_motor_model/MulticopterMotorModel.cc
+++ b/src/systems/multicopter_motor_model/MulticopterMotorModel.cc
@@ -115,7 +115,7 @@ enum class MotorType {
   kForce
 };
 
-class gz::sim::systems::MulticopterMotorModelPrivate
+class ignition::gazebo::systems::MulticopterMotorModelPrivate
 {
   /// \brief Callback for actuator commands.
   public: void OnActuatorMsg(const msgs::Actuators &_msg);
diff --git a/src/systems/physics/Physics.cc b/src/systems/physics/Physics.cc
index 9885a99204..7be8b1cd20 100644
--- a/src/systems/physics/Physics.cc
+++ b/src/systems/physics/Physics.cc
@@ -137,7 +137,7 @@ namespace components = gz::sim::components;
 
 
 // Private data class.
-class gz::sim::systems::PhysicsPrivate
+class ignition::gazebo::systems::PhysicsPrivate
 {
   /// \brief This is the minimum set of features that any physics engine must
   /// implement to be supported by this system.
diff --git a/src/systems/pose_publisher/PosePublisher.cc b/src/systems/pose_publisher/PosePublisher.cc
index 55f2564cfc..c1b9790999 100644
--- a/src/systems/pose_publisher/PosePublisher.cc
+++ b/src/systems/pose_publisher/PosePublisher.cc
@@ -56,7 +56,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private data class for PosePublisher
-class gz::sim::systems::PosePublisherPrivate
+class ignition::gazebo::systems::PosePublisherPrivate
 {
   /// \brief Initializes internal caches for entities whose poses are to be
   /// published and their names
diff --git a/src/systems/scene_broadcaster/SceneBroadcaster.cc b/src/systems/scene_broadcaster/SceneBroadcaster.cc
index 4e06fd4437..07cbbf4377 100644
--- a/src/systems/scene_broadcaster/SceneBroadcaster.cc
+++ b/src/systems/scene_broadcaster/SceneBroadcaster.cc
@@ -70,7 +70,7 @@ using namespace gz::sim;
 using namespace systems;
 
 // Private data class.
-class gz::sim::systems::SceneBroadcasterPrivate
+class ignition::gazebo::systems::SceneBroadcasterPrivate
 {
   /// \brief Type alias for the graph used to represent the scene graph.
   public: using SceneGraphType = math::graph::DirectedGraph<
diff --git a/src/systems/sensors/Sensors.cc b/src/systems/sensors/Sensors.cc
index 86bed8659e..a67b07162a 100644
--- a/src/systems/sensors/Sensors.cc
+++ b/src/systems/sensors/Sensors.cc
@@ -55,7 +55,7 @@ using namespace gz::sim;
 using namespace systems;
 
 // Private data class.
-class gz::sim::systems::SensorsPrivate
+class ignition::gazebo::systems::SensorsPrivate
 {
   /// \brief Sensor manager object. This manages the lifecycle of the
   /// instantiated sensors.
diff --git a/src/systems/thermal/Thermal.cc b/src/systems/thermal/Thermal.cc
index 31e502eec7..0191039e61 100644
--- a/src/systems/thermal/Thermal.cc
+++ b/src/systems/thermal/Thermal.cc
@@ -30,7 +30,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private Thermal data class.
-class gz::sim::systems::ThermalPrivate
+class ignition::gazebo::systems::ThermalPrivate
 {
 };
 
diff --git a/src/systems/touch_plugin/TouchPlugin.cc b/src/systems/touch_plugin/TouchPlugin.cc
index cab220b1b8..77134db515 100644
--- a/src/systems/touch_plugin/TouchPlugin.cc
+++ b/src/systems/touch_plugin/TouchPlugin.cc
@@ -42,7 +42,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::TouchPluginPrivate
+class ignition::gazebo::systems::TouchPluginPrivate
 {
   // Initialize the plugin
   public: void Load(const EntityComponentManager &_ecm,
diff --git a/src/systems/track_controller/TrackController.cc b/src/systems/track_controller/TrackController.cc
index 42d66fca0b..6c26a51965 100644
--- a/src/systems/track_controller/TrackController.cc
+++ b/src/systems/track_controller/TrackController.cc
@@ -44,7 +44,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::TrackControllerPrivate
+class ignition::gazebo::systems::TrackControllerPrivate
 {
   public : ~TrackControllerPrivate() {}
   /// \brief Register a collision entity to work with this system (e.g. enable
diff --git a/src/systems/tracked_vehicle/TrackedVehicle.cc b/src/systems/tracked_vehicle/TrackedVehicle.cc
index 41fbd3f180..15fa528e0b 100644
--- a/src/systems/tracked_vehicle/TrackedVehicle.cc
+++ b/src/systems/tracked_vehicle/TrackedVehicle.cc
@@ -56,7 +56,7 @@ struct Commands
   Commands() {}
 };
 
-class gz::sim::systems::TrackedVehiclePrivate
+class ignition::gazebo::systems::TrackedVehiclePrivate
 {
   /// \brief Callback for velocity subscription
   /// \param[in] _msg Velocity message
diff --git a/src/systems/user_commands/UserCommands.cc b/src/systems/user_commands/UserCommands.cc
index bf15dd08f7..fe59002378 100644
--- a/src/systems/user_commands/UserCommands.cc
+++ b/src/systems/user_commands/UserCommands.cc
@@ -173,7 +173,7 @@ class PhysicsCommand : public UserCommandBase
 }
 
 /// \brief Private UserCommands data class.
-class gz::sim::systems::UserCommandsPrivate
+class ignition::gazebo::systems::UserCommandsPrivate
 {
   /// \brief Callback for create service
   /// \param[in] _req Request containing entity description.
diff --git a/src/systems/velocity_control/VelocityControl.cc b/src/systems/velocity_control/VelocityControl.cc
index bb8900830d..2a46b5ed86 100644
--- a/src/systems/velocity_control/VelocityControl.cc
+++ b/src/systems/velocity_control/VelocityControl.cc
@@ -36,7 +36,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::VelocityControlPrivate
+class ignition::gazebo::systems::VelocityControlPrivate
 {
   /// \brief Callback for model velocity subscription
   /// \param[in] _msg Velocity message
diff --git a/src/systems/wheel_slip/WheelSlip.cc b/src/systems/wheel_slip/WheelSlip.cc
index 92f82cbfef..09852d92bf 100644
--- a/src/systems/wheel_slip/WheelSlip.cc
+++ b/src/systems/wheel_slip/WheelSlip.cc
@@ -40,7 +40,7 @@ using namespace systems;
 
 // Adapted from osrf/Gazebo WheelSlipPlugin
 // https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-requests/2950/
-class gz::sim::systems::WheelSlipPrivate
+class ignition::gazebo::systems::WheelSlipPrivate
 {
   /// \brief Initialize the plugin
   public: bool Load(const EntityComponentManager &_ecm, sdf::ElementPtr _sdf);
diff --git a/src/systems/wind_effects/WindEffects.cc b/src/systems/wind_effects/WindEffects.cc
index 213bedc5c5..4b44b99283 100644
--- a/src/systems/wind_effects/WindEffects.cc
+++ b/src/systems/wind_effects/WindEffects.cc
@@ -54,7 +54,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private WindEffects data class.
-class gz::sim::systems::WindEffectsPrivate
+class ignition::gazebo::systems::WindEffectsPrivate
 {
   /// \brief Initialize the system.
   /// \param[in] _ecm Mutable reference to the EntityComponentManager.