From fe79f01fa336b16317507178640e7b6a7ae83cb3 Mon Sep 17 00:00:00 2001
From: methylDragon <methylDragon@gmail.com>
Date: Mon, 27 Jun 2022 16:26:39 -0700
Subject: [PATCH 1/5] Migrate some docs and project names in macros

Signed-off-by: methylDragon <methylDragon@gmail.com>
---
 Changelog.md                             |  7 +-
 MigrationFromClassic.md                  | 94 ++++++++++++------------
 README.md                                | 22 +++---
 api.md.in                                |  4 +-
 cmake/Export.hh.in                       |  2 +-
 cmake/IgnConfigureBuild.cmake            |  2 +-
 cmake/IgnConfigureProject.cmake          |  2 +-
 cmake/IgnCreateDocs.cmake                |  2 +-
 cmake/IgnPackaging.cmake                 |  6 +-
 cmake/IgnSetCompilerFlags.cmake          |  2 +-
 cmake/pkgconfig/ignition-component.pc.in |  2 +-
 cmake/pkgconfig/ignition.pc.in           |  2 +-
 config/ignition-cmake-config.cmake.in    | 18 ++---
 config/ignition-cmake.pc.in              |  4 +-
 examples/find_ogre2/README.md            |  2 +-
 tutorials.md.in                          |  4 +-
 tutorials/developing_with_ign-cmake.md   | 12 +--
 tutorials/index.md                       |  2 +-
 tutorials/install.md                     | 31 ++++----
 19 files changed, 109 insertions(+), 111 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b9351947..c7b83dfa 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -101,7 +101,7 @@
 1. User-friendly skip component warning
     * [Pull request #165](https://github.com/gazebosim/gz-cmake/pull/165)
 
-1. Run ign-cmake's copy of check_test_ran
+1. Run gz-cmake's copy of check_test_ran
     * [Pull request #168](https://github.com/gazebosim/gz-cmake/pull/168)
 
 ### Gazebo CMake 2.7.0 (2021-03-30)
@@ -157,10 +157,10 @@
 1. Remove deprecated doxygen configurations
     * [Pull request 136](https://github.com/gazebosim/gz-cmake/pull/136)
 
-1. Generate doxygen tutorials for ign-cmake
+1. Generate doxygen tutorials for gz-cmake
     * [Pull request 137](https://github.com/gazebosim/gz-cmake/pull/137)
 
-1. Enable make codecheck for ign-cmake
+1. Enable make codecheck for gz-cmake
     * [Pull request 138](https://github.com/gazebosim/gz-cmake/pull/138)
 
 1. Generate valid visibility macros by replacing hyphens in component name
@@ -387,4 +387,3 @@
     * [Full list of changes](https://github.com/gazebosim/gz-cmake/compare/ignition-cmake_0.4.1...ignition-cmake_0.4.0)
 
 ### Gazebo CMake 0.4.0
-
diff --git a/MigrationFromClassic.md b/MigrationFromClassic.md
index 15a054c8..a79f5724 100644
--- a/MigrationFromClassic.md
+++ b/MigrationFromClassic.md
@@ -1,24 +1,24 @@
 # Migration Instructions (from Gazebo classic)
 
-This file provides instructions for `ignition` library developers to adopt the
-`ignition-cmake` package into their own library's build system. This document
-is primarily targeted at ignition libraries that existed before `ignition-cmake`
-was available, but it might also be useful for getting a new `ignition` project
+This file provides instructions for `Gazebo` library developers to adopt the
+`gz-cmake` package into their own library's build system. This document
+is primarily targeted at Gazebo libraries that existed before `gz-cmake`
+was available, but it might also be useful for getting a new `Gazebo` project
 started.
 
 The first section goes over changes that your library **must** make in order to
-be compatible with `ignition-cmake`. The second section mentions some utilities
-provided by `ignition-cmake` which might make your project's CMake scripts more
+be compatible with `gz-cmake`. The second section mentions some utilities
+provided by `gz-cmake` which might make your project's CMake scripts more
 clean and maintainable, but use of those utilities is not required. The third
 section details some of the new CMake features that we'll be using through
-`ignition-cmake` and explains why we want to use those features. The last
+`gz-cmake` and explains why we want to use those features. The last
 section describes some CMake anti-patterns which we should aggressively avoid
 as we move forward.
 
 # 1. Required Changes
 
-You can find examples of projects that have been set up to use `ign-cmake` in
-the repos of `ign-common` (branch: `CMakeRefactor`) and `ign-math`
+You can find examples of projects that have been set up to use `gz-cmake` in
+the repos of `gz-common` (branch: `CMakeRefactor`) and `gz-math`
 (branch: `CMakeRefactor-3`). The following is a checklist to help you make sure
 your project is migrated properly.
 
@@ -30,14 +30,14 @@ That's right, just throw it all out.
 We're migrating to 3.10 because it provides many valuable features that we are
 now taking advantage of.
 
-### Then call `find_package(ignition-cmake3 REQUIRED)`
+### Then call `find_package(gz-cmake3 REQUIRED)`
 
-This will find `ignition-cmake` and load up all its useful features for you.
+This will find `gz-cmake` and load up all its useful features for you.
 
 ### Then call `gz_configure_project(<project> <version>)`
 
 This is a wrapper for cmake's native `project(~)` command which additionally
-sets a bunch of variables that will be needed by the `ignition-cmake` macros and
+sets a bunch of variables that will be needed by the `gz-cmake` macros and
 functions.
 
 ### Then search for each dependency using `gz_find_package(~)`
@@ -56,7 +56,7 @@ A variety of arguments are available to guide the behavior of
 `gz_find_package(~)`. Most of them will not be needed in most situations, but
 you should consider reading them over once just in case they might be relevant
 for you. The macro's documentation is available in
-`ign-cmake/cmake/IgnUtils.cmake` just above definition of `gz_find_package(~)`.
+`gz-cmake/cmake/IgnUtils.cmake` just above definition of `gz_find_package(~)`.
 Feel free to ask questions about any of its arguments that are unclear.
 
 Any operations that might need to be performed while searching for a package
@@ -66,7 +66,7 @@ information on writing find-modules.
 ### Then call `gz_configure_build(~)`
 
 This macro accepts the argument `QUIT_IF_BUILD_ERRORS` which you should pass to
-it to get the standard behavior for the ignition projects. If for some reason
+it to get the standard behavior for the Gazebo projects. If for some reason
 you want to handle build errors in your own way, you can leave that argument
 out and then do as you please after the macro finishes.
 
@@ -77,7 +77,7 @@ listed below must be applied throughout your directory tree.
 
 ### Change instances of `PROJECT_<type>_VERSION` variables to `PROJECT_VERSION_<type>`.
 
-In the original ignition CMake scripts, we define variables for the components
+In the original Gazebo CMake scripts, we define variables for the components
 of the library version: `PROJECT_MAJOR_VERSION`, `PROJECT_MINOR_VERSION`, and
 `PROJECT_PATCH_VERSION`. While there is nothing inherently wrong with these
 variable names, in CMake 3+ the `project(~)` command automatically defines the
@@ -91,7 +91,7 @@ to embrace the "single source of truth" pattern.
 ### Change instances of `IGN_PROJECT_NAME` to `IGN_DESIGNATION`
 
 We've had a variable called `IGN_PROJECT_NAME` which refers to the `<suffix>`
-in the `ignition-<suffix>` name of each project. I felt that the name of the
+in the `gz-<suffix>` name of each project. I felt that the name of the
 variable was too similar to the `PROJECT_NAME` variable that is automatically
 defined by CMake, as well as the `PROJECT_NAME[_NO_VERSION][_UPPER/_LOWER]` that
 we define for convenience. Instead of referring to both as `[IGN_]PROJECT_NAME`,
@@ -122,12 +122,12 @@ requires a certain standard, it MUST be specified directly to this function in
 order to ensure that the requirement gets correctly propagated into the
 project's package information so that dependent libraries will also be aware of
 the requirement. See the documentation of `gz_create_core_library(~)` in
-`ign-cmake/cmake/IgnUtils.cmake` for more details on how to specify your
+`gz-cmake/cmake/IgnUtils.cmake` for more details on how to specify your
 library's C++ standard requirement.
 
 ### Specify `TYPE` and `SOURCES` arguments in `gz_build_tests(~)`
 
-Previously, ignition libraries would set a `TEST_TYPE` variable before calling
+Previously, Gazebo libraries would set a `TEST_TYPE` variable before calling
 `gz_build_tests(~)`, and that variable would be used by the macro to determine
 the type of tests it should create. This resulted in some anti-patterns where
 the `TEST_TYPE` variable would be set somewhere far away from the call to
@@ -160,7 +160,7 @@ Also note that all of the "interface include directories" of any targets that
 you pass to `LIB_DEPS` will automatically be visible to all the tests, so this
 tag should be even less commonly needed than `LIB_DEPS`.
 
-### Move your project's `cmake/config.hh.in` file to `include/ignition/<project>/config.hh.in`
+### Move your project's `cmake/config.hh.in` file to `include/gz/<project>/config.hh.in`
 
 The `config.hh.in` file has traditionally lived in the `cmake` subdirectory of
 each project, but that subdirectory should be deleted at the end of the
@@ -211,9 +211,9 @@ names of libraries. When an item containing `::` is passed to
 and it will throw an error and quit if that target is not found, instead of
 failing quietly or subtly. Therefore, we should always exercise the practice of
 using `::` in the names of any imported targets that we intend to use.
-`ignition-cmake` will automatically export all ignition library targets to have
-the name `ignition-<project><major_version>::ignition-<project><major_version>`
-(for example, `ignition-common0::ignition-common0`). When creating a cmake
+`gz-cmake` will automatically export all Gazebo library targets to have
+the name `gz-<project><major_version>::gz-<project><major_version>`
+(for example, `gz-common0::gz-common0`). When creating a cmake
 find-module, the macro `gz_import_target(~)` should be used generate an
 imported target which follows this convention. More about creating find-modules
 can be found in the section on anti-patterns.
@@ -223,13 +223,13 @@ can be found in the section on anti-patterns.
 Calling `gz_create_core_library()` will also take care of installing the
 library. Simply remove this function from your cmake script.
 
-### Replace calls to `#include "ignition/<project>/System.hh"` with `#include "ignition/<project>/Export.hh"`, and delete the file `System.hh`.
+### Replace calls to `#include "gz/<project>/System.hh"` with `#include "gz/<project>/Export.hh"`, and delete the file `System.hh`.
 
-Up until now, we've been maintaining a "System" header in each ignition library.
+Up until now, we've been maintaining a "System" header in each Gazebo library.
 This is being replaced by a set of auto-generated headers, because some of the
 individual projects' implementations had errors or issues in them. The new
 auto-generated headers will enforce consistency and compatibility across all of
-the ignition projects. The header is also being renamed because the role of the
+the Gazebo projects. The header is also being renamed because the role of the
 header is to provide macros that facilitate exporting the library, therefore it
 seems more appropriate to name it "Export" instead of "System". Nothing in the
 header is interacting with the operating system, so the current name feels like
@@ -237,28 +237,28 @@ somewhat of a misnomer (presumably the name "System" came from the fact that the
 macros are system-dependent, but I think naming the header after the role that
 it's performing would be more appropriate).
 
-### Replace `IGNITION_<VISIBLE/HIDDEN>` with `IGNITION_<PROJECT>_<VISIBLE/HIDDEN>` in all headers
+### Replace `GZ_<VISIBLE/HIDDEN>` with `GZ_<PROJECT>_<VISIBLE/HIDDEN>` in all headers
 
-The export (a.k.a. visibility) macros used by each ignition library must be
-unique. Different ignition libraries might depend on each other, and the
+The export (a.k.a. visibility) macros used by each Gazebo library must be
+unique. Different Gazebo libraries might depend on each other, and the
 compiler/linker would be misinformed about which symbols to export if two
 different libraries share the same export macro.
 
 Note that component libraries will generate their own visibility macros so that
 they can correctly be compiled alongside their core library. Those macros will
-look like `IGNITION_<PROJECT>_<COMPONENT>_<VISIBLE/HIDDEN>`.
+look like `GZ_<PROJECT>_<COMPONENT>_<VISIBLE/HIDDEN>`.
 
-### Move all find-modules in your project's `cmake/` directory to your `ign-cmake` repo, and submit a pull request for them
+### Move all find-modules in your project's `cmake/` directory to your `gz-cmake` repo, and submit a pull request for them
 
-We are centralizing all find-modules into `ign-cmake` so that everyone benefits
+We are centralizing all find-modules into `gz-cmake` so that everyone benefits
 from them, and we get a single place to maintain them.
 
 ### Remove the entire `cmake/` subdirectory from your project
 
 Once the above steps are complete, your project's `cmake/` subdirectory should
 no longer be needed. If your `cmake/` subdirectory contained some features
-that are not already present in `ign-cmake`, then you should add those
-features to `ign-cmake` and submit a pull request. I will try to be very prompt
+that are not already present in `gz-cmake`, then you should add those
+features to `gz-cmake` and submit a pull request. I will try to be very prompt
 about reviewing and approving those PRs.
 
 ### To add a component library, use `gz_add_component(<component> SOURCES ${sources})`
@@ -276,9 +276,9 @@ change this behavior, you may pass one of the following arguments:
 `INTERFACE_DEPENDS_ON_PROJECT_LIB`.
 
 By default, the auto-generate public headers for this component will go into the
-directory `ignition/<project>/<component>/`. You can change the subdirectory
+directory `gz/<project>/<component>/`. You can change the subdirectory
 using the optional argument `INCLUDE_SUBDIR <subdir>` which will instead put
-the auto-generate public headers into `ignition/<project>/<subdir>/`.
+the auto-generate public headers into `gz/<project>/<subdir>/`.
 
 You may also pass the argument `GET_TARGET_NAME <output_var>` to retrieve the
 auto-generated name of the target. You can then use the target with
@@ -299,11 +299,11 @@ and a `tests` variable (containing the unit test sources).
 If there are files that you want to exclude from either of these lists, you can
 use `list(REMOVE_ITEM <list> <filenames>)` after calling the function. That
 approach can be used to conditionally remove files from a list (see
-`ign-common/src/CMakeLists.txt` for an example). Alternatively, if you always
+`gz-common/src/CMakeLists.txt` for an example). Alternatively, if you always
 want a file to be excluded, you can change its extension (e.g. `*.cc.backup` or
 `.cc.old`) until a later time when you want it to be used again.
 
-### Use `gz_install_all_headers(~)` in `include/ignition/<project>/CMakeLists.txt`
+### Use `gz_install_all_headers(~)` in `include/gz/<project>/CMakeLists.txt`
 
 Using this macro will install all files ending in `*.h` and `*.hh` in the
 current source directory recursively (so all the files in all subdirectories as
@@ -330,9 +330,9 @@ list of source files, which is sufficient to be passed to `gz_build_tests(~)`.
 Files that end in `*.cmake` are known as "modules" and are not meant to be
 invoked using the fully qualified filename. Instead, the path that leads up to
 the module should be added to `${CMAKE_MODULE_PATH}` if it is not in there
-already (the module path of `ignition-cmake` will automatically be added when
-you call `find_package(ignition-cmake# REQUIRED)`, so you do not have to worry
-about this for `ign-cmake` modules). After that, the module should be invoked
+already (the module path of `gz-cmake` will automatically be added when
+you call `find_package(gz-cmake# REQUIRED)`, so you do not have to worry
+about this for `gz-cmake` modules). After that, the module should be invoked
 using `include(ModuleName)` with no path or extension. CMake will automatically
 find the appropriate file.
 
@@ -345,7 +345,7 @@ after being invoked by the command `find_package(SomePackage)`. Notice that the
 `.cmake` in the filename `FindSomePackage.cmake`. Case matters. This is not just
 a convention; it is a cmake requirement.
 
-Note that while using `ignition-cmake`, you should be using `gz_find_package(~)`
+Note that while using `gz-cmake`, you should be using `gz_find_package(~)`
 instead of the native `find_package(~)` command. It does the same thing, except
 that it adds some additional functionality which is important for ensuring
 correctness in the package configuration files that we generate for our projects.
@@ -370,28 +370,28 @@ divergent methods of varying quality for solving the same problem). Instead, any
 procedures or operations that are needed to find a package dependency should be
 put into a file called `Find<PACKAGE>.cmake` where `<PACKAGE>` should be
 replaced with the name of the package (often this is done in all uppercase
-letters). This `Find<PACKAGE>.cmake` should be added to `ign-cmake/cmake`.
+letters). This `Find<PACKAGE>.cmake` should be added to `gz-cmake/cmake`.
 Pull requests for adding find-modules will be reviewed and approved as quickly
 as possible. This way, all projects can benefit from any one person's effort in
 writing a good quality find-module.
 
 In many cases, a package that we depend on will be distributed with a pkgconfig
-(`*.pc`) file. In such a case, `ignition-cmake` provides a macro that can easily
+(`*.pc`) file. In such a case, `gz-cmake` provides a macro that can easily
 find the package and create an imported target for it. Simply use `include(IgnPkgConfig)`
 and then `gz_pkg_check_modules(~)` in your find-module, and you are done. An
-example of a simple case of this can be found in `ign-cmake/cmake/FindGTS.cmake`.
+example of a simple case of this can be found in `gz-cmake/cmake/FindGTS.cmake`.
 
 If certain version-based behavior is needed, that must be handled within the
 find-module. A simple example using pkgconfig can be found in
-`ign-cmake/cmake/FindAVDEVICE.cmake`.
+`gz-cmake/cmake/FindAVDEVICE.cmake`.
 
 Sometimes a package may be needed but there is no guarantee that a pkgconfig
 file will be available for it. For an example of how to handle that, see
-`ign-cmake/cmake/FindFreeImage.cmake`.
+`gz-cmake/cmake/FindFreeImage.cmake`.
 
 Some libraries are never distributed with a pkgconfig file. For an example of
 how to create a find-module when a pkgconfig file is guaranteed to not exist,
-see `ign-cmake/cmake/FindDL.cmake`. Note that you must manually specify the
+see `gz-cmake/cmake/FindDL.cmake`. Note that you must manually specify the
 variables `<PACKAGE>_PKGCONFIG_ENTRY` and `<PACKAGE>_PKGCONFIG_TYPE` in such
 cases. The entry will have to be the name of library (or libraries), preceded by
 `-l`, while the type must be `PROJECT_PKGCONFIG_LIBS`.
diff --git a/README.md b/README.md
index c80c4989..d8f4d70d 100644
--- a/README.md
+++ b/README.md
@@ -45,9 +45,9 @@ Windows       | [![Build Status](https://build.osrfoundation.org/buildStatus/ico
 
 # Features
 
-ignition-cmake provides a set of cmake modules that are used by the C++-based ignition projects. These modules help to control the quality and consistency of the ignition projects' build systems.
+gz-cmake provides a set of cmake modules that are used by the C++-based Gazebo projects. These modules help to control the quality and consistency of the Gazebo projects' build systems.
 
-These modules are tailored to the ignition projects, so their use for non-ignition projects might be limited, but they may serve as a useful reference for setting up a modern cmake build system using good practices.
+These modules are tailored to the Gazebo projects, so their use for non-Gazebo projects might be limited, but they may serve as a useful reference for setting up a modern cmake build system using good practices.
 
 # Install
 
@@ -57,7 +57,7 @@ The [Source Install](#source-install) instructions should be used if you need th
 
 ## Binary Install
 
-On Ubuntu systems, `apt-get` can be used to install `ignition-cmake`:
+On Ubuntu systems, `apt-get` can be used to install `gz-cmake`:
 
 ```
 $ sudo apt install libignition-cmake<#>-dev
@@ -69,7 +69,7 @@ Be sure to replace `<#>` with a number value, such as `1` or `2`, depending on w
 
 ### Prerequisites
 
-The only prerequisite of `ignition-cmake` is `cmake`. Ubuntu users can install cmake with the package manager:
+The only prerequisite of `gz-cmake` is `cmake`. Ubuntu users can install cmake with the package manager:
 
 ```
 $ sudo apt install cmake
@@ -81,7 +81,7 @@ To build and install from source, you can clone the repo and use cmake to instal
 
 ```
 $ git clone https://github.com/gazebosim/gz-cmake
-$ cd ign-cmake
+$ cd gz-cmake
 $ mkdir build
 $ cd build
 $ cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/install/dir
@@ -99,7 +99,7 @@ Documentation can be accessed at https://gazebosim.org/libs/cmake
 
 # Documentation
 
-Documentation for `ignition-cmake` can be found within the source code, and also in the [MIGRATION.md guide](https://github.com/gazebosim/gz-cmake/blob/master/MIGRATION.md).
+Documentation for `gz-cmake` can be found within the source code, and also in the [MIGRATION.md guide](https://github.com/gazebosim/gz-cmake/blob/master/MIGRATION.md).
 
 # Testing
 
@@ -115,11 +115,11 @@ $ make test
 
 * `cmake`: cmake modules that get installed by this package
 * `codecheck`: code linting and static analyzing utilities that get installed by this package
-* `config`: template files for producing the config-files of `ignition-cmake`; these are only used internally
-* `doc`: template files to help ignition projects generate their own documentation
-* `examples`: fake projects that are used to test `ignition-cmake`
-* `include`: C++ utility header files that get installed with `ignition-cmake`
-* `test`: a directory of tests for the C++ utility component of `ignition-cmake`
+* `config`: template files for producing the config-files of `gz-cmake`; these are only used internally
+* `doc`: template files to help Gazebo projects generate their own documentation
+* `examples`: fake projects that are used to test `gz-cmake`
+* `include`: C++ utility header files that get installed with `gz-cmake`
+* `test`: a directory of tests for the C++ utility component of `gz-cmake`
 * `tools`: scripts for continuous integration testing
 
 # Contributing
diff --git a/api.md.in b/api.md.in
index 00f5d6c5..076d0382 100644
--- a/api.md.in
+++ b/api.md.in
@@ -1,6 +1,6 @@
-## Ignition @IGN_DESIGNATION_CAP@
+## Gazebo @IGN_DESIGNATION_CAP@
 
-Ignition @IGN_DESIGNATION_CAP@ is a component in Ignition, a set of libraries
+Gazebo @IGN_DESIGNATION_CAP@ is a component in Gazebo, a set of libraries
 designed to rapidly develop robot and simulation applications.
 
 ## License
diff --git a/cmake/Export.hh.in b/cmake/Export.hh.in
index 5289d632..e9a21dfe 100644
--- a/cmake/Export.hh.in
+++ b/cmake/Export.hh.in
@@ -18,7 +18,7 @@
 /*
  * ==========================================================================
  * This file was automatically generated by CMake; do not modify it directly.
- * To modify this file, make changes to ign-cmake/cmake/Export.hh.in
+ * To modify this file, make changes to gz-cmake/cmake/Export.hh.in
  * ==========================================================================
 */
 
diff --git a/cmake/IgnConfigureBuild.cmake b/cmake/IgnConfigureBuild.cmake
index 62a995ff..854caae9 100644
--- a/cmake/IgnConfigureBuild.cmake
+++ b/cmake/IgnConfigureBuild.cmake
@@ -4,7 +4,7 @@
 #
 # gz_configure_build()
 #
-# Configures the build rules of an ignition library project.
+# Configures the build rules of a Gazebo library project.
 #
 #===============================================================================
 # Copyright (C) 2017 Open Source Robotics Foundation
diff --git a/cmake/IgnConfigureProject.cmake b/cmake/IgnConfigureProject.cmake
index 58a8f1ea..91e6df5e 100644
--- a/cmake/IgnConfigureProject.cmake
+++ b/cmake/IgnConfigureProject.cmake
@@ -4,7 +4,7 @@
 #
 # gz_configure_project([VERSION_SUFFIX <pre|alpha|beta|etc>])
 #
-# Sets up an ignition library project.
+# Sets up a Gazebo library project.
 #
 # NO_IGNITION_PREFIX: Optional. Don't use ignition as prefix in
 #     cmake project name.
diff --git a/cmake/IgnCreateDocs.cmake b/cmake/IgnCreateDocs.cmake
index 2c394f3f..593ba027 100644
--- a/cmake/IgnCreateDocs.cmake
+++ b/cmake/IgnCreateDocs.cmake
@@ -4,7 +4,7 @@
 #
 # gz_create_docs
 #
-# Creates documentation for an ignition library project.
+# Creates documentation for a Gazebo library project.
 #
 #===============================================================================
 # Copyright (C) 2017 Open Source Robotics Foundation
diff --git a/cmake/IgnPackaging.cmake b/cmake/IgnPackaging.cmake
index 0b320590..650391fd 100644
--- a/cmake/IgnPackaging.cmake
+++ b/cmake/IgnPackaging.cmake
@@ -4,12 +4,12 @@
 #
 # _gz_setup_packages
 #
-# Sets up package information for an ignition library project.
+# Sets up package information for a Gazebo library project.
 # This function is internal to gz-cmake.
 #
 # gz_create_packages
 #
-# Creates a package for an ignition library project
+# Creates a package for a Gazebo library project
 #
 #===============================================================================
 # Copyright (C) 2017 Open Source Robotics Foundation
@@ -342,7 +342,7 @@ function(_gz_create_cmake_package)
     FILE ${gz_target_ouput}
     # We add a namespace that ends with a :: to the name of the exported target.
     # This is so consumers of the project can call
-    #     find_package(ignition-<project>)
+    #     find_package(gz-<project>)
     #     target_link_libraries(consumer_project ignition-<project>::ignition-<project>)
     # and cmake will understand that the consumer is asking to link the imported
     # target "ignition-<project>" to their "consumer_project" rather than asking
diff --git a/cmake/IgnSetCompilerFlags.cmake b/cmake/IgnSetCompilerFlags.cmake
index 750d15dc..406394c9 100644
--- a/cmake/IgnSetCompilerFlags.cmake
+++ b/cmake/IgnSetCompilerFlags.cmake
@@ -4,7 +4,7 @@
 #
 # _gz_set_compiler_flags()
 #
-# Sets up compiler flags for an ignition library project
+# Sets up compiler flags for a Gazebo library project
 #
 #===============================================================================
 # Copyright (C) 2017 Open Source Robotics Foundation
diff --git a/cmake/pkgconfig/ignition-component.pc.in b/cmake/pkgconfig/ignition-component.pc.in
index fd08ea57..2a04c6a3 100644
--- a/cmake/pkgconfig/ignition-component.pc.in
+++ b/cmake/pkgconfig/ignition-component.pc.in
@@ -2,7 +2,7 @@ prefix=${pcfiledir}/@PC_CONFIG_RELATIVE_PATH_TO_PREFIX@
 libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
 includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@IGN_INCLUDE_INSTALL_DIR_POSTFIX@
 
-Name: Ignition @IGN_DESIGNATION@ @component_name@
+Name: Gazebo @IGN_DESIGNATION@ @component_name@
 Description: A set of @IGN_DESIGNATION@ @component_name@ classes for robot applications
 Version: @PROJECT_VERSION_FULL_NO_SUFFIX@
 Requires: @component_pkgconfig_requires@
diff --git a/cmake/pkgconfig/ignition.pc.in b/cmake/pkgconfig/ignition.pc.in
index e6cd8748..18da543d 100644
--- a/cmake/pkgconfig/ignition.pc.in
+++ b/cmake/pkgconfig/ignition.pc.in
@@ -2,7 +2,7 @@ prefix=${pcfiledir}/@PC_CONFIG_RELATIVE_PATH_TO_PREFIX@
 libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
 includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@IGN_INCLUDE_INSTALL_DIR_POSTFIX@
 
-Name: Ignition @IGN_DESIGNATION@
+Name: Gazebo @IGN_DESIGNATION@
 Description: A set of @IGN_DESIGNATION@ classes for robot applications
 Version: @PROJECT_VERSION_FULL_NO_SUFFIX@
 Requires: gz-cmake@IGNITION_CMAKE_VERSION_MAJOR@ >= 1.1 @PROJECT_PKGCONFIG_REQUIRES@
diff --git a/config/ignition-cmake-config.cmake.in b/config/ignition-cmake-config.cmake.in
index 7e98523f..1d5120a9 100644
--- a/config/ignition-cmake-config.cmake.in
+++ b/config/ignition-cmake-config.cmake.in
@@ -1,11 +1,11 @@
-# - Config file for ignition-cmake (not for any other ignition libraries).
+# - Config file for gz-cmake (not for any other Gazebo libraries).
 #
-# To find and load ignition-cmake modules into your project, simply invoke:
+# To find and load gz-cmake modules into your project, simply invoke:
 #
 # find_package(@PKG_NAME@)
 #
 # That will define the variable @PKG_NAME@_FOUND, and will open up access
-# to all the cmake-modules and find-modules that are provided by ignition-cmake.
+# to all the cmake-modules and find-modules that are provided by gz-cmake.
 
 # We explicitly set the desired cmake version to ensure that the policy settings
 # of users or of toolchains do not result in the wrong behavior for our modules.
@@ -33,19 +33,19 @@ if(NOT TARGET @ign_utilities_import_target_name@)
 endif()
 
 # We should only perform these operations if either
-#  1. ign-cmake has not been included yet, or
-#  2. we need a higher version of ign-cmake than the last one that was included
+#  1. gz-cmake has not been included yet, or
+#  2. we need a higher version of gz-cmake than the last one that was included
 #
-# The only time we should need to switch to a higher version of ign-cmake is
+# The only time we should need to switch to a higher version of gz-cmake is
 # when importing targets for dependencies, i.e. using the find-modules of
-# ign-cmake. All find-modules that are available in older versions of ign-cmake
-# should be available in newer versions of ign-cmake, so this should not create
+# gz-cmake. All find-modules that are available in older versions of gz-cmake
+# should be available in newer versions of gz-cmake, so this should not create
 # any conflicts.
 if( NOT IGNITION_CMAKE_VERSION_MAJOR
     OR (IGNITION_CMAKE_VERSION_MAJOR LESS @PROJECT_VERSION_MAJOR@) )
 
   #--------------------------------------
-  # Create a variable to indicate what version of ignition-cmake we are using.
+  # Create a variable to indicate what version of gz-cmake we are using.
   # This variable does not follow the usual cmake naming convention because it
   # is a non-standard package variable.
   set(IGNITION_CMAKE_VERSION_MAJOR @PROJECT_VERSION_MAJOR@)
diff --git a/config/ignition-cmake.pc.in b/config/ignition-cmake.pc.in
index 3bbbe444..b844ab84 100644
--- a/config/ignition-cmake.pc.in
+++ b/config/ignition-cmake.pc.in
@@ -1,8 +1,8 @@
 prefix=${pcfiledir}/@IGN_PC_CONFIG_RELATIVE_PATH_TO_PREFIX@
 includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@IGN_INCLUDE_INSTALL_DIR_POSTFIX@
 
-Name: Ignition @IGN_DESIGNATION@
-Description: Build system package for the ignition libraries
+Name: Gazebo @IGN_DESIGNATION@
+Description: Build system package for the Gazebo libraries
 Version: @PROJECT_VERSION_FULL_NO_SUFFIX@
 Requires:
 Requires.private:
diff --git a/examples/find_ogre2/README.md b/examples/find_ogre2/README.md
index 344a6b6c..dbbc9090 100644
--- a/examples/find_ogre2/README.md
+++ b/examples/find_ogre2/README.md
@@ -1,4 +1,4 @@
-A quick demonstration of searching for Ogre 2.1 vs 2.2 via ign-cmake.
+A quick demonstration of searching for Ogre 2.1 vs 2.2 via gz-cmake.
 
 To test with both versions installed:
 
diff --git a/tutorials.md.in b/tutorials.md.in
index 44a2e68e..e3fd35e0 100644
--- a/tutorials.md.in
+++ b/tutorials.md.in
@@ -1,8 +1,8 @@
 \page tutorials Tutorials
 
-Welcome to the Ignition @IGN_DESIGNATION_CAP@ tutorials. These tutorials
+Welcome to the Gazebo @IGN_DESIGNATION_CAP@ tutorials. These tutorials
 will guide you through the process of understanding the capabilities of the
-Ignition @IGN_DESIGNATION_CAP@ library and how to use the library effectively.
+Gazebo @IGN_DESIGNATION_CAP@ library and how to use the library effectively.
 
 
 **The tutorials**
diff --git a/tutorials/developing_with_ign-cmake.md b/tutorials/developing_with_ign-cmake.md
index acd866d7..230cd577 100644
--- a/tutorials/developing_with_ign-cmake.md
+++ b/tutorials/developing_with_ign-cmake.md
@@ -38,7 +38,7 @@ To change the build type, set the CMake flag:
 
 ### Disabling or suppressing warnings about optional components
 
-Many ignition packages come with optional component libraries.
+Many Gazebo packages come with optional component libraries.
 These optional components will typically have additional dependencies that the
 package's core library does not require. If you are missing the dependencies of
 any optional components, you will receive a cmake warning like
@@ -161,9 +161,9 @@ To enable building buildsystem tests, set the CMake flags:
 ## Developing with Colcon and vcstool
 
 [`colcon`](https://colcon.readthedocs.io/en/released/) is a tool that improves the workflow of building and testing multiple software packages.
-As an Ignition collection is composed of multiple packages that are frequently built and tested together, `colcon` eases this workflow.
+As a Gazebo collection is composed of multiple packages that are frequently built and tested together, `colcon` eases this workflow.
 
-The basic outline of obtaining Ignition source packages via `vcs` and building with `colcon` is available in the [Ignition source installation documentation](https://gazebosim.org/docs/latest/install_ubuntu_src).
+The basic outline of obtaining Gazebo source packages via `vcs` and building with `colcon` is available in the [Gazebo source installation documentation](https://gazebosim.org/docs/latest/install_ubuntu_src).
 
 ### Passing CMake flags via command line
 
@@ -204,14 +204,14 @@ For more information about creating mixins, consult the [`colcon mixin` document
 
 ### Using a defaults file
 
-It is useful to be able to apply a consistent set of flags across an entire Ignition collection when building.
+It is useful to be able to apply a consistent set of flags across an entire Gazebo collection when building.
 One mechanism for accomplishing this is a `defaults.yaml` file.
 This is a file of configuration options that `colcon` will read to customize the default behavior.
 More information about the `defaults.yaml` file can be found in the corresponding [`colcon` documentation](https://colcon.readthedocs.io/en/released/user/configuration.html#defaults-yaml)
 
-For the following, if you do not have `colcon` or `vcs` installed, consult the [Ignition source installation documentation](https://gazebosim.org/docs/latest/install_ubuntu_src).
+For the following, if you do not have `colcon` or `vcs` installed, consult the [Gazebo source installation documentation](https://gazebosim.org/docs/latest/install_ubuntu_src).
 
-To try this out, first create an Ignition source workspace:
+To try this out, first create a Gazebo source workspace:
 ```
 mkdir -p ~/ign_edifice/src
 cd ~/ign_edifice/
diff --git a/tutorials/index.md b/tutorials/index.md
index 138fcd3d..1975e2ba 100644
--- a/tutorials/index.md
+++ b/tutorials/index.md
@@ -1,6 +1,6 @@
 # Introduction
 
-Gazebo CMake is a component in the Ignition framework, a set
+Gazebo CMake is a component in the Gazebo framework, a set
 of libraries designed to rapidly develop robot applications.
 
 [http://gazebosim.org](http://gazebosim.org)
diff --git a/tutorials/install.md b/tutorials/install.md
index e35bae73..07173009 100644
--- a/tutorials/install.md
+++ b/tutorials/install.md
@@ -1,8 +1,8 @@
 \page install Installation
 
 These instructions are for installing only Gazebo CMake. If you're interested
-in using all the Ignition libraries, not only Igniton CMake, check out this
-[Ignition installation](https://gazebosim.org/docs/latest/install).
+in using all the Gazebo libraries, not only Gazebo CMake, check out this
+[Gazebo installation](https://gazebosim.org/docs/latest/install).
 
 We recommend following the binary install instructions to get up and running as
 quickly and painlessly as possible.
@@ -61,11 +61,11 @@ To find `condabin`, search for "Anaconda Prompt" in the Windows search near the
 
 1. Navigate to your `condabin` if necessary, and then create and activate a Conda environment:
   ```
-  conda create -n ign-ws
-  conda activate ign-ws
+  conda create -n gz-ws
+  conda activate gz-ws
   ```
 
-  Once you have activated an environment, a prefix like `(ign-ws)` will be prepended to your prompt, and you can use the `conda` command outside of `condabin`.
+  Once you have activated an environment, a prefix like `(gz-ws)` will be prepended to your prompt, and you can use the `conda` command outside of `condabin`.
 
   You can use `conda info --envs` to see all your environments.
 
@@ -113,7 +113,7 @@ sudo apt-add-repository -s "deb http://packages.osrfoundation.org/gazebo/ubuntu-
 Clone source code:
 
 ```
-# This checks out the `main` branch. You can append `-b ign-cmake#` (replace # with a number) to checkout a specific version
+# This checks out the `main` branch. You can append `-b gz-cmake#` (replace # with a number) to checkout a specific version
 git clone http://github.com/gazebosim/gz-cmake
 ```
 
@@ -124,7 +124,7 @@ sudo apt -y install $(sort -u $(find . -iname 'packages.apt') | tr '\n' ' ')
 
 Build and install as follows:
 ```
-cd ign-cmake
+cd gz-cmake
 mkdir build
 cd build
 cmake ..
@@ -153,11 +153,11 @@ To find `condabin`, search for "Anaconda Prompt" in the search field near the Wi
 
 1. Navigate to your `condabin` if necessary, and then create and activate a Conda environment:
   ```
-  conda create -n ign-ws
-  conda activate ign-ws
+  conda create -n gz-ws
+  conda activate gz-ws
   ```
 
-   Once you have activated an environment, a prefix like `(ign-ws)` will be prepended to your prompt, and you can use the `conda` command outside of `condabin`.
+   Once you have activated an environment, a prefix like `(gz-ws)` will be prepended to your prompt, and you can use the `conda` command outside of `condabin`.
 
    You can use `conda info --envs` to see all your environments.
 
@@ -170,13 +170,13 @@ To find `condabin`, search for "Anaconda Prompt" in the search field near the Wi
 
 3. Navigate to where you would like to build the library, and then clone the repository.
   ```
-  # Optionally, append `-b ign-cmake#` (replace # with a number) to check out a specific version
+  # Optionally, append `-b gz-cmake#` (replace # with a number) to check out a specific version
   git clone https://github.com/gazebosim/gz-cmake.git
   ```
 
 4. Build.
   ```
-  cd ign-cmake
+  cd gz-cmake
   mkdir build
   cd build
   cmake .. # Optionally, -DCMAKE_INSTALL_PREFIX=path\to\install
@@ -206,7 +206,7 @@ You can also generate the documentation from a clone of this repository by follo
 
 3. Configure and build the documentation.
   ```
-  cd ign-cmake
+  cd gz-cmake
   mkdir build
   cd build
   cmake ..
@@ -218,7 +218,7 @@ You can also generate the documentation from a clone of this repository by follo
   firefox doxygen/html/index.html
   ```
 
-**Note** Alternatively, documentation for `ignition-cmake` can be found within the source code, and also in the [MIGRATION.md guide](https://github.com/gazebosim/gz-cmake/blob/main/MIGRATION.md).
+**Note** Alternatively, documentation for `gz-cmake` can be found within the source code, and also in the [MIGRATION.md guide](https://github.com/gazebosim/gz-cmake/blob/main/MIGRATION.md).
 
 # Testing
 
@@ -245,5 +245,4 @@ $ make test
 ```
 
 
-See the [Writing Tests section of the ign-cmake contributor documentation](https://gazebosim.org/docs/all/contributing#writing-tests) for help creating or modifying tests.
-
+See the [Writing Tests section of the gz-cmake contributor documentation](https://gazebosim.org/docs/all/contributing#writing-tests) for help creating or modifying tests.

From 797c3e1776da4f4d91c31ba9670c6c70aa793b64 Mon Sep 17 00:00:00 2001
From: methylDragon <methylDragon@gmail.com>
Date: Mon, 27 Jun 2022 16:38:21 -0700
Subject: [PATCH 2/5] Add project name migration note in Migration.md

Signed-off-by: methylDragon <methylDragon@gmail.com>
---
 Migration.md | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Migration.md b/Migration.md
index 01eb2405..d89644be 100644
--- a/Migration.md
+++ b/Migration.md
@@ -8,10 +8,17 @@ release will remove the deprecated code.
 ## Gazebo CMake 2.X to 3.X
 
 1. **Deprecated**: include/ignition/utilities/SuppressWarning.hh
-   **Replacement**: include/ignition/utils/SuppressWarning.hh
+    **Replacement**: include/ignition/utils/SuppressWarning.hh
 1. **Deprecated**: include/ignition/utilities/ExtraTestMacros.hh
-   **Replacement**: include/ignition/utils/ExtraTestMacros.hh
+    **Replacement**: include/ignition/utils/ExtraTestMacros.hh
 1. **Deprecated**: CMake functions and macros starting with `ign_`
-   **Replacement**: CMake functions and macros starting with `gz_`
+    **Replacement**: CMake functions and macros starting with `gz_`
 1. **Deprecated**: `ignition` namespaces
-   **Replacement**: `gz` namespaces
+    **Replacement**: `gz` namespaces
+
+1. **Breaking**: The project name has been changed to use the `gz-` prefix, you **must** use the `gz` prefix!
+  * This also means that any generated code that use the project name (e.g. CMake variables, in-source macros) would have to be migrated.
+  * Some non-exhaustive examples of this include:
+    * `GZ_<PROJECT>_<VISIBLE/HIDDEN>`
+    * CMake `-config` files
+    * Paths that depend on the project name

From 7d4dfdf1ef5b3f0a97036b33292d6314385fff3f Mon Sep 17 00:00:00 2001
From: methylDragon <methylDragon@gmail.com>
Date: Mon, 27 Jun 2022 17:31:01 -0700
Subject: [PATCH 3/5] More aggressively migrate ign-libX mentions, even for
 older versions

Signed-off-by: methylDragon <methylDragon@gmail.com>
---
 CMakeLists.txt        | 2 +-
 Changelog.md          | 4 ++--
 cmake/IgnPython.cmake | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf2e7f16..6afe2719 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,7 +106,7 @@ install(
 #============================================================================
 # Create and install the utilities component
 #============================================================================
-# Deprecated: Remove the utilities component in ign-cmake4
+# Deprecated: Remove the utilities component in gz-cmake4
 add_library(${ign_utilities_target} INTERFACE)
 target_include_directories(${ign_utilities_target}
   INTERFACE
diff --git a/Changelog.md b/Changelog.md
index c7b83dfa..152213fd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -301,7 +301,7 @@
 1. Require cmake 3.10.2, support `CXX_STANDARD` 17
     * [BitBucket pull request 68](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-cmake/pull-requests/68)
 
-    * [Full list of changes](https://github.com/gazebosim/gz-cmake/compare/ignition-cmake2_2.0.0...ign-cmake1)
+    * [Full list of changes](https://github.com/gazebosim/gz-cmake/compare/ignition-cmake2_2.0.0...gz-cmake1)
 
 ## Gazebo CMake 1.x
 
@@ -332,7 +332,7 @@
 
 ### Gazebo CMake 1.0.0
 
-    * [Full list of changes](https://github.com/gazebosim/gz-cmake/compare/ignition-cmake1_1.0.0...ign-cmake0)
+    * [Full list of changes](https://github.com/gazebosim/gz-cmake/compare/ignition-cmake1_1.0.0...gz-cmake0)
 
 ## Gazebo CMake 0.x
 
diff --git a/cmake/IgnPython.cmake b/cmake/IgnPython.cmake
index 6ad11801..d5115a59 100644
--- a/cmake/IgnPython.cmake
+++ b/cmake/IgnPython.cmake
@@ -39,7 +39,7 @@ else()
 endif()
 
 # Tick-tock PYTHON_EXECUTABLE until Python3_EXECUTABLE is released
-# TODO(jrivero) ign-cmake3: start the deprecation cycle of PYTHON_EXECUTABLE
+# TODO(jrivero) gz-cmake3: start the deprecation cycle of PYTHON_EXECUTABLE
 if(Python3_EXECUTABLE AND NOT PYTHON_EXECUTABLE)
   set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
 endif()

From 3b74d24e27b1d33c1ceb9f10196202efc0f0aa58 Mon Sep 17 00:00:00 2001
From: methylDragon <methylDragon@gmail.com>
Date: Mon, 27 Jun 2022 18:11:41 -0700
Subject: [PATCH 4/5] More aggressive migrations for ignition- and ign-

Signed-off-by: methylDragon <methylDragon@gmail.com>
---
 CMakeLists.txt                                |  4 ++--
 Changelog.md                                  |  4 ++--
 cmake/IgnUtils.cmake                          | 16 ++++++++--------
 configure.bat                                 |  2 +-
 include/ignition/utilities/ExtraTestMacros.hh |  2 +-
 include/ignition/utilities/SuppressWarning.hh |  2 +-
 test/cmake_minimum_required.bash              |  4 ++--
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6afe2719..4da10b09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ option(BUILDSYSTEM_TESTING "Enable extended buildsystem testing" FALSE)
 
 #--------------------------------------
 # Install the ignition documentation files
-# Note: This is not actually creating a doc target for ign-cmake; this is just
+# Note: This is not actually creating a doc target for gz-cmake; this is just
 # installing files that are useful for generating the documentation of other
 # ignition projects.
 add_subdirectory(doc)
@@ -169,7 +169,7 @@ if (BUILD_TESTING AND BUILDSYSTEM_TESTING)
   #============================================================================
   # Build examples
   #============================================================================
-  # Do a fake install of ign-cmake in order to test the examples.
+  # Do a fake install of gz-cmake in order to test the examples.
   # Copy or symlink the config.cmake files and cmake folder
   set(FAKE_BUILD_DIRECTORY "${CMAKE_BINARY_DIR}/fake/build")
   set(FAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/fake/install")
diff --git a/Changelog.md b/Changelog.md
index 152213fd..034b88fe 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -301,7 +301,7 @@
 1. Require cmake 3.10.2, support `CXX_STANDARD` 17
     * [BitBucket pull request 68](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-cmake/pull-requests/68)
 
-    * [Full list of changes](https://github.com/gazebosim/gz-cmake/compare/ignition-cmake2_2.0.0...gz-cmake1)
+    * [Full list of changes](https://github.com/gazebosim/gz-cmake/compare/ignition-cmake2_2.0.0...ignition-cmake1)
 
 ## Gazebo CMake 1.x
 
@@ -332,7 +332,7 @@
 
 ### Gazebo CMake 1.0.0
 
-    * [Full list of changes](https://github.com/gazebosim/gz-cmake/compare/ignition-cmake1_1.0.0...gz-cmake0)
+    * [Full list of changes](https://github.com/gazebosim/gz-cmake/compare/ignition-cmake1_1.0.0...ignition-cmake0)
 
 ## Gazebo CMake 0.x
 
diff --git a/cmake/IgnUtils.cmake b/cmake/IgnUtils.cmake
index 70f18593..dace49ee 100644
--- a/cmake/IgnUtils.cmake
+++ b/cmake/IgnUtils.cmake
@@ -114,7 +114,7 @@
 #  cmake config-file or find-module, then it might not automatically set this
 #  information. Therefore, we provide the ability to set it through your call to
 #  gz_find_package(~). These arguments can also be used to overwrite the
-#  pkg-config entries that get generated by the ign-cmake find-module for the
+#  pkg-config entries that get generated by the gz-cmake find-module for the
 #  package. Do not hesitate to ask for help if you need to use these arguments.
 #
 # [PKGCONFIG]: Optional. If provided, the string that follows will be used to
@@ -358,14 +358,14 @@ macro(gz_find_package PACKAGE_NAME)
     if(NOT gz_find_package_PKGCONFIG_IGNORE)
 
       # Here we will set up the pkgconfig entry for this package. Ordinarily,
-      # these variables should be set by the ign-cmake custom find-module for
+      # these variables should be set by the gz-cmake custom find-module for
       # the package which should use gz_pkg_check_modules[_quiet] or
       # gz_pkg_config_library_entry. However, that will not be performed by
       # third-party dependencies that provide their own find-module or their own
       # cmake config-module. Therefore, we provide the option of specifying
       # pkgconfig information through the call to gz_find_package. This also
       # allows callers of gz_find_package(~) to overwrite the default
-      # pkg-config entry that gets generated by the ign-cmake find-modules.
+      # pkg-config entry that gets generated by the gz-cmake find-modules.
 
       # If the caller has specified the arguments PKGCONFIG_LIB or PKGCONFIG,
       # then we will overwrite these pkgconfig variables with the information
@@ -416,7 +416,7 @@ macro(gz_find_package PACKAGE_NAME)
           "Could not find pkg-config information for ${PACKAGE_NAME}. "
           "It was not provided by the find-module for the package, nor was it "
           "explicitly passed into the call to gz_find_package(~). This is "
-          "most likely an error in this project's use of ign-cmake.")
+        "most likely an error in this project's use of gz-cmake.")
 
       else()
 
@@ -884,7 +884,7 @@ endmacro(gz_build_warning)
 # Creates a fatal error if the variable passed in does not represent a supported
 # version of the C++ standard.
 #
-# NOTE: This function is meant for internal ign-cmake use
+# NOTE: This function is meant for internal gz-cmake use
 #
 function(_gz_check_known_cxx_standards standard)
 
@@ -905,7 +905,7 @@ endfunction()
 # Handles the C++ standard argument for gz_create_core_library(~) and
 # gz_add_component(~).
 #
-# NOTE: This is only meant for internal ign-cmake use.
+# NOTE: This is only meant for internal gz-cmake use.
 #
 macro(_gz_handle_cxx_standard prefix target pkgconfig_cflags)
 
@@ -1917,7 +1917,7 @@ endmacro()
 # Set <prefix> to match the prefix that is given to cmake_parse_arguments(~).
 # This should also match the name of the function or macro that called it.
 #
-# NOTE: This should only be used by functions inside of ign-cmake specifically.
+# NOTE: This should only be used by functions inside of gz-cmake specifically.
 # Other ignition projects should not use this macro.
 #
 macro(_gz_cmake_parse_arguments prefix options oneValueArgs multiValueArgs)
@@ -1928,7 +1928,7 @@ macro(_gz_cmake_parse_arguments prefix options oneValueArgs multiValueArgs)
 
     # The user passed in some arguments that we don't currently recognize. We'll
     # emit a warning so they can check whether they're using the correct version
-    # of ign-cmake.
+    # of gz-cmake.
     message(AUTHOR_WARNING
       "\nThe build script has specified some unrecognized arguments for ${prefix}(~):\n"
       "${${prefix}_UNPARSED_ARGUMENTS}\n"
diff --git a/configure.bat b/configure.bat
index 1166d969..6b062700 100644
--- a/configure.bat
+++ b/configure.bat
@@ -2,7 +2,7 @@
 :: NOTE: This script is only meant to be used as part of the ignition developers' CI system
 :: Users and developers should build and install this library using cmake and Visual Studio
 
-:: ign-cmake has no dependencies
+:: gz-cmake has no dependencies
 
 :: Go to the directory that this file configure.bat file exists in
 cd /d %~dp0
diff --git a/include/ignition/utilities/ExtraTestMacros.hh b/include/ignition/utilities/ExtraTestMacros.hh
index 757a32cf..c5fd57e9 100644
--- a/include/ignition/utilities/ExtraTestMacros.hh
+++ b/include/ignition/utilities/ExtraTestMacros.hh
@@ -20,7 +20,7 @@
 
 #include <ignition/utilities/detail/ExtraTestMacros.hh>
 
-#pragma message("ign-cmake (utilities) ExtraTestMacros is deprecated, use ign-utils")
+#pragma message("gz-cmake (utilities) ExtraTestMacros is deprecated, use gz-utils")
 
 /// \brief Restrict the execution of the test for the Windows platform.
 /// The test will be compiled on Windows too but will never be run as
diff --git a/include/ignition/utilities/SuppressWarning.hh b/include/ignition/utilities/SuppressWarning.hh
index 62cc4681..1ccf9e00 100644
--- a/include/ignition/utilities/SuppressWarning.hh
+++ b/include/ignition/utilities/SuppressWarning.hh
@@ -20,7 +20,7 @@
 
 #include <ignition/utilities/detail/SuppressWarning.hh>
 
-#pragma message("ign-cmake (utilities) SuppressWarning is deprecated, use ign-utils")
+#pragma message("gz-cmake (utilities) SuppressWarning is deprecated, use gz-utils")
 
 // This header contains cross-platform macros for suppressing warnings. Please
 // only use these macros responsibly when you are certain that the compiler is
diff --git a/test/cmake_minimum_required.bash b/test/cmake_minimum_required.bash
index f8675525..ba16505b 100755
--- a/test/cmake_minimum_required.bash
+++ b/test/cmake_minimum_required.bash
@@ -8,14 +8,14 @@ export CMAKE_FILES_TO_CHECK="
   $1/cmake/ignition-config.cmake.in
   $1/config/ignition-cmake-config.cmake.in"
 unset TEST_CMAKE_MIN_REQUIRED_FAILED
-# first argument is root of ign-cmake repository
+# first argument is root of gz-cmake repository
 if [[ ! -d "$1"  \
    || ! -a "$1/CMakeLists.txt" \
    || ! -a "$1/cmake/ignition-all-config.cmake.in" \
    || ! -a "$1/cmake/ignition-component-config.cmake.in" \
    || ! -a "$1/cmake/ignition-config.cmake.in" \
    || ! -a "$1/config/ignition-cmake-config.cmake.in" ]]; then
-  echo the first argument must be the root of the ign-cmake repository
+  echo the first argument must be the root of the gz-cmake repository
   export TEST_CMAKE_MIN_REQUIRED_FAILED=1
 else
   grep -h '^cmake_minimum_required' $CMAKE_FILES_TO_CHECK \

From 9daaca76051f56fc74581af0b8319985a4b06342 Mon Sep 17 00:00:00 2001
From: methylDragon <methylDragon@gmail.com>
Date: Tue, 28 Jun 2022 11:59:52 -0700
Subject: [PATCH 5/5] Fix changelog branch names

Signed-off-by: methylDragon <methylDragon@gmail.com>
---
 Changelog.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 034b88fe..c7b83dfa 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -301,7 +301,7 @@
 1. Require cmake 3.10.2, support `CXX_STANDARD` 17
     * [BitBucket pull request 68](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-cmake/pull-requests/68)
 
-    * [Full list of changes](https://github.com/gazebosim/gz-cmake/compare/ignition-cmake2_2.0.0...ignition-cmake1)
+    * [Full list of changes](https://github.com/gazebosim/gz-cmake/compare/ignition-cmake2_2.0.0...ign-cmake1)
 
 ## Gazebo CMake 1.x
 
@@ -332,7 +332,7 @@
 
 ### Gazebo CMake 1.0.0
 
-    * [Full list of changes](https://github.com/gazebosim/gz-cmake/compare/ignition-cmake1_1.0.0...ignition-cmake0)
+    * [Full list of changes](https://github.com/gazebosim/gz-cmake/compare/ignition-cmake1_1.0.0...ign-cmake0)
 
 ## Gazebo CMake 0.x