From c489f8d219e0b6b150a5a9894cb30b654fe690ff Mon Sep 17 00:00:00 2001
From: methylDragon <methylDragon@gmail.com>
Date: Thu, 28 Apr 2022 15:06:44 -0700
Subject: [PATCH] Migrate sources in src, test, examples, and include

Signed-off-by: methylDragon <methylDragon@gmail.com>
---
 core/include/gz/plugin/EnablePluginFromThis.hh   |  6 +++---
 core/include/gz/plugin/Factory.hh                |  8 ++++----
 core/include/gz/plugin/Info.hh                   |  8 ++++----
 core/include/gz/plugin/Plugin.hh                 | 12 ++++++------
 core/include/gz/plugin/PluginPtr.hh              |  8 ++++----
 core/include/gz/plugin/SpecializedPlugin.hh      |  8 ++++----
 core/include/gz/plugin/SpecializedPluginPtr.hh   |  8 ++++----
 core/include/gz/plugin/WeakPluginPtr.hh          |  6 +++---
 core/include/gz/plugin/detail/Factory.hh         |  8 ++++----
 core/include/gz/plugin/detail/Plugin.hh          |  6 +++---
 core/include/gz/plugin/detail/PluginPtr.hh       |  8 ++++----
 .../gz/plugin/detail/SpecializedPlugin.hh        |  6 +++---
 core/include/gz/plugin/detail/utility.hh         |  4 ++--
 core/include/gz/plugin/utility.hh                |  8 ++++----
 examples/integrators.cc                          |  4 ++--
 examples/plugins/ExponentialODE.cc               |  2 +-
 examples/plugins/ForwardEuler.cc                 |  2 +-
 examples/plugins/PolynomialODE.cc                |  2 +-
 examples/plugins/RungeKutta4.cc                  |  2 +-
 examples/plugins/integrators.hh                  |  4 ++--
 examples/plugins/robot.hh                        | 10 +++++-----
 examples/robot.cc                                |  6 +++---
 loader/include/gz/plugin/Loader.hh               | 12 ++++++------
 loader/include/gz/plugin/detail/Loader.hh        |  8 ++++----
 register/include/gz/plugin/Register.hh           | 12 ++++++------
 register/include/gz/plugin/RegisterMore.hh       | 10 +++++-----
 register/include/gz/plugin/detail/Register.hh    | 16 ++++++++--------
 27 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/core/include/gz/plugin/EnablePluginFromThis.hh b/core/include/gz/plugin/EnablePluginFromThis.hh
index 01ad28a9..6deaf4d9 100644
--- a/core/include/gz/plugin/EnablePluginFromThis.hh
+++ b/core/include/gz/plugin/EnablePluginFromThis.hh
@@ -15,12 +15,12 @@
  *
  */
 
-#ifndef IGNITION_PLUGIN_ENABLEPLUGINFROMTHIS_HH_
-#define IGNITION_PLUGIN_ENABLEPLUGINFROMTHIS_HH_
+#ifndef GZ_PLUGIN_ENABLEPLUGINFROMTHIS_HH_
+#define GZ_PLUGIN_ENABLEPLUGINFROMTHIS_HH_
 
 #include <memory>
 
-#include <ignition/plugin/PluginPtr.hh>
+#include <gz/plugin/PluginPtr.hh>
 
 namespace ignition
 {
diff --git a/core/include/gz/plugin/Factory.hh b/core/include/gz/plugin/Factory.hh
index 3cf47113..0b533c78 100644
--- a/core/include/gz/plugin/Factory.hh
+++ b/core/include/gz/plugin/Factory.hh
@@ -15,15 +15,15 @@
  *
 */
 
-#ifndef IGNITION_PLUGIN_FACTORY_HH_
-#define IGNITION_PLUGIN_FACTORY_HH_
+#ifndef GZ_PLUGIN_FACTORY_HH_
+#define GZ_PLUGIN_FACTORY_HH_
 
 #include <chrono>
 #include <functional>
 #include <memory>
 #include <tuple>
 
-#include <ignition/plugin/EnablePluginFromThis.hh>
+#include <gz/plugin/EnablePluginFromThis.hh>
 
 namespace ignition
 {
@@ -143,6 +143,6 @@ namespace ignition
   }
 }
 
-#include <ignition/plugin/detail/Factory.hh>
+#include <gz/plugin/detail/Factory.hh>
 
 #endif
diff --git a/core/include/gz/plugin/Info.hh b/core/include/gz/plugin/Info.hh
index aed1a315..736f99ad 100644
--- a/core/include/gz/plugin/Info.hh
+++ b/core/include/gz/plugin/Info.hh
@@ -16,8 +16,8 @@
  */
 
 
-#ifndef IGNITION_PLUGIN_INFO_HH_
-#define IGNITION_PLUGIN_INFO_HH_
+#ifndef GZ_PLUGIN_INFO_HH_
+#define GZ_PLUGIN_INFO_HH_
 
 #include <functional>
 #include <memory>
@@ -25,9 +25,9 @@
 #include <string>
 #include <unordered_map>
 
-#include <ignition/utils/SuppressWarning.hh>
+#include <gz/utils/SuppressWarning.hh>
 
-#include <ignition/plugin/Export.hh>
+#include <gz/plugin/Export.hh>
 
 namespace ignition
 {
diff --git a/core/include/gz/plugin/Plugin.hh b/core/include/gz/plugin/Plugin.hh
index 72e2f886..71c3abc8 100644
--- a/core/include/gz/plugin/Plugin.hh
+++ b/core/include/gz/plugin/Plugin.hh
@@ -16,17 +16,17 @@
  */
 
 
-#ifndef IGNITION_PLUGIN_PLUGIN_HH_
-#define IGNITION_PLUGIN_PLUGIN_HH_
+#ifndef GZ_PLUGIN_PLUGIN_HH_
+#define GZ_PLUGIN_PLUGIN_HH_
 
 #include <memory>
 #include <map>
 #include <string>
 
-#include <ignition/utils/SuppressWarning.hh>
+#include <gz/utils/SuppressWarning.hh>
 
-#include <ignition/plugin/Export.hh>
-#include <ignition/plugin/Info.hh>
+#include <gz/plugin/Export.hh>
+#include <gz/plugin/Info.hh>
 
 namespace ignition
 {
@@ -188,6 +188,6 @@ namespace ignition
   }
 }
 
-#include "ignition/plugin/detail/Plugin.hh"
+#include "gz/plugin/detail/Plugin.hh"
 
 #endif
diff --git a/core/include/gz/plugin/PluginPtr.hh b/core/include/gz/plugin/PluginPtr.hh
index b67ea7dc..51d547c6 100644
--- a/core/include/gz/plugin/PluginPtr.hh
+++ b/core/include/gz/plugin/PluginPtr.hh
@@ -16,14 +16,14 @@
  */
 
 
-#ifndef IGNITION_PLUGIN_PLUGINPTR_HH_
-#define IGNITION_PLUGIN_PLUGINPTR_HH_
+#ifndef GZ_PLUGIN_PLUGINPTR_HH_
+#define GZ_PLUGIN_PLUGINPTR_HH_
 
 #include <map>
 #include <string>
 #include <memory>
 
-#include <ignition/plugin/Plugin.hh>
+#include <gz/plugin/Plugin.hh>
 
 namespace ignition
 {
@@ -218,6 +218,6 @@ namespace ignition
   }
 }
 
-#include "ignition/plugin/detail/PluginPtr.hh"
+#include "gz/plugin/detail/PluginPtr.hh"
 
 #endif
diff --git a/core/include/gz/plugin/SpecializedPlugin.hh b/core/include/gz/plugin/SpecializedPlugin.hh
index 5dcb3063..71fbcced 100644
--- a/core/include/gz/plugin/SpecializedPlugin.hh
+++ b/core/include/gz/plugin/SpecializedPlugin.hh
@@ -16,11 +16,11 @@
  */
 
 
-#ifndef IGNITION_PLUGIN_SPECIALIZEDPLUGIN_HH_
-#define IGNITION_PLUGIN_SPECIALIZEDPLUGIN_HH_
+#ifndef GZ_PLUGIN_SPECIALIZEDPLUGIN_HH_
+#define GZ_PLUGIN_SPECIALIZEDPLUGIN_HH_
 
 #include <memory>
-#include "ignition/plugin/Plugin.hh"
+#include "gz/plugin/Plugin.hh"
 
 namespace ignition
 {
@@ -160,6 +160,6 @@ namespace ignition
   }
 }
 
-#include "ignition/plugin/detail/SpecializedPlugin.hh"
+#include "gz/plugin/detail/SpecializedPlugin.hh"
 
 #endif
diff --git a/core/include/gz/plugin/SpecializedPluginPtr.hh b/core/include/gz/plugin/SpecializedPluginPtr.hh
index 30cc436a..6e9ba354 100644
--- a/core/include/gz/plugin/SpecializedPluginPtr.hh
+++ b/core/include/gz/plugin/SpecializedPluginPtr.hh
@@ -16,11 +16,11 @@
  */
 
 
-#ifndef IGNITION_PLUGIN_SPECIALIZEDPLUGINPTR_HH_
-#define IGNITION_PLUGIN_SPECIALIZEDPLUGINPTR_HH_
+#ifndef GZ_PLUGIN_SPECIALIZEDPLUGINPTR_HH_
+#define GZ_PLUGIN_SPECIALIZEDPLUGINPTR_HH_
 
-#include "ignition/plugin/PluginPtr.hh"
-#include "ignition/plugin/SpecializedPlugin.hh"
+#include "gz/plugin/PluginPtr.hh"
+#include "gz/plugin/SpecializedPlugin.hh"
 
 namespace ignition
 {
diff --git a/core/include/gz/plugin/WeakPluginPtr.hh b/core/include/gz/plugin/WeakPluginPtr.hh
index a9e6f8ad..5968d71b 100644
--- a/core/include/gz/plugin/WeakPluginPtr.hh
+++ b/core/include/gz/plugin/WeakPluginPtr.hh
@@ -15,12 +15,12 @@
  *
  */
 
-#ifndef IGNITION_PLUGIN_WEAKPLUGINPTR_HH_
-#define IGNITION_PLUGIN_WEAKPLUGINPTR_HH_
+#ifndef GZ_PLUGIN_WEAKPLUGINPTR_HH_
+#define GZ_PLUGIN_WEAKPLUGINPTR_HH_
 
 #include <memory>
 
-#include <ignition/plugin/PluginPtr.hh>
+#include <gz/plugin/PluginPtr.hh>
 
 namespace ignition
 {
diff --git a/core/include/gz/plugin/detail/Factory.hh b/core/include/gz/plugin/detail/Factory.hh
index 78ef4044..73e5716a 100644
--- a/core/include/gz/plugin/detail/Factory.hh
+++ b/core/include/gz/plugin/detail/Factory.hh
@@ -15,15 +15,15 @@
  *
 */
 
-#ifndef IGNITION_PLUGIN_DETAIL_FACTORY_HH_
-#define IGNITION_PLUGIN_DETAIL_FACTORY_HH_
+#ifndef GZ_PLUGIN_DETAIL_FACTORY_HH_
+#define GZ_PLUGIN_DETAIL_FACTORY_HH_
 
 #include <memory>
 #include <utility>
 
-#include <ignition/utils/SuppressWarning.hh>
+#include <gz/utils/SuppressWarning.hh>
 
-#include <ignition/plugin/Factory.hh>
+#include <gz/plugin/Factory.hh>
 
 namespace ignition
 {
diff --git a/core/include/gz/plugin/detail/Plugin.hh b/core/include/gz/plugin/detail/Plugin.hh
index d2d47c63..6e1b8070 100644
--- a/core/include/gz/plugin/detail/Plugin.hh
+++ b/core/include/gz/plugin/detail/Plugin.hh
@@ -16,12 +16,12 @@
  */
 
 
-#ifndef IGNITION_PLUGIN_DETAIL_PLUGIN_HH_
-#define IGNITION_PLUGIN_DETAIL_PLUGIN_HH_
+#ifndef GZ_PLUGIN_DETAIL_PLUGIN_HH_
+#define GZ_PLUGIN_DETAIL_PLUGIN_HH_
 
 #include <memory>
 #include <string>
-#include <ignition/plugin/Plugin.hh>
+#include <gz/plugin/Plugin.hh>
 
 namespace ignition
 {
diff --git a/core/include/gz/plugin/detail/PluginPtr.hh b/core/include/gz/plugin/detail/PluginPtr.hh
index 242c92c9..2372928d 100644
--- a/core/include/gz/plugin/detail/PluginPtr.hh
+++ b/core/include/gz/plugin/detail/PluginPtr.hh
@@ -16,13 +16,13 @@
  */
 
 
-#ifndef IGNITION_PLUGIN_DETAIL_PLUGINPTR_HH_
-#define IGNITION_PLUGIN_DETAIL_PLUGINPTR_HH_
+#ifndef GZ_PLUGIN_DETAIL_PLUGINPTR_HH_
+#define GZ_PLUGIN_DETAIL_PLUGINPTR_HH_
 
 #include <memory>
 #include <utility>
-#include <ignition/plugin/PluginPtr.hh>
-#include <ignition/plugin/utility.hh>
+#include <gz/plugin/PluginPtr.hh>
+#include <gz/plugin/utility.hh>
 
 namespace ignition
 {
diff --git a/core/include/gz/plugin/detail/SpecializedPlugin.hh b/core/include/gz/plugin/detail/SpecializedPlugin.hh
index 41853dae..78427252 100644
--- a/core/include/gz/plugin/detail/SpecializedPlugin.hh
+++ b/core/include/gz/plugin/detail/SpecializedPlugin.hh
@@ -16,11 +16,11 @@
  */
 
 
-#ifndef IGNITION_PLUGIN_DETAIL_SPECIALIZEDPLUGIN_HH_
-#define IGNITION_PLUGIN_DETAIL_SPECIALIZEDPLUGIN_HH_
+#ifndef GZ_PLUGIN_DETAIL_SPECIALIZEDPLUGIN_HH_
+#define GZ_PLUGIN_DETAIL_SPECIALIZEDPLUGIN_HH_
 
 #include <memory>
-#include "ignition/plugin/SpecializedPlugin.hh"
+#include "gz/plugin/SpecializedPlugin.hh"
 
 // This preprocessor token should only be used by the unittest that is
 // responsible for checking that the specialized routines are being used to
diff --git a/core/include/gz/plugin/detail/utility.hh b/core/include/gz/plugin/detail/utility.hh
index 1f6d32f1..af24e17d 100644
--- a/core/include/gz/plugin/detail/utility.hh
+++ b/core/include/gz/plugin/detail/utility.hh
@@ -16,8 +16,8 @@
  */
 
 
-#ifndef IGNITION_PLUGIN_DETAIL_UTILITY_HH_
-#define IGNITION_PLUGIN_DETAIL_UTILITY_HH_
+#ifndef GZ_PLUGIN_DETAIL_UTILITY_HH_
+#define GZ_PLUGIN_DETAIL_UTILITY_HH_
 
 
 #include <type_traits>
diff --git a/core/include/gz/plugin/utility.hh b/core/include/gz/plugin/utility.hh
index 12e60220..867f9e1f 100644
--- a/core/include/gz/plugin/utility.hh
+++ b/core/include/gz/plugin/utility.hh
@@ -16,13 +16,13 @@
  */
 
 
-#ifndef IGNITION_PLUGIN_UTILITY_HH_
-#define IGNITION_PLUGIN_UTILITY_HH_
+#ifndef GZ_PLUGIN_UTILITY_HH_
+#define GZ_PLUGIN_UTILITY_HH_
 
 #include <string>
 
-#include <ignition/plugin/detail/utility.hh>
-#include <ignition/plugin/Export.hh>
+#include <gz/plugin/detail/utility.hh>
+#include <gz/plugin/Export.hh>
 
 namespace ignition
 {
diff --git a/examples/integrators.cc b/examples/integrators.cc
index 77c1e561..5be94e65 100644
--- a/examples/integrators.cc
+++ b/examples/integrators.cc
@@ -22,8 +22,8 @@
 #include <cmath>
 #include <set>
 
-#include <ignition/plugin/Loader.hh>
-#include <ignition/common/SystemPaths.hh>
+#include <gz/plugin/Loader.hh>
+#include <gz/common/SystemPaths.hh>
 
 #include "plugins/integrators.hh"
 
diff --git a/examples/plugins/ExponentialODE.cc b/examples/plugins/ExponentialODE.cc
index e853f02f..a6b8e7f0 100644
--- a/examples/plugins/ExponentialODE.cc
+++ b/examples/plugins/ExponentialODE.cc
@@ -17,7 +17,7 @@
 
 #include <cmath>
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "integrators.hh"
 
diff --git a/examples/plugins/ForwardEuler.cc b/examples/plugins/ForwardEuler.cc
index d62013e5..636d97b6 100644
--- a/examples/plugins/ForwardEuler.cc
+++ b/examples/plugins/ForwardEuler.cc
@@ -17,7 +17,7 @@
 
 #include <cassert>
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "integrators.hh"
 
diff --git a/examples/plugins/PolynomialODE.cc b/examples/plugins/PolynomialODE.cc
index bce1b05d..d91a45de 100644
--- a/examples/plugins/PolynomialODE.cc
+++ b/examples/plugins/PolynomialODE.cc
@@ -17,7 +17,7 @@
 
 #include <cmath>
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "integrators.hh"
 
diff --git a/examples/plugins/RungeKutta4.cc b/examples/plugins/RungeKutta4.cc
index 7cd042f4..dbfa9e3f 100644
--- a/examples/plugins/RungeKutta4.cc
+++ b/examples/plugins/RungeKutta4.cc
@@ -17,7 +17,7 @@
 
 #include <cassert>
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "integrators.hh"
 
diff --git a/examples/plugins/integrators.hh b/examples/plugins/integrators.hh
index 7a1238d5..b83c2a59 100644
--- a/examples/plugins/integrators.hh
+++ b/examples/plugins/integrators.hh
@@ -15,8 +15,8 @@
  *
 */
 
-#ifndef IGNITION_PLUGIN_EXAMPLES_PLUGINS_INTEGRATORS_HH_
-#define IGNITION_PLUGIN_EXAMPLES_PLUGINS_INTEGRATORS_HH_
+#ifndef GZ_PLUGIN_EXAMPLES_PLUGINS_INTEGRATORS_HH_
+#define GZ_PLUGIN_EXAMPLES_PLUGINS_INTEGRATORS_HH_
 
 #include <vector>
 #include <functional>
diff --git a/examples/plugins/robot.hh b/examples/plugins/robot.hh
index 585711ca..f50ce215 100644
--- a/examples/plugins/robot.hh
+++ b/examples/plugins/robot.hh
@@ -15,15 +15,15 @@
  *
 */
 
-#ifndef IGNITION_PLUGIN_EXAMPLES_PLUGINS_ROBOT_HH_
-#define IGNITION_PLUGIN_EXAMPLES_PLUGINS_ROBOT_HH_
+#ifndef GZ_PLUGIN_EXAMPLES_PLUGINS_ROBOT_HH_
+#define GZ_PLUGIN_EXAMPLES_PLUGINS_ROBOT_HH_
 
 #include <utility>
 
-#include <ignition/math/Vector2.hh>
-#include <ignition/math/Vector3.hh>
+#include <gz/math/Vector2.hh>
+#include <gz/math/Vector3.hh>
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 namespace ignition
 {
diff --git a/examples/robot.cc b/examples/robot.cc
index b258231c..7cd30dba 100644
--- a/examples/robot.cc
+++ b/examples/robot.cc
@@ -22,9 +22,9 @@
 
 #include "plugins/robot.hh"
 
-#include <ignition/common/SystemPaths.hh>
-#include <ignition/plugin/SpecializedPluginPtr.hh>
-#include <ignition/plugin/Loader.hh>
+#include <gz/common/SystemPaths.hh>
+#include <gz/plugin/SpecializedPluginPtr.hh>
+#include <gz/plugin/Loader.hh>
 
 #ifdef HAVE_BOOST_PROGRAM_OPTIONS
 #include <boost/program_options.hpp>
diff --git a/loader/include/gz/plugin/Loader.hh b/loader/include/gz/plugin/Loader.hh
index e5433eee..e10fc8e0 100644
--- a/loader/include/gz/plugin/Loader.hh
+++ b/loader/include/gz/plugin/Loader.hh
@@ -16,8 +16,8 @@
  */
 
 
-#ifndef IGNITION_PLUGIN_LOADER_HH_
-#define IGNITION_PLUGIN_LOADER_HH_
+#ifndef GZ_PLUGIN_LOADER_HH_
+#define GZ_PLUGIN_LOADER_HH_
 
 #include <memory>
 #include <set>
@@ -25,10 +25,10 @@
 #include <typeinfo>
 #include <unordered_set>
 
-#include <ignition/utils/SuppressWarning.hh>
+#include <gz/utils/SuppressWarning.hh>
 
-#include <ignition/plugin/loader/Export.hh>
-#include <ignition/plugin/PluginPtr.hh>
+#include <gz/plugin/loader/Export.hh>
+#include <gz/plugin/PluginPtr.hh>
 
 namespace ignition
 {
@@ -251,6 +251,6 @@ namespace ignition
   }
 }
 
-#include <ignition/plugin/detail/Loader.hh>
+#include <gz/plugin/detail/Loader.hh>
 
 #endif
diff --git a/loader/include/gz/plugin/detail/Loader.hh b/loader/include/gz/plugin/detail/Loader.hh
index 49a293ae..ce5ce0f6 100644
--- a/loader/include/gz/plugin/detail/Loader.hh
+++ b/loader/include/gz/plugin/detail/Loader.hh
@@ -16,14 +16,14 @@
  */
 
 
-#ifndef IGNITION_PLUGIN_DETAIL_LOADER_HH_
-#define IGNITION_PLUGIN_DETAIL_LOADER_HH_
+#ifndef GZ_PLUGIN_DETAIL_LOADER_HH_
+#define GZ_PLUGIN_DETAIL_LOADER_HH_
 
 #include <memory>
 #include <string>
 #include <unordered_set>
-#include <ignition/plugin/EnablePluginFromThis.hh>
-#include <ignition/plugin/Loader.hh>
+#include <gz/plugin/EnablePluginFromThis.hh>
+#include <gz/plugin/Loader.hh>
 
 namespace ignition
 {
diff --git a/register/include/gz/plugin/Register.hh b/register/include/gz/plugin/Register.hh
index e0cb43ad..ca7d8bff 100644
--- a/register/include/gz/plugin/Register.hh
+++ b/register/include/gz/plugin/Register.hh
@@ -16,10 +16,10 @@
 */
 
 
-#ifndef IGNITION_PLUGIN_REGISTER_HH_
-#define IGNITION_PLUGIN_REGISTER_HH_
+#ifndef GZ_PLUGIN_REGISTER_HH_
+#define GZ_PLUGIN_REGISTER_HH_
 
-#include <ignition/plugin/detail/Register.hh>
+#include <gz/plugin/detail/Register.hh>
 
 
 // ------------- Add a set of plugins or a set of interfaces ------------------
@@ -47,8 +47,8 @@
 ///
 /// If your library has multiple translation units (.cpp files) and you want to
 /// register plugins in multiple translation units, use this
-/// ignition/plugin/Register.hh header in ONE of the translation units, and then
-/// the ignition/plugin/RegisterMore.hh header in all of the rest of the
+/// gz/plugin/Register.hh header in ONE of the translation units, and then
+/// the gz/plugin/RegisterMore.hh header in all of the rest of the
 /// translation units.
 #define IGNITION_ADD_PLUGIN(PluginClass, ...) \
   DETAIL_IGNITION_ADD_PLUGIN(PluginClass, __VA_ARGS__)
@@ -85,7 +85,7 @@
 /// memory management system the consumer prefers.
 ///
 /// The inputs and output of a factory are defined using the
-/// ignition::plugin::Factory class in the ignition/plugin/Factory.hh header.
+/// ignition::plugin::Factory class in the gz/plugin/Factory.hh header.
 ///
 /// The first argument of this macro should be the class that implements the
 /// factory's output interface. The second argument should be the factory
diff --git a/register/include/gz/plugin/RegisterMore.hh b/register/include/gz/plugin/RegisterMore.hh
index a69d6d8b..4763420f 100644
--- a/register/include/gz/plugin/RegisterMore.hh
+++ b/register/include/gz/plugin/RegisterMore.hh
@@ -16,21 +16,21 @@
 */
 
 
-#ifndef IGNITION_PLUGIN_REGISTERMORE_HH_
-#define IGNITION_PLUGIN_REGISTERMORE_HH_
+#ifndef GZ_PLUGIN_REGISTERMORE_HH_
+#define GZ_PLUGIN_REGISTERMORE_HH_
 
 /// If your library already has a translation unit (.cpp file) containing
 /// \code
-///     #include <ignition/plugin/Register.hh>
+///     #include <gz/plugin/Register.hh>
 /// \endcode
 ///
 /// then any other translation units that want to register plugins should use
 /// \code
-///     #include <ignition/plugin/RegisterMore.hh>
+///     #include <gz/plugin/RegisterMore.hh>
 /// \endcode
 ///
 /// But at least one translation unit of your library must contain Register.hh.
 #define IGN_PLUGIN_REGISTER_MORE_TRANS_UNITS
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #endif
diff --git a/register/include/gz/plugin/detail/Register.hh b/register/include/gz/plugin/detail/Register.hh
index 021d93b3..bfffebba 100644
--- a/register/include/gz/plugin/detail/Register.hh
+++ b/register/include/gz/plugin/detail/Register.hh
@@ -16,8 +16,8 @@
 */
 
 
-#ifndef IGNITION_PLUGIN_DETAIL_REGISTER_HH_
-#define IGNITION_PLUGIN_DETAIL_REGISTER_HH_
+#ifndef GZ_PLUGIN_DETAIL_REGISTER_HH_
+#define GZ_PLUGIN_DETAIL_REGISTER_HH_
 
 #include <set>
 #include <string>
@@ -25,11 +25,11 @@
 #include <type_traits>
 #include <utility>
 
-#include <ignition/utils/SuppressWarning.hh>
+#include <gz/utils/SuppressWarning.hh>
 
-#include <ignition/plugin/EnablePluginFromThis.hh>
-#include <ignition/plugin/Info.hh>
-#include <ignition/plugin/utility.hh>
+#include <gz/plugin/EnablePluginFromThis.hh>
+#include <gz/plugin/Info.hh>
+#include <gz/plugin/utility.hh>
 
 
 #if defined _WIN32 || defined __CYGWIN__
@@ -113,8 +113,8 @@ extern "C"
   // multiple definitions of IgnitionPluginHook,
   // then make sure that all but one of your
   // library's translation units (.cpp files) includes the
-  // <ignition/plugin/RegisterMore.hh> header instead of
-  // <ignition/plugin/Register.hh>.
+  // <gz/plugin/RegisterMore.hh> header instead of
+  // <gz/plugin/Register.hh>.
   //
   // Only ONE and exactly ONE .cpp file in your library should include
   // Register.hh. All the rest should include RegisterMore.hh. It does not