From 1228f9c795f3db1740b2067121b535e0a54a5f2b Mon Sep 17 00:00:00 2001
From: Louise Poubel <louise@openrobotics.org>
Date: Sat, 25 Jun 2022 21:32:01 -0700
Subject: [PATCH] more gz

Signed-off-by: Louise Poubel <louise@openrobotics.org>
---
 dartsim/src/CustomFeatures.hh        | 4 ++--
 dartsim/worlds/falling.world         | 2 +-
 include/gz/physics/FrameSemantics.hh | 2 +-
 include/gz/physics/Geometry.hh       | 2 +-
 test/common_test/CMakeLists.txt      | 2 +-
 tpe/plugin/src/CustomFeatures.hh     | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dartsim/src/CustomFeatures.hh b/dartsim/src/CustomFeatures.hh
index 22005a3b2..6c6b34646 100644
--- a/dartsim/src/CustomFeatures.hh
+++ b/dartsim/src/CustomFeatures.hh
@@ -15,8 +15,8 @@
  *
 */
 
-#ifndef IGNITION_PHYSICS_SRC_CUSTOMFEATURES_HH
-#define IGNITION_PHYSICS_SRC_CUSTOMFEATURES_HH
+#ifndef GZ_PHYSICS_SRC_CUSTOMFEATURES_HH
+#define GZ_PHYSICS_SRC_CUSTOMFEATURES_HH
 
 #include <gz/physics/Implements.hh>
 
diff --git a/dartsim/worlds/falling.world b/dartsim/worlds/falling.world
index ba4546d4c..b3e2d9283 100644
--- a/dartsim/worlds/falling.world
+++ b/dartsim/worlds/falling.world
@@ -2,7 +2,7 @@
 <sdf version="1.6">
   <world name="default">
     <plugin
-      filename="libignition-gazebo-physics-system.so"
+      filename="libgz-sim-physics-system.so"
       name="gz::gazebo::systems::v0::Physics">
     </plugin>
     <model name="sphere">
diff --git a/include/gz/physics/FrameSemantics.hh b/include/gz/physics/FrameSemantics.hh
index fc5a23b9f..7c6dcb584 100644
--- a/include/gz/physics/FrameSemantics.hh
+++ b/include/gz/physics/FrameSemantics.hh
@@ -32,7 +32,7 @@ namespace gz
   {
     /////////////////////////////////////////////////
     /// \brief FrameSemantics is an Interface that can be provided by
-    /// ignition-physics engines to provide users with easy ways to express
+    /// gz-physics engines to provide users with easy ways to express
     /// kinematic quantities in terms of frames and compute their values in
     /// terms of arbitrary frames of reference.
     class GZ_PHYSICS_VISIBLE FrameSemantics : public virtual Feature
diff --git a/include/gz/physics/Geometry.hh b/include/gz/physics/Geometry.hh
index 9c4552cda..000c8f839 100644
--- a/include/gz/physics/Geometry.hh
+++ b/include/gz/physics/Geometry.hh
@@ -37,7 +37,7 @@ namespace gz
 {
   namespace physics
   {
-    /// \brief This is used by ignition-physics to represent rigid body
+    /// \brief This is used by gz-physics to represent rigid body
     /// transforms in 2D or 3D simulations. The precision can be chosen as
     /// float or scalar.
     template <typename Scalar, std::size_t Dim>
diff --git a/test/common_test/CMakeLists.txt b/test/common_test/CMakeLists.txt
index bcbe5ebe1..b58362ce6 100644
--- a/test/common_test/CMakeLists.txt
+++ b/test/common_test/CMakeLists.txt
@@ -20,7 +20,7 @@ foreach(test ${tests})
   target_link_libraries(${TEST_TYPE}_${test}
     PUBLIC
       gz-plugin${GZ_PLUGIN_VER}::loader
-      gz-common5::gz-common5
+      gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
       ${PROJECT_LIBRARY_TARGET_NAME}
       gtest
       gtest_main
diff --git a/tpe/plugin/src/CustomFeatures.hh b/tpe/plugin/src/CustomFeatures.hh
index 52ec59bea..d0f855eb4 100644
--- a/tpe/plugin/src/CustomFeatures.hh
+++ b/tpe/plugin/src/CustomFeatures.hh
@@ -15,8 +15,8 @@
  *
 */
 
-#ifndef IGNITION_PHYSICS_TPE_PLUGIN_SRC_CUSTOMFEATURES_HH
-#define IGNITION_PHYSICS_TPE_PLUGIN_SRC_CUSTOMFEATURES_HH
+#ifndef GZ_PHYSICS_TPE_PLUGIN_SRC_CUSTOMFEATURES_HH
+#define GZ_PHYSICS_TPE_PLUGIN_SRC_CUSTOMFEATURES_HH
 
 #include <memory>