diff --git a/MIGRATION.md b/MIGRATION.md
index 90209765..410860d1 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -68,9 +68,9 @@ simply need to make sure that the compiler can resolve the names of the classes
 that you pass to it (and there will be a compilation error if it cannot).
 
 It is now possible to register plugins across **multiple translation units**
-within a single library. To do this, use `#include <ignition/plugin/Register.hh>`
+within a single library. To do this, use `#include <gz/plugin/Register.hh>`
 in **exactly one** of your library's translation units, and then use
-`#include <ignition/plugin/RegisterMore.hh>` in all other translation units. It
+`#include <gz/plugin/RegisterMore.hh>` in all other translation units. It
 does not matter which translation unit you choose to be the "first", as long as
 you choose exactly one.
 
@@ -84,7 +84,7 @@ then you should continue to use it. It does not have a replacement in `ign-plugi
 
 Here is a list of things that you *should* replace:
 
-* `#include <gz/common/PluginLoader.hh>` should be replaced with `#include <ignition/plugin/Loader.hh>`
+* `#include <gz/common/PluginLoader.hh>` should be replaced with `#include <gz/plugin/Loader.hh>`
 * `gz::common::PluginLoader` should be replaced with `gz::plugin::Loader`
 * When calling `Loader::Instantiate("....")` do **NOT** prefix the class name with `::`. E.g. `"::some_namespace::MyClass"` should now be `"some_namespace::MyClass"`.
 
diff --git a/core/include/gz/plugin/EnablePluginFromThis.hh b/core/include/gz/plugin/EnablePluginFromThis.hh
index f47a45c1..0f93736a 100644
--- a/core/include/gz/plugin/EnablePluginFromThis.hh
+++ b/core/include/gz/plugin/EnablePluginFromThis.hh
@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include <ignition/plugin/PluginPtr.hh>
+#include <gz/plugin/PluginPtr.hh>
 
 namespace gz
 {
diff --git a/core/include/gz/plugin/Factory.hh b/core/include/gz/plugin/Factory.hh
index 15110448..5da2378e 100644
--- a/core/include/gz/plugin/Factory.hh
+++ b/core/include/gz/plugin/Factory.hh
@@ -23,7 +23,7 @@
 #include <memory>
 #include <tuple>
 
-#include <ignition/plugin/EnablePluginFromThis.hh>
+#include <gz/plugin/EnablePluginFromThis.hh>
 
 namespace gz
 {
diff --git a/core/include/gz/plugin/Info.hh b/core/include/gz/plugin/Info.hh
index 41f6f2f8..5717c4e6 100644
--- a/core/include/gz/plugin/Info.hh
+++ b/core/include/gz/plugin/Info.hh
@@ -25,9 +25,9 @@
 #include <string>
 #include <unordered_map>
 
-#include <ignition/utilities/SuppressWarning.hh>
+#include <gz/utilities/SuppressWarning.hh>
 
-#include <ignition/plugin/Export.hh>
+#include <gz/plugin/Export.hh>
 
 namespace gz
 {
diff --git a/core/include/gz/plugin/Plugin.hh b/core/include/gz/plugin/Plugin.hh
index d90be768..64aa8928 100644
--- a/core/include/gz/plugin/Plugin.hh
+++ b/core/include/gz/plugin/Plugin.hh
@@ -23,10 +23,10 @@
 #include <map>
 #include <string>
 
-#include <ignition/utilities/SuppressWarning.hh>
+#include <gz/utilities/SuppressWarning.hh>
 
-#include <ignition/plugin/Export.hh>
-#include <ignition/plugin/Info.hh>
+#include <gz/plugin/Export.hh>
+#include <gz/plugin/Info.hh>
 
 namespace gz
 {
diff --git a/core/include/gz/plugin/PluginPtr.hh b/core/include/gz/plugin/PluginPtr.hh
index f3b991af..605a5819 100644
--- a/core/include/gz/plugin/PluginPtr.hh
+++ b/core/include/gz/plugin/PluginPtr.hh
@@ -23,7 +23,7 @@
 #include <string>
 #include <memory>
 
-#include <ignition/plugin/Plugin.hh>
+#include <gz/plugin/Plugin.hh>
 
 namespace gz
 {
diff --git a/core/include/gz/plugin/SpecializedPlugin.hh b/core/include/gz/plugin/SpecializedPlugin.hh
index 18c5f911..b13669e0 100644
--- a/core/include/gz/plugin/SpecializedPlugin.hh
+++ b/core/include/gz/plugin/SpecializedPlugin.hh
@@ -20,7 +20,7 @@
 #define GZ_PLUGIN_SPECIALIZEDPLUGIN_HH_
 
 #include <memory>
-#include "ignition/plugin/Plugin.hh"
+#include "gz/plugin/Plugin.hh"
 
 namespace gz
 {
diff --git a/core/include/gz/plugin/SpecializedPluginPtr.hh b/core/include/gz/plugin/SpecializedPluginPtr.hh
index f1c73636..a92a1769 100644
--- a/core/include/gz/plugin/SpecializedPluginPtr.hh
+++ b/core/include/gz/plugin/SpecializedPluginPtr.hh
@@ -19,8 +19,8 @@
 #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 gz
 {
diff --git a/core/include/gz/plugin/WeakPluginPtr.hh b/core/include/gz/plugin/WeakPluginPtr.hh
index 16a46151..b7151f2b 100644
--- a/core/include/gz/plugin/WeakPluginPtr.hh
+++ b/core/include/gz/plugin/WeakPluginPtr.hh
@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include <ignition/plugin/PluginPtr.hh>
+#include <gz/plugin/PluginPtr.hh>
 
 namespace gz
 {
diff --git a/core/include/gz/plugin/detail/Factory.hh b/core/include/gz/plugin/detail/Factory.hh
index fefe4ac0..66581885 100644
--- a/core/include/gz/plugin/detail/Factory.hh
+++ b/core/include/gz/plugin/detail/Factory.hh
@@ -21,9 +21,9 @@
 #include <memory>
 #include <utility>
 
-#include <ignition/utilities/SuppressWarning.hh>
+#include <gz/utilities/SuppressWarning.hh>
 
-#include <ignition/plugin/Factory.hh>
+#include <gz/plugin/Factory.hh>
 
 namespace gz
 {
diff --git a/core/include/gz/plugin/detail/Plugin.hh b/core/include/gz/plugin/detail/Plugin.hh
index 1e1b58db..668ef072 100644
--- a/core/include/gz/plugin/detail/Plugin.hh
+++ b/core/include/gz/plugin/detail/Plugin.hh
@@ -21,7 +21,7 @@
 
 #include <memory>
 #include <string>
-#include <ignition/plugin/Plugin.hh>
+#include <gz/plugin/Plugin.hh>
 
 namespace gz
 {
diff --git a/core/include/gz/plugin/detail/PluginPtr.hh b/core/include/gz/plugin/detail/PluginPtr.hh
index c5e41fe8..edf984da 100644
--- a/core/include/gz/plugin/detail/PluginPtr.hh
+++ b/core/include/gz/plugin/detail/PluginPtr.hh
@@ -21,8 +21,8 @@
 
 #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 gz
 {
diff --git a/core/include/gz/plugin/detail/SpecializedPlugin.hh b/core/include/gz/plugin/detail/SpecializedPlugin.hh
index 9e4f1b98..50f17f8b 100644
--- a/core/include/gz/plugin/detail/SpecializedPlugin.hh
+++ b/core/include/gz/plugin/detail/SpecializedPlugin.hh
@@ -20,7 +20,7 @@
 #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/utility.hh b/core/include/gz/plugin/utility.hh
index 2d9b3503..275711d7 100644
--- a/core/include/gz/plugin/utility.hh
+++ b/core/include/gz/plugin/utility.hh
@@ -22,7 +22,7 @@
 #include <string>
 
 #include <gz/plugin/detail/utility.hh>
-#include <ignition/plugin/Export.hh>
+#include <gz/plugin/Export.hh>
 
 namespace gz
 {
diff --git a/core/src/EnablePluginFromThis.cc b/core/src/EnablePluginFromThis.cc
index 7e8fcbe6..07065eb4 100644
--- a/core/src/EnablePluginFromThis.cc
+++ b/core/src/EnablePluginFromThis.cc
@@ -15,8 +15,8 @@
  *
 */
 
-#include <ignition/plugin/EnablePluginFromThis.hh>
-#include <ignition/plugin/WeakPluginPtr.hh>
+#include <gz/plugin/EnablePluginFromThis.hh>
+#include <gz/plugin/WeakPluginPtr.hh>
 
 namespace gz
 {
diff --git a/core/src/Factory.cc b/core/src/Factory.cc
index 49eacf16..b06354ad 100644
--- a/core/src/Factory.cc
+++ b/core/src/Factory.cc
@@ -20,7 +20,7 @@
 #include <thread>
 #include <vector>
 
-#include <ignition/plugin/Factory.hh>
+#include <gz/plugin/Factory.hh>
 
 namespace
 {
diff --git a/core/src/Factory_TEST.cc b/core/src/Factory_TEST.cc
index ea01c5d7..a6b24b08 100644
--- a/core/src/Factory_TEST.cc
+++ b/core/src/Factory_TEST.cc
@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include <ignition/plugin/Factory.hh>
+#include <gz/plugin/Factory.hh>
 
 // Dev Note (MXG): These tests are just here to make sure that the template and
 // inheritance schemes for Factories are working as expected. If the
diff --git a/core/src/Info.cc b/core/src/Info.cc
index d4d135d4..7f7fdca7 100644
--- a/core/src/Info.cc
+++ b/core/src/Info.cc
@@ -15,7 +15,7 @@
  *
  */
 
-#include <ignition/plugin/Info.hh>
+#include <gz/plugin/Info.hh>
 
 namespace gz
 {
diff --git a/core/src/Info_TEST.cc b/core/src/Info_TEST.cc
index 7aa8c9ff..4728b592 100644
--- a/core/src/Info_TEST.cc
+++ b/core/src/Info_TEST.cc
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/plugin/Info.hh>
+#include <gz/plugin/Info.hh>
 
 struct SomeInterface
 {
diff --git a/core/src/Plugin.cc b/core/src/Plugin.cc
index 0bd1d988..06273b80 100644
--- a/core/src/Plugin.cc
+++ b/core/src/Plugin.cc
@@ -19,8 +19,8 @@
 #include <cassert>
 #include <iostream>
 
-#include "ignition/plugin/Plugin.hh"
-#include "ignition/plugin/Info.hh"
+#include "gz/plugin/Plugin.hh"
+#include "gz/plugin/Info.hh"
 
 namespace gz
 {
diff --git a/core/src/WeakPluginPtr.cc b/core/src/WeakPluginPtr.cc
index f93dd574..ec1ae9b6 100644
--- a/core/src/WeakPluginPtr.cc
+++ b/core/src/WeakPluginPtr.cc
@@ -15,7 +15,7 @@
  *
  */
 
-#include <ignition/plugin/WeakPluginPtr.hh>
+#include <gz/plugin/WeakPluginPtr.hh>
 
 namespace gz
 {
diff --git a/core/src/utility.cc b/core/src/utility.cc
index 81f0fd42..970d2f1a 100644
--- a/core/src/utility.cc
+++ b/core/src/utility.cc
@@ -25,7 +25,7 @@
 #include <cxxabi.h>
 #endif
 
-#include <ignition/plugin/utility.hh>
+#include <gz/plugin/utility.hh>
 
 namespace gz
 {
diff --git a/core/src/utility_TEST.cc b/core/src/utility_TEST.cc
index f84ddd7c..29c2fc3e 100644
--- a/core/src/utility_TEST.cc
+++ b/core/src/utility_TEST.cc
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/plugin/utility.hh>
+#include <gz/plugin/utility.hh>
 
 using namespace gz::plugin;
 
diff --git a/examples/integrators.cc b/examples/integrators.cc
index d17139d8..556d7225 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 7886398e..c9eddcab 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 1eafad0a..dc21ae6e 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 addd4008..d440d4cb 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 94bfa6de..4db48a98 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/robot.hh b/examples/plugins/robot.hh
index 6b73669e..deb0f9c6 100644
--- a/examples/plugins/robot.hh
+++ b/examples/plugins/robot.hh
@@ -20,10 +20,10 @@
 
 #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 gz
 {
diff --git a/examples/robot.cc b/examples/robot.cc
index ba4e1fd9..59f7e3fb 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 3b39027b..2a384c4e 100644
--- a/loader/include/gz/plugin/Loader.hh
+++ b/loader/include/gz/plugin/Loader.hh
@@ -25,10 +25,10 @@
 #include <typeinfo>
 #include <unordered_set>
 
-#include <ignition/utilities/SuppressWarning.hh>
+#include <gz/utilities/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 gz
 {
diff --git a/loader/include/gz/plugin/detail/Loader.hh b/loader/include/gz/plugin/detail/Loader.hh
index 19f47505..8031502c 100644
--- a/loader/include/gz/plugin/detail/Loader.hh
+++ b/loader/include/gz/plugin/detail/Loader.hh
@@ -22,8 +22,8 @@
 #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 gz
 {
diff --git a/loader/src/Loader.cc b/loader/src/Loader.cc
index 6204a1f9..e5980fb2 100644
--- a/loader/src/Loader.cc
+++ b/loader/src/Loader.cc
@@ -26,11 +26,11 @@
 #include <unordered_map>
 #include <vector>
 
-#include <ignition/plugin/Info.hh>
-#include <ignition/plugin/Loader.hh>
-#include <ignition/plugin/Plugin.hh>
+#include <gz/plugin/Info.hh>
+#include <gz/plugin/Loader.hh>
+#include <gz/plugin/Plugin.hh>
 
-#include <ignition/plugin/utility.hh>
+#include <gz/plugin/utility.hh>
 
 namespace gz
 {
diff --git a/loader/src/Loader_TEST.cc b/loader/src/Loader_TEST.cc
index 5c83c4a8..edb6c1fa 100644
--- a/loader/src/Loader_TEST.cc
+++ b/loader/src/Loader_TEST.cc
@@ -19,10 +19,10 @@
 
 #include <algorithm>
 
-#include <ignition/plugin/Loader.hh>
-#include <ignition/plugin/config.hh>
+#include <gz/plugin/Loader.hh>
+#include <gz/plugin/config.hh>
 
-#include <ignition/plugin/SpecializedPluginPtr.hh>
+#include <gz/plugin/SpecializedPluginPtr.hh>
 
 /////////////////////////////////////////////////
 TEST(Loader, InitialNoInterfacesImplemented)
diff --git a/loader/src/gz.cc b/loader/src/gz.cc
index 74288924..ba82f0d1 100644
--- a/loader/src/gz.cc
+++ b/loader/src/gz.cc
@@ -18,8 +18,8 @@
 #include <iostream>
 #include <string>
 
-#include "ignition/plugin/Loader.hh"
-#include "ignition/plugin/config.hh"
+#include "gz/plugin/Loader.hh"
+#include "gz/plugin/config.hh"
 
 using namespace gz;
 using namespace plugin;
diff --git a/loader/src/gz_TEST.cc b/loader/src/gz_TEST.cc
index 17e7a846..196969a0 100644
--- a/loader/src/gz_TEST.cc
+++ b/loader/src/gz_TEST.cc
@@ -21,7 +21,7 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "ignition/plugin/Loader.hh"
+#include "gz/plugin/Loader.hh"
 
 #ifdef _MSC_VER
 #    define popen _popen
diff --git a/register/include/gz/plugin/RegisterMore.hh b/register/include/gz/plugin/RegisterMore.hh
index be9f89cf..4763420f 100644
--- a/register/include/gz/plugin/RegisterMore.hh
+++ b/register/include/gz/plugin/RegisterMore.hh
@@ -21,16 +21,16 @@
 
 /// 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 9e92c984..065c2449 100644
--- a/register/include/gz/plugin/detail/Register.hh
+++ b/register/include/gz/plugin/detail/Register.hh
@@ -25,11 +25,11 @@
 #include <type_traits>
 #include <utility>
 
-#include <ignition/utilities/SuppressWarning.hh>
+#include <gz/utilities/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__
diff --git a/test/integration/EnablePluginFromThis_TEST.cc b/test/integration/EnablePluginFromThis_TEST.cc
index 9ae7fd25..f38e8b4f 100644
--- a/test/integration/EnablePluginFromThis_TEST.cc
+++ b/test/integration/EnablePluginFromThis_TEST.cc
@@ -17,10 +17,10 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/plugin/EnablePluginFromThis.hh>
-#include <ignition/plugin/Loader.hh>
-#include <ignition/plugin/SpecializedPluginPtr.hh>
-#include <ignition/plugin/WeakPluginPtr.hh>
+#include <gz/plugin/EnablePluginFromThis.hh>
+#include <gz/plugin/Loader.hh>
+#include <gz/plugin/SpecializedPluginPtr.hh>
+#include <gz/plugin/WeakPluginPtr.hh>
 
 #include "../plugins/DummyPlugins.hh"
 #include "utils.hh"
diff --git a/test/integration/WeakPluginPtr.cc b/test/integration/WeakPluginPtr.cc
index 3f86c2e5..2ebe14ff 100644
--- a/test/integration/WeakPluginPtr.cc
+++ b/test/integration/WeakPluginPtr.cc
@@ -17,8 +17,8 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/plugin/WeakPluginPtr.hh>
-#include <ignition/plugin/Loader.hh>
+#include <gz/plugin/WeakPluginPtr.hh>
+#include <gz/plugin/Loader.hh>
 
 #include "../plugins/DummyPlugins.hh"
 #include "utils.hh"
diff --git a/test/integration/aliases.cc b/test/integration/aliases.cc
index 5ffa4d7a..26b6dac0 100644
--- a/test/integration/aliases.cc
+++ b/test/integration/aliases.cc
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/plugin/Loader.hh>
+#include <gz/plugin/Loader.hh>
 
 #include "../plugins/DummyPlugins.hh"
 
diff --git a/test/integration/factory.cc b/test/integration/factory.cc
index 8726b1d0..87017662 100644
--- a/test/integration/factory.cc
+++ b/test/integration/factory.cc
@@ -17,8 +17,8 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/plugin/Factory.hh>
-#include <ignition/plugin/Loader.hh>
+#include <gz/plugin/Factory.hh>
+#include <gz/plugin/Loader.hh>
 
 #include "../plugins/FactoryPlugins.hh"
 #include "utils.hh"
diff --git a/test/integration/plugin.cc b/test/integration/plugin.cc
index 488cc8a0..f719c292 100644
--- a/test/integration/plugin.cc
+++ b/test/integration/plugin.cc
@@ -24,9 +24,9 @@
 #include <string>
 #include <vector>
 #include <iostream>
-#include "ignition/plugin/Loader.hh"
-#include "ignition/plugin/PluginPtr.hh"
-#include "ignition/plugin/SpecializedPluginPtr.hh"
+#include "gz/plugin/Loader.hh"
+#include "gz/plugin/PluginPtr.hh"
+#include "gz/plugin/SpecializedPluginPtr.hh"
 
 #include "../plugins/DummyPlugins.hh"
 #include "utils.hh"
diff --git a/test/integration/templated_plugins.cc b/test/integration/templated_plugins.cc
index 624b8f4e..72108dd5 100644
--- a/test/integration/templated_plugins.cc
+++ b/test/integration/templated_plugins.cc
@@ -22,8 +22,8 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/plugin/Loader.hh>
-#include <ignition/plugin/SpecializedPluginPtr.hh>
+#include <gz/plugin/Loader.hh>
+#include <gz/plugin/SpecializedPluginPtr.hh>
 
 #include "../plugins/TemplatedPlugins.hh"
 
diff --git a/test/performance/plugin_specialization.cc b/test/performance/plugin_specialization.cc
index 88141a44..dd515097 100644
--- a/test/performance/plugin_specialization.cc
+++ b/test/performance/plugin_specialization.cc
@@ -21,8 +21,8 @@
 #include <iomanip>
 #include <cmath>
 
-#include <ignition/plugin/Loader.hh>
-#include <ignition/plugin/SpecializedPluginPtr.hh>
+#include <gz/plugin/Loader.hh>
+#include <gz/plugin/SpecializedPluginPtr.hh>
 
 #include "../plugins/DummyPlugins.hh"
 
diff --git a/test/plugins/BadPluginAPIVersionNew.cc b/test/plugins/BadPluginAPIVersionNew.cc
index b02e0280..bcb7c605 100644
--- a/test/plugins/BadPluginAPIVersionNew.cc
+++ b/test/plugins/BadPluginAPIVersionNew.cc
@@ -17,7 +17,7 @@
 
 #include <limits>
 
-#include <ignition/plugin/Info.hh>
+#include <gz/plugin/Info.hh>
 
 #include "GenericExport.hh"
 
diff --git a/test/plugins/BadPluginAPIVersionOld.cc b/test/plugins/BadPluginAPIVersionOld.cc
index e541c71b..0990550c 100644
--- a/test/plugins/BadPluginAPIVersionOld.cc
+++ b/test/plugins/BadPluginAPIVersionOld.cc
@@ -17,7 +17,7 @@
 
 #include <limits>
 
-#include <ignition/plugin/Info.hh>
+#include <gz/plugin/Info.hh>
 
 #include "GenericExport.hh"
 
diff --git a/test/plugins/BadPluginAlign.cc b/test/plugins/BadPluginAlign.cc
index 132ba911..8cf2501b 100644
--- a/test/plugins/BadPluginAlign.cc
+++ b/test/plugins/BadPluginAlign.cc
@@ -15,7 +15,7 @@
  *
 */
 
-#include <ignition/plugin/Info.hh>
+#include <gz/plugin/Info.hh>
 
 #include "GenericExport.hh"
 
diff --git a/test/plugins/BadPluginNoInfo.cc b/test/plugins/BadPluginNoInfo.cc
index d4fa6aef..1e14d409 100644
--- a/test/plugins/BadPluginNoInfo.cc
+++ b/test/plugins/BadPluginNoInfo.cc
@@ -15,7 +15,7 @@
  *
 */
 
-#include <ignition/plugin/Info.hh>
+#include <gz/plugin/Info.hh>
 
 #include "GenericExport.hh"
 
diff --git a/test/plugins/BadPluginSize.cc b/test/plugins/BadPluginSize.cc
index 265f67e5..3acd5131 100644
--- a/test/plugins/BadPluginSize.cc
+++ b/test/plugins/BadPluginSize.cc
@@ -15,7 +15,7 @@
  *
 */
 
-#include <ignition/plugin/Info.hh>
+#include <gz/plugin/Info.hh>
 
 #include "GenericExport.hh"
 
diff --git a/test/plugins/DummyMultiPlugin.hh b/test/plugins/DummyMultiPlugin.hh
index e624df24..77d088e5 100644
--- a/test/plugins/DummyMultiPlugin.hh
+++ b/test/plugins/DummyMultiPlugin.hh
@@ -1,7 +1,7 @@
 #ifndef GZ_PLUGIN_TEST_PLUGINS_DUMMYMULTIPLUGIN_HH_
 #define GZ_PLUGIN_TEST_PLUGINS_DUMMYMULTIPLUGIN_HH_
 
-#include <ignition/plugin/EnablePluginFromThis.hh>
+#include <gz/plugin/EnablePluginFromThis.hh>
 
 #include "DummyPlugins.hh"
 
diff --git a/test/plugins/DummyPlugins.cc b/test/plugins/DummyPlugins.cc
index 76e8303b..f35b223b 100644
--- a/test/plugins/DummyPlugins.cc
+++ b/test/plugins/DummyPlugins.cc
@@ -15,7 +15,7 @@
  *
 */
 
-#include "ignition/plugin/Register.hh"
+#include "gz/plugin/Register.hh"
 #include "DummyPlugins.hh"
 #include "DummyMultiPlugin.hh"
 
diff --git a/test/plugins/DummyPluginsOtherTranslationUnit.cc b/test/plugins/DummyPluginsOtherTranslationUnit.cc
index 4821525f..0d1ee1ed 100644
--- a/test/plugins/DummyPluginsOtherTranslationUnit.cc
+++ b/test/plugins/DummyPluginsOtherTranslationUnit.cc
@@ -15,7 +15,7 @@
  *
 */
 
-#include <ignition/plugin/RegisterMore.hh>
+#include <gz/plugin/RegisterMore.hh>
 #include "DummyPlugins.hh"
 #include "DummyMultiPlugin.hh"
 
diff --git a/test/plugins/FactoryPlugins.cc b/test/plugins/FactoryPlugins.cc
index ae3ce688..e9dcfb46 100644
--- a/test/plugins/FactoryPlugins.cc
+++ b/test/plugins/FactoryPlugins.cc
@@ -15,7 +15,7 @@
  *
 */
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "FactoryPlugins.hh"
 
diff --git a/test/plugins/FactoryPlugins.hh b/test/plugins/FactoryPlugins.hh
index 6e07b008..d96ef6d1 100644
--- a/test/plugins/FactoryPlugins.hh
+++ b/test/plugins/FactoryPlugins.hh
@@ -18,7 +18,7 @@
 #ifndef GZ_PLUGIN_TEST_PLUGINS_FACTORYPLUGINS_HH_
 #define GZ_PLUGIN_TEST_PLUGINS_FACTORYPLUGINS_HH_
 
-#include <ignition/plugin/Factory.hh>
+#include <gz/plugin/Factory.hh>
 
 #include "DummyPlugins.hh"
 
diff --git a/test/plugins/TemplatedPlugins.cc b/test/plugins/TemplatedPlugins.cc
index 84d4c623..23e2c42f 100644
--- a/test/plugins/TemplatedPlugins.cc
+++ b/test/plugins/TemplatedPlugins.cc
@@ -19,7 +19,7 @@
 
 #include "TemplatedPlugins.hh"
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 namespace test
 {
diff --git a/test/static_assertions/plugin_bad_const_assignment.cc b/test/static_assertions/plugin_bad_const_assignment.cc
index a906a315..63d75a4e 100644
--- a/test/static_assertions/plugin_bad_const_assignment.cc
+++ b/test/static_assertions/plugin_bad_const_assignment.cc
@@ -15,7 +15,7 @@
  *
 */
 
-#include "ignition/plugin/PluginPtr.hh"
+#include "gz/plugin/PluginPtr.hh"
 
 int main()
 {
diff --git a/test/static_assertions/plugin_bad_const_construct.cc b/test/static_assertions/plugin_bad_const_construct.cc
index dedc97b8..6a0f87aa 100644
--- a/test/static_assertions/plugin_bad_const_construct.cc
+++ b/test/static_assertions/plugin_bad_const_construct.cc
@@ -15,7 +15,7 @@
  *
 */
 
-#include "ignition/plugin/PluginPtr.hh"
+#include "gz/plugin/PluginPtr.hh"
 
 int main()
 {
diff --git a/test/static_assertions/plugin_no_base_class.cc b/test/static_assertions/plugin_no_base_class.cc
index 46fd23b6..3a1d24fa 100644
--- a/test/static_assertions/plugin_no_base_class.cc
+++ b/test/static_assertions/plugin_no_base_class.cc
@@ -15,7 +15,7 @@
  *
 */
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 class A
 {
diff --git a/test/static_assertions/plugin_wrong_base_class.cc b/test/static_assertions/plugin_wrong_base_class.cc
index 5385ee56..925684ea 100644
--- a/test/static_assertions/plugin_wrong_base_class.cc
+++ b/test/static_assertions/plugin_wrong_base_class.cc
@@ -15,7 +15,7 @@
  *
 */
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 namespace ns
 {