diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c686862..536172eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,9 +17,7 @@ find_package(gz-cmake3 REQUIRED)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-gz_configure_project(
-  REPLACE_GZ_INCLUDE_PATH gz/msgs
-  VERSION_SUFFIX pre1)
+gz_configure_project(VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options
@@ -30,12 +28,12 @@ gz_configure_project(
 # generator compiled for the target machine cannot be used to generate
 # the C++ code corresponding to the .proto definition. For this scenario,
 # the following two options can be used as follows.
-# First of all, ign-msgs is compiled targeting the host machine, and in the
+# First of all, gz-msgs is compiled targeting the host machine, and in the
 # build targeting the host, the INSTALL_GZ_MSGS_GEN_EXECUTABLE option is
 # enabled:
 # > cmake -DINSTALL_GZ_MSGS_GEN_EXECUTABLE:BOOL=ON ..
 # ensuring that the gz_msgs_gen is installed in
-# <host_install_prefix>/bin/gz_msgs_gen . Then, the same version of ign-msgs
+# <host_install_prefix>/bin/gz_msgs_gen . Then, the same version of gz-msgs
 # can be cross-compiled, and in the cross-compilation build the location of the
 # host gz_msgs_gen is specified via the GZ_MSGS_GEN_EXECUTABLE
 # CMake cache variable:
diff --git a/appveyor.yml b/appveyor.yml
index 155973f4..ad31f344 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,7 +11,7 @@ environment:
 install:
   - vcpkg install protobuf
   - vcpkg install tinyxml2
-  # ign-cmake
+  # gz-cmake
   - git clone https://github.com/gazebosim/gz-cmake -b main
   - cd gz-cmake
   - md build
@@ -19,7 +19,7 @@ install:
   - cmake .. -DBUILD_TESTING=Off
   - cmake --build . --target INSTALL
   - cd ../..
-  # ign-math
+  # gz-math
   - git clone https://github.com/gazebosim/gz-math -b main
   - cd gz-math
   - md build
diff --git a/src/Generator.cc b/src/Generator.cc
index d37ef5fc..9fca4a7a 100644
--- a/src/Generator.cc
+++ b/src/Generator.cc
@@ -120,7 +120,7 @@ bool Generator::Generate(const FileDescriptor *_file,
         _generatorContext->OpenForInsert(sourceFilename, "includes"));
     io::Printer printer(output.get(), '$');
 
-    // Add the ign-msgs Factory header
+    // Add the gz-msgs Factory header
     printer.Print("#include \"gz/msgs/Factory.hh\"\n", "name",
                   "includes");
 
diff --git a/src/Utility.cc b/src/Utility.cc
index 74638811..0b0ee65a 100644
--- a/src/Utility.cc
+++ b/src/Utility.cc
@@ -36,8 +36,8 @@ namespace gz
     // Inline bracket to help doxygen filtering.
     inline namespace GZ_MSGS_VERSION_NAMESPACE {
     /// \brief Left and right trim a string. This was copied from Gazebo
-    /// common, ign-common/Util.hh, to avoid adding another dependency.
-    /// Remove this function if ign-common ever becomes a dependency.
+    /// common, gz-common/Util.hh, to avoid adding another dependency.
+    /// Remove this function if gz-common ever becomes a dependency.
     /// \param[in] _s String to trim
     /// \return Trimmed string
     std::string trimmed(std::string _s)
@@ -54,8 +54,8 @@ namespace gz
     }
 
     /// \brief Splits a string into tokens. This was copied from Gazebo
-    /// common, ign-common/Util.hh, to avoid adding another dependency.
-    /// Remove this function if ign-common every becomes a dependency.
+    /// common, gz-common/Util.hh, to avoid adding another dependency.
+    /// Remove this function if gz-common every becomes a dependency.
     /// \param[in] _str Input string.
     /// \param[in] _delim Token delimiter.
     /// \return Vector of tokens.
diff --git a/src/cmd/cmdmsgs.rb.in b/src/cmd/cmdmsgs.rb.in
index 251921e7..ffb9829c 100644
--- a/src/cmd/cmdmsgs.rb.in
+++ b/src/cmd/cmdmsgs.rb.in
@@ -35,7 +35,7 @@ COMMON_OPTIONS =
                "  --force-version <VERSION>  Use a specific library version.\n"\
                '  --versions                 Show the available versions.'
 COMMANDS = {  'msg' =>
-                  "Print information about ignition messages.\n\n" +
+                  "Print information about Gazebo messages.\n\n" +
                   "  gz msg [options]\n\n" +
                   "Options:\n\n" +
                   "  -i [ --info ] arg          " +
@@ -45,7 +45,7 @@ COMMANDS = {  'msg' =>
 }
 
 #
-# Class for the Ignition msgs command line tools.
+# Class for the Gazebo msgs command line tools.
 #
 class Cmd
   #