diff --git a/cli/include/external-cli/ignition/utils/cli/App.hpp b/cli/include/external-cli/ignition/utils/cli/App.hpp
index bf8b209..9490920 100644
--- a/cli/include/external-cli/ignition/utils/cli/App.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/App.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/App.hpp>
+#include <gz/utils/cli/App.hpp>
diff --git a/cli/include/external-cli/ignition/utils/cli/CLI.hpp b/cli/include/external-cli/ignition/utils/cli/CLI.hpp
index 2f13af5..301b501 100644
--- a/cli/include/external-cli/ignition/utils/cli/CLI.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/CLI.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/CLI.hpp>
+#include <gz/utils/cli/CLI.hpp>
diff --git a/cli/include/external-cli/ignition/utils/cli/Config.hpp b/cli/include/external-cli/ignition/utils/cli/Config.hpp
index 9c0aa6d..c678f13 100644
--- a/cli/include/external-cli/ignition/utils/cli/Config.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/Config.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/Config.hpp>
+#include <gz/utils/cli/Config.hpp>
diff --git a/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp b/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp
index 4cd3458..005bb71 100644
--- a/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/ConfigFwd.hpp>
+#include <gz/utils/cli/ConfigFwd.hpp>
diff --git a/cli/include/external-cli/ignition/utils/cli/Error.hpp b/cli/include/external-cli/ignition/utils/cli/Error.hpp
index 2645c6e..b3d44a0 100644
--- a/cli/include/external-cli/ignition/utils/cli/Error.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/Error.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/Error.hpp>
+#include <gz/utils/cli/Error.hpp>
diff --git a/cli/include/external-cli/ignition/utils/cli/Formatter.hpp b/cli/include/external-cli/ignition/utils/cli/Formatter.hpp
index 9015d9f..c914eed 100644
--- a/cli/include/external-cli/ignition/utils/cli/Formatter.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/Formatter.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/Formatter.hpp>
+#include <gz/utils/cli/Formatter.hpp>
diff --git a/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp b/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp
index 673339c..b2a6329 100644
--- a/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/FormatterFwd.hpp>
+#include <gz/utils/cli/FormatterFwd.hpp>
diff --git a/cli/include/external-cli/ignition/utils/cli/Macros.hpp b/cli/include/external-cli/ignition/utils/cli/Macros.hpp
index 2b65982..953f04b 100644
--- a/cli/include/external-cli/ignition/utils/cli/Macros.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/Macros.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/Macros.hpp>
+#include <gz/utils/cli/Macros.hpp>
diff --git a/cli/include/external-cli/ignition/utils/cli/Option.hpp b/cli/include/external-cli/ignition/utils/cli/Option.hpp
index d29b97a..804c0a1 100644
--- a/cli/include/external-cli/ignition/utils/cli/Option.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/Option.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/Option.hpp>
+#include <gz/utils/cli/Option.hpp>
diff --git a/cli/include/external-cli/ignition/utils/cli/Split.hpp b/cli/include/external-cli/ignition/utils/cli/Split.hpp
index 63682e7..2de6ebb 100644
--- a/cli/include/external-cli/ignition/utils/cli/Split.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/Split.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/Split.hpp>
+#include <gz/utils/cli/Split.hpp>
diff --git a/cli/include/external-cli/ignition/utils/cli/StringTools.hpp b/cli/include/external-cli/ignition/utils/cli/StringTools.hpp
index 715b332..6e2e6c7 100644
--- a/cli/include/external-cli/ignition/utils/cli/StringTools.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/StringTools.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/StringTools.hpp>
+#include <gz/utils/cli/StringTools.hpp>
diff --git a/cli/include/external-cli/ignition/utils/cli/Timer.hpp b/cli/include/external-cli/ignition/utils/cli/Timer.hpp
index a3823b6..c5ee409 100644
--- a/cli/include/external-cli/ignition/utils/cli/Timer.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/Timer.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/Timer.hpp>
+#include <gz/utils/cli/Timer.hpp>
diff --git a/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp b/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp
index e8b521f..d3a1139 100644
--- a/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/TypeTools.hpp>
+#include <gz/utils/cli/TypeTools.hpp>
diff --git a/cli/include/external-cli/ignition/utils/cli/Validators.hpp b/cli/include/external-cli/ignition/utils/cli/Validators.hpp
index 06c7c4e..5a50ab7 100644
--- a/cli/include/external-cli/ignition/utils/cli/Validators.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/Validators.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/Validators.hpp>
+#include <gz/utils/cli/Validators.hpp>
diff --git a/cli/include/external-cli/ignition/utils/cli/Version.hpp b/cli/include/external-cli/ignition/utils/cli/Version.hpp
index a02dde7..fe0216f 100644
--- a/cli/include/external-cli/ignition/utils/cli/Version.hpp
+++ b/cli/include/external-cli/ignition/utils/cli/Version.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <external-cli/gz/utils/cli/Version.hpp>
+#include <gz/utils/cli/Version.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/App.hpp b/cli/include/vendored-cli/ignition/utils/cli/App.hpp
index defcc2d..1d214d7 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/App.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/App.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/App.hpp>
+#include <gz/utils/cli/App.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp b/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp
index 4a64829..d3c666c 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/CLI.hpp>
+#include <gz/utils/cli/CLI.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/Config.hpp b/cli/include/vendored-cli/ignition/utils/cli/Config.hpp
index 768d70c..60eab0f 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/Config.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/Config.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/Config.hpp>
+#include <gz/utils/cli/Config.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp b/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp
index 32be359..1d9c576 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/ConfigFwd.hpp>
+#include <gz/utils/cli/ConfigFwd.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/Error.hpp b/cli/include/vendored-cli/ignition/utils/cli/Error.hpp
index 1866c8d..b042135 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/Error.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/Error.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/Error.hpp>
+#include <gz/utils/cli/Error.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp b/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp
index 2f4e75f..26799c9 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/Formatter.hpp>
+#include <gz/utils/cli/Formatter.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp b/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp
index f428383..638e4c2 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/FormatterFwd.hpp>
+#include <gz/utils/cli/FormatterFwd.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp b/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp
index fff0cf8..f85a594 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/Macros.hpp>
+#include <gz/utils/cli/Macros.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/Option.hpp b/cli/include/vendored-cli/ignition/utils/cli/Option.hpp
index 1d0f4ad..119d67d 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/Option.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/Option.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/Option.hpp>
+#include <gz/utils/cli/Option.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/Split.hpp b/cli/include/vendored-cli/ignition/utils/cli/Split.hpp
index ef743d2..707fdb0 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/Split.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/Split.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/Split.hpp>
+#include <gz/utils/cli/Split.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp b/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp
index a613d6e..7780fdc 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/StringTools.hpp>
+#include <gz/utils/cli/StringTools.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp b/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp
index f12d5d2..ab8cd9a 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/Timer.hpp>
+#include <gz/utils/cli/Timer.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp b/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp
index c338de7..5fae20b 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/TypeTools.hpp>
+#include <gz/utils/cli/TypeTools.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp b/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp
index 9e3909b..83acda9 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/Validators.hpp>
+#include <gz/utils/cli/Validators.hpp>
diff --git a/cli/include/vendored-cli/ignition/utils/cli/Version.hpp b/cli/include/vendored-cli/ignition/utils/cli/Version.hpp
index 9b66af1..ce0731c 100644
--- a/cli/include/vendored-cli/ignition/utils/cli/Version.hpp
+++ b/cli/include/vendored-cli/ignition/utils/cli/Version.hpp
@@ -15,4 +15,4 @@
  *
  */
 
-#include <vendored-cli/gz/utils/cli/Version.hpp>
+#include <gz/utils/cli/Version.hpp>