diff --git a/graphics/src/ColladaLoader.cc b/graphics/src/ColladaLoader.cc
index a16a506e6..cbcb0bf70 100644
--- a/graphics/src/ColladaLoader.cc
+++ b/graphics/src/ColladaLoader.cc
@@ -2278,7 +2278,7 @@ void ColladaLoader::Implementation::LoadPolylist(
             }
           }
 
-          // add the new ignition submesh vertex index to the map
+          // add the new Gazebo submesh vertex index to the map
           if (!inputs[VERTEX].empty())
           {
             std::vector<GeometryIndices> inputValues;
@@ -2602,7 +2602,7 @@ void ColladaLoader::Implementation::LoadTriangles(
         }
       }
 
-      // add the new ignition submesh vertex index to the map
+      // add the new Gazebo submesh vertex index to the map
       if (hasVertices)
       {
         std::vector<GeometryIndices> inputValues;
diff --git a/graphics/src/OBJLoader.cc b/graphics/src/OBJLoader.cc
index d304820a6..c01bf562b 100644
--- a/graphics/src/OBJLoader.cc
+++ b/graphics/src/OBJLoader.cc
@@ -107,7 +107,7 @@ Mesh *OBJLoader::Load(const std::string &_filename)
 
   for (auto const &s : shapes)
   {
-    // obj mesh assigns a material id to each 'face' but ignition assigns a
+    // obj mesh assigns a material id to each 'face' but Gazebo assigns a
     // single material to each 'submesh'. The strategy here is to identify
     // the number of unique material ids in each obj shape and create a new
     // submesh per unique material id
diff --git a/include/gz/common/Util.hh b/include/gz/common/Util.hh
index 2f7ab9734..5dbc88ae8 100644
--- a/include/gz/common/Util.hh
+++ b/include/gz/common/Util.hh
@@ -93,7 +93,7 @@
       std::chrono::system_clock::now().time_since_epoch()).count())
 
 /// \brief This macro defines the standard way of launching an exception
-/// inside ignition.
+/// inside Gazebo.
 #define GZ_ASSERT(_expr, _msg) assert((_msg, _expr))
 
 /// \brief Forward declarations for the common classes
diff --git a/src/Filesystem.cc b/src/Filesystem.cc
index e9dfaf88d..ed0c6f0f8 100644
--- a/src/Filesystem.cc
+++ b/src/Filesystem.cc
@@ -247,7 +247,7 @@ bool gz::common::copyDirectory(
                          | fs::copy_options::overwrite_existing;
 
   // std::filesystem won't create intermediate directories
-  // before copying, this maintains compatibility with ignition behavior.
+  // before copying, this maintains compatibility with Gazebo behavior.
   if (!gz::common::createDirectories(_newDirname))
   {
     return false;
diff --git a/src/URI_TEST.cc b/src/URI_TEST.cc
index ccaa17878..0d8fe275a 100644
--- a/src/URI_TEST.cc
+++ b/src/URI_TEST.cc
@@ -927,7 +927,7 @@ TEST(URITEST, HasAuthority)
 //////////////////////////////////////////////////
 TEST(URITEST, Resource)
 {
-  // Test URIs that are commonly used for resources in Ignition
+  // Test URIs that are commonly used for resources in Gazebo
   {
     URI uri;
     EXPECT_TRUE(uri.Parse("model://model_name/meshes/mesh.dae"));
diff --git a/testing/include/gz/common/testing/AutoLogFixture.hh b/testing/include/gz/common/testing/AutoLogFixture.hh
index a8798035f..179347465 100644
--- a/testing/include/gz/common/testing/AutoLogFixture.hh
+++ b/testing/include/gz/common/testing/AutoLogFixture.hh
@@ -26,9 +26,9 @@
 
 namespace gz::common::testing
 {
-/// \brief A utility class that stores test logs in ~/.ignition/test_logs.
+/// \brief A utility class that stores test logs in ~/.gz/test_logs.
 /// This functionality is needed to keep all the log information reported
-/// by ignition during continuous integration. Without this, debugging
+/// by Gazebo during continuous integration. Without this, debugging
 /// failing tests is significantly more difficult.
 class AutoLogFixture : public ::testing::Test
 {
diff --git a/testing/include/gz/common/testing/TestPaths.hh b/testing/include/gz/common/testing/TestPaths.hh
index 349da2448..7fa917353 100644
--- a/testing/include/gz/common/testing/TestPaths.hh
+++ b/testing/include/gz/common/testing/TestPaths.hh
@@ -184,8 +184,8 @@ std::string TestFile(Args const &... args)
 //////////////////////////////////////////////////
 /// \brief Get the path to a file in a temporary directory
 ///
-/// Example: to get ${TMP}/.ignition/foo.log
-///  TempPath(".ignition", "foo.log");
+/// Example: to get ${TMP}/.gz/foo.log
+///  TempPath(".gz", "foo.log");
 ///
 /// \param[in] args Path to the file, relative to the temporary directory
 /// \return Full path to the temporary directory