diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
index 5eddfa162..3465e8dd8 100644
--- a/.github/ci/packages.apt
+++ b/.github/ci/packages.apt
@@ -1,12 +1,12 @@
 freeglut3-dev
 libfreeimage-dev
 libglew-dev
-libignition-cmake3-dev
-libignition-common5-dev
-libignition-math7-dev
-libignition-math7-eigen3-dev
-libignition-plugin2-dev
-libignition-utils2-dev
+libgz-cmake3-dev
+libgz-common5-dev
+libgz-math7-dev
+libgz-math7-eigen3-dev
+libgz-plugin2-dev
+libgz-utils2-dev
 libogre-1.9-dev
 libxi-dev
 libxmu-dev
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b4b8a356b..54d4e3ab4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Compile and test
         id: ci
-        uses: ignition-tooling/action-ignition-ci@focal
+        uses: gazebo-tooling/action-gz-ci@focal
         with:
           codecov-enabled: true
           cppcheck-enabled: true
@@ -25,4 +25,4 @@ jobs:
         uses: actions/checkout@v2
       - name: Compile and test
         id: ci
-        uses: ignition-tooling/action-ignition-ci@jammy
+        uses: gazebo-tooling/action-gz-ci@jammy
diff --git a/.github/workflows/pr-collection-labeler.yml b/.github/workflows/pr-collection-labeler.yml
index 7d7b4e179..38c4fc13b 100644
--- a/.github/workflows/pr-collection-labeler.yml
+++ b/.github/workflows/pr-collection-labeler.yml
@@ -8,6 +8,6 @@ jobs:
     steps:
     - name: Add collection labels
       if: github.event.action == 'opened'
-      uses: ignition-tooling/pr-collection-labeler@v1
+      uses: gazebo-tooling/pr-collection-labeler@v1
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 615dfabde..1cac991ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,9 +18,7 @@ set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-gz_configure_project(
-  REPLACE_IGNITION_INCLUDE_PATH gz/rendering
-  VERSION_SUFFIX pre1)
+gz_configure_project(VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options
@@ -77,7 +75,7 @@ endif()
 # Find OGRE
 list(APPEND gz_ogre_components "RTShaderSystem" "Terrain" "Overlay" "Paging")
 
-gz_find_package(IgnOGRE VERSION 1.9.0
+gz_find_package(GzOGRE VERSION 1.9.0
   COMPONENTS ${gz_ogre_components}
   REQUIRED_BY ogre
   PRIVATE_FOR ogre)
@@ -87,7 +85,7 @@ gz_find_package(IgnOGRE VERSION 1.9.0
 # USE_UNOFFICIAL_OGRE_VERSIONS flag
 if (NOT USE_UNOFFICIAL_OGRE_VERSIONS)
   if (${OGRE_VERSION} VERSION_GREATER_EQUAL 1.10.0)
-    IGN_BUILD_WARNING("Ogre 1.x versions greater than 1.9 are not officially supported."
+    GZ_BUILD_WARNING("Ogre 1.x versions greater than 1.9 are not officially supported."
                       "The software might compile and even work but support from upstream"
                       "could be reduced to accepting patches for newer versions")
   endif()
@@ -105,16 +103,16 @@ endif()
 
 #--------------------------------------
 # Find OGRE2: first try to find OGRE2 built with PlanarReflections support and
-# fallback to look for OGRE2 without it. Both seems to works for ign-rendering.
+# fallback to look for OGRE2 without it. Both seems to works for gz-rendering.
 # See https://github.com/gazebosim/gz-rendering/issues/597
-gz_find_package(IgnOGRE2 VERSION 2.2.0
+gz_find_package(GzOGRE2 VERSION 2.2.0
     COMPONENTS HlmsPbs HlmsUnlit Overlay PlanarReflections
     PRIVATE_FOR ogre2
     QUIET)
 
 if ("${OGRE2-PlanarReflections}" STREQUAL "OGRE2-PlanarReflections-NOTFOUND")
   message(STATUS "PlanarReflections component was not found. Try looking without it:")
-  gz_find_package(IgnOGRE2 VERSION 2.2.0
+  gz_find_package(GzOGRE2 VERSION 2.2.0
     COMPONENTS HlmsPbs HlmsUnlit Overlay
     REQUIRED_BY ogre2
     PRIVATE_FOR ogre2)
@@ -126,7 +124,7 @@ endif()
 
 # Plugin install dirs
 set(GZ_RENDERING_ENGINE_INSTALL_DIR
-  ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/gz-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins
+  ${CMAKE_INSTALL_PREFIX}/${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins
 )
 
 #--------------------------------------
@@ -155,7 +153,7 @@ else()
   set(GZ_RENDERING_PLUGIN_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
 endif()
 
-set(GZ_RENDERING_RESOURCE_PATH ${CMAKE_INSTALL_PREFIX}/${IGN_DATA_INSTALL_DIR})
+set(GZ_RENDERING_RESOURCE_PATH ${CMAKE_INSTALL_PREFIX}/${GZ_DATA_INSTALL_DIR})
 
 #============================================================================
 # Configure the build
@@ -180,7 +178,7 @@ gz_configure_build(QUIT_IF_BUILD_ERRORS
 
 if (HAVE_OGRE2)
   # Must be done after gz_configure_build or else Terra
-  # won't see IGN_ADD_fPIC_TO_LIBRARIES
+  # won't see GZ_ADD_fPIC_TO_LIBRARIES
   add_subdirectory(ogre2/src/terrain/Terra)
 endif()
 
diff --git a/Changelog.md b/Changelog.md
index 88e8971c8..24dc2e4fe 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -361,7 +361,7 @@
 1. relax gaussian test tolerance
     * [Pull request #344](https://github.com/gazebosim/gz-rendering/pull/344)
 
-1. Fix custom shaders uniforms ign version number
+1. Fix custom shaders uniforms gz version number
     * [Pull request #343](https://github.com/gazebosim/gz-rendering/pull/343)
 
 1. recreate node only when needed
diff --git a/Migration.md b/Migration.md
index 516e303ff..a68fc17f6 100644
--- a/Migration.md
+++ b/Migration.md
@@ -74,7 +74,7 @@ release will remove the deprecated code.
       *Note*: Calling instead `Camera::Update` for each camera is a waste of CPU resources.
     + It is invalid to modify the scene between `Scene::PreRender` and `Scene::PostRender` (e.g. add/remove objects, lights, etc)
     + Added `Scene::SetCameraPassCountPerGpuFlush`. Setting this value to 0 forces legacy behavior which eases porting.
-    + Systems that rely on Graphics components like particle FXs and postprocessing are explicitly affected by Scene's Pre/PostRender. Once `Scene::PostRender` is called, the particle FXs' simulation is moved forward, as well as time values sent to postprocessing shaders. In previous ign-rendering versions each `Camera::Render` call would move the particle simulation forward, which could cause subtle bugs or inconsistencies when Cameras were rendering the same frame from different angles. Setting SetCameraPassCountPerGpuFlush to 0 will also cause these subtle bugs to reappear.
+    + Systems that rely on Graphics components like particle FXs and postprocessing are explicitly affected by Scene's Pre/PostRender. Once `Scene::PostRender` is called, the particle FXs' simulation is moved forward, as well as time values sent to postprocessing shaders. In previous gz-rendering versions each `Camera::Render` call would move the particle simulation forward, which could cause subtle bugs or inconsistencies when Cameras were rendering the same frame from different angles. Setting SetCameraPassCountPerGpuFlush to 0 will also cause these subtle bugs to reappear.
 
 1. **Visual.hh** and **Node.hh**
     + `*UserData` methods and the `Variant` type alias have been moved from the `Visual` class to the `Node` class.
diff --git a/README.md b/README.md
index 73004a750..94b62ea09 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Gazebo Rendering is a C++ library designed to provide an abstraction
 for different rendering engines. It offers unified APIs for creating
 3D graphics applications.
 
-Gazebo Rendering is a component in the ignition framework, a set
+Gazebo Rendering is a component in the Gazebo framework, a set
 of libraries designed to rapidly develop robot applications.
 
 # Table of Contents
@@ -51,7 +51,7 @@ See the [installation tutorial](https://gazebosim.org/api/rendering/5.0/installa
 
 # Usage
 
-The Ign Rendering API can be found in the documentation. See the
+The Gazebo Rendering API can be found in the documentation. See the
 [installation tutorial](https://gazebosim.org/api/rendering/5.0/installation.html)
 on how to build the documentation files using Doxygen.
 
@@ -59,14 +59,14 @@ You can also take a look at the sample applications in the `examples` folder.
 
 # Folder Structure
 
-* `include/ignition/rendering`: Contains all the public header files which will be installed
+* `include/gz/rendering`: Contains all the public header files which will be installed
 
 * `src`: Contains all the C++ source code which are not installed.
 
 * `test`: All integration, performance and regression tests go here, under their
   specific folders.
 
-* `examples`: Sample programs to demonstrate different features of ign-rendering
+* `examples`: Sample programs to demonstrate different features of gz-rendering
 
 * `doc`: Files used by Doxygen when generating documentation.
 
@@ -95,4 +95,3 @@ This library uses [Semantic Versioning](https://semver.org/). Additionally, this
 # License
 
 This library is licensed under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0). See also the [LICENSE](https://github.com/gazebosim/gz-rendering/blob/main/LICENSE) file.
-
diff --git a/api.md.in b/api.md.in
index 076d03826..50360ff6e 100644
--- a/api.md.in
+++ b/api.md.in
@@ -1,6 +1,6 @@
-## Gazebo @IGN_DESIGNATION_CAP@
+## Gazebo @GZ_DESIGNATION_CAP@
 
-Gazebo @IGN_DESIGNATION_CAP@ is a component in Gazebo, a set of libraries
+Gazebo @GZ_DESIGNATION_CAP@ is a component in Gazebo, a set of libraries
 designed to rapidly develop robot and simulation applications.
 
 ## License
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index f9968f12c..b6abfef55 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,13 +1,13 @@
 find_package(Doxygen)
 
-set(IGNITION_DOXYGEN_TAGFILES
+set(GZ_DOXYGEN_TAGFILES
   "\"${CMAKE_BINARY_DIR}/doc/ogre_1-9.tag.xml=https://www.ogre3d.org/docs/api/1.9/\"")
 
 if (DOXYGEN_FOUND)
-  configure_file(${IGNITION_CMAKE_DOXYGEN_DIR}/api.in
+  configure_file(${GZ_CMAKE_DOXYGEN_DIR}/api.in
                  ${CMAKE_BINARY_DIR}/api.dox @ONLY)
 
-  configure_file(${IGNITION_CMAKE_DOXYGEN_DIR}/tutorials.in
+  configure_file(${GZ_CMAKE_DOXYGEN_DIR}/tutorials.in
                  ${CMAKE_BINARY_DIR}/tutorials.dox @ONLY)
 
   # Find tar
diff --git a/examples/depth_camera/GlutWindow.cc b/examples/depth_camera/GlutWindow.cc
index ee5b147c7..4c1c2b0ac 100644
--- a/examples/depth_camera/GlutWindow.cc
+++ b/examples/depth_camera/GlutWindow.cc
@@ -218,7 +218,7 @@ void handleMouse()
 }
 
 //////////////////////////////////////////////////
-// From ign-sensors/src/DepthCameraSensor.cc
+// From gz-sensors/src/DepthCameraSensor.cc
 //! [convert depth to image]
 void ConvertDepthToImage(
     const float *_data,
@@ -295,7 +295,7 @@ void keyboardCB(unsigned char _key, int, int)
 }
 
 //////////////////////////////////////////////////
-// See ign-sensors/src/DepthCameraSensor.cc
+// See gz-sensors/src/DepthCameraSensor.cc
 //! [depth frame callback]
 void OnNewDepthFrame(const float *_scan,
                      unsigned int _width, unsigned int _height,
@@ -314,7 +314,7 @@ void initCamera(ir::CameraPtr _camera)
   g_camera = _camera;
   imgw = g_camera->ImageWidth();
   imgh = g_camera->ImageHeight();
-  ir::Image image = g_camera->CreateImage();  
+  ir::Image image = g_camera->CreateImage();
   g_image = std::make_shared<ir::Image>(image);
 
   ir::DepthCameraPtr depthCamera = std::dynamic_pointer_cast<ir::DepthCamera>(
diff --git a/examples/ogre2_demo/Main.cc b/examples/ogre2_demo/Main.cc
index f14e849bb..337cf1d12 100644
--- a/examples/ogre2_demo/Main.cc
+++ b/examples/ogre2_demo/Main.cc
@@ -161,7 +161,7 @@ void buildScene(ScenePtr _scene)
 
   // create a backpack
   // backpack mesh is mirrored and requires texture addressing mode to be
-  // set to 'wrap', which is the default in ign-rendering-ogre2
+  // set to 'wrap', which is the default in gz-rendering-ogre2
   VisualPtr backpack = _scene->CreateVisual("backpack");
   backpack->SetLocalPosition(2.5, -1, 0);
   backpack->SetLocalRotation(0, 0, -1.57);
diff --git a/examples/simple_demo_qml/CMakeLists.txt b/examples/simple_demo_qml/CMakeLists.txt
index 8caa05420..971891e82 100644
--- a/examples/simple_demo_qml/CMakeLists.txt
+++ b/examples/simple_demo_qml/CMakeLists.txt
@@ -53,8 +53,8 @@ set(CMAKE_AUTOUIC ON)
 
 add_executable(simple_demo_qml
     Main.cc
-    IgnitionRenderer.hh
-    IgnitionRenderer.cc
+    GzRenderer.hh
+    GzRenderer.cc
     ThreadRenderer.h
     ThreadRenderer.cpp
     ${QT_RESOURCES}
@@ -79,7 +79,7 @@ target_link_libraries(simple_demo_qml PUBLIC
 set_target_properties(simple_demo_qml
     PROPERTIES
         QT_QML_MODULE_VERSION 1.0
-        QT_QML_MODULE_URI IgnitionRendering
+        QT_QML_MODULE_URI GzRendering
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
diff --git a/examples/simple_demo_qml/IgnitionRenderer.cc b/examples/simple_demo_qml/GzRenderer.cc
similarity index 94%
rename from examples/simple_demo_qml/IgnitionRenderer.cc
rename to examples/simple_demo_qml/GzRenderer.cc
index b53394c82..4b4756d02 100644
--- a/examples/simple_demo_qml/IgnitionRenderer.cc
+++ b/examples/simple_demo_qml/GzRenderer.cc
@@ -18,7 +18,7 @@
 // The functions BuildScene and createCamera are copied from the simple_demo
 // example.
 
-#include "IgnitionRenderer.hh"
+#include "GzRenderer.hh"
 
 #include <QOpenGLContext>
 #include <QQuickWindow>
@@ -194,23 +194,23 @@ gz::rendering::CameraPtr CreateCamera(const std::string &_engineName)
 }
 
 //////////////////////////////////////////////////
-IgnitionRenderer::~IgnitionRenderer()
+GzRenderer::~GzRenderer()
 {
 }
 
 //////////////////////////////////////////////////
-IgnitionRenderer::IgnitionRenderer()
+GzRenderer::GzRenderer()
 {
 }
 
 //////////////////////////////////////////////////
-void IgnitionRenderer::Initialise()
+void GzRenderer::Initialise()
 {
   // no-op - all initialised on the main thread
 }
 
 //////////////////////////////////////////////////
-void IgnitionRenderer::InitialiseOnMainThread()
+void GzRenderer::InitialiseOnMainThread()
 {
   if (!this->initialised)
   {
@@ -220,7 +220,7 @@ void IgnitionRenderer::InitialiseOnMainThread()
 }
 
 //////////////////////////////////////////////////
-void IgnitionRenderer::Render()
+void GzRenderer::Render()
 {
   // pre-render may regenerate textureId if the size changes
   this->camera->PreRender();
@@ -234,25 +234,25 @@ void IgnitionRenderer::Render()
 }
 
 //////////////////////////////////////////////////
-bool IgnitionRenderer::Initialised() const
+bool GzRenderer::Initialised() const
 {
   return this->initialised;
 }
 
 //////////////////////////////////////////////////
-unsigned int IgnitionRenderer::TextureId() const
+unsigned int GzRenderer::TextureId() const
 {
   return this->textureId;
 }
 
 //////////////////////////////////////////////////
-QSize IgnitionRenderer::TextureSize() const
+QSize GzRenderer::TextureSize() const
 {
   return this->textureSize;
 }
 
 //////////////////////////////////////////////////
-void IgnitionRenderer::InitEngine()
+void GzRenderer::InitEngine()
 {
   std::string engineName("ogre2");
 
@@ -283,7 +283,7 @@ void IgnitionRenderer::InitEngine()
 }
 
 //////////////////////////////////////////////////
-void IgnitionRenderer::UpdateCamera()
+void GzRenderer::UpdateCamera()
 {
   double angle = this->cameraOffset / 2 * M_PI;
   double x = sin(angle) * 3.0 + 3.0;
diff --git a/examples/simple_demo_qml/IgnitionRenderer.hh b/examples/simple_demo_qml/GzRenderer.hh
similarity index 96%
rename from examples/simple_demo_qml/IgnitionRenderer.hh
rename to examples/simple_demo_qml/GzRenderer.hh
index f7a757060..ddb3f2428 100644
--- a/examples/simple_demo_qml/IgnitionRenderer.hh
+++ b/examples/simple_demo_qml/GzRenderer.hh
@@ -26,13 +26,13 @@
 /// and update of a Gazebo rendering engine instance and makes the
 /// rendered texture available in a shared context for an application
 /// to apply to a render surface.
-class IgnitionRenderer
+class GzRenderer
 {
   /// \brief Destructor
-  public: virtual ~IgnitionRenderer();
+  public: virtual ~GzRenderer();
 
   /// \brief Constructor
-  public: IgnitionRenderer();
+  public: GzRenderer();
 
   /// \brief Render the next frame. May be called on a render thread.
   public: void Render();
diff --git a/examples/simple_demo_qml/Main.cc b/examples/simple_demo_qml/Main.cc
index 512b260da..984239a42 100644
--- a/examples/simple_demo_qml/Main.cc
+++ b/examples/simple_demo_qml/Main.cc
@@ -36,7 +36,7 @@ int main(int _argc, char** _argv)
     QSurfaceFormat::setDefaultFormat(format);
     RenderThread::Print(format);
 
-    qmlRegisterType<ThreadRenderer>("IgnitionRendering", 1, 0,
+    qmlRegisterType<ThreadRenderer>("GzRendering", 1, 0,
         "ThreadRenderer");
 
     QGuiApplication app(_argc, _argv);
diff --git a/examples/simple_demo_qml/Main.qml b/examples/simple_demo_qml/Main.qml
index 437299a3e..65323febc 100644
--- a/examples/simple_demo_qml/Main.qml
+++ b/examples/simple_demo_qml/Main.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import IgnitionRendering 1.0
+import GzRendering 1.0
 
 Item {
   width: 800
diff --git a/examples/simple_demo_qml/ThreadRenderer.cpp b/examples/simple_demo_qml/ThreadRenderer.cpp
index 0e59b015d..91731ef5f 100644
--- a/examples/simple_demo_qml/ThreadRenderer.cpp
+++ b/examples/simple_demo_qml/ThreadRenderer.cpp
@@ -69,7 +69,7 @@
 ****************************************************************************/
 
 #include "ThreadRenderer.h"
-#include "IgnitionRenderer.hh"
+#include "GzRenderer.hh"
 
 #include <QGuiApplication>
 #include <QMutex>
@@ -211,7 +211,7 @@ void RenderThread::InitialiseOnMainThread()
     Print(this->context->format());
 
     // create renderer
-    this->renderer = new IgnitionRenderer();
+    this->renderer = new GzRenderer();
     this->renderer->InitialiseOnMainThread();
 
     this->context->doneCurrent();
diff --git a/examples/simple_demo_qml/ThreadRenderer.h b/examples/simple_demo_qml/ThreadRenderer.h
index 9ca73a15b..ed3fc23c6 100644
--- a/examples/simple_demo_qml/ThreadRenderer.h
+++ b/examples/simple_demo_qml/ThreadRenderer.h
@@ -71,7 +71,7 @@
 #ifndef GZ_RENDERING_EXAMPLES_SIMPLE_DEMO_QML_THREAD_RENDERER_HH_
 #define GZ_RENDERING_EXAMPLES_SIMPLE_DEMO_QML_THREAD_RENDERER_HH_
 
-#include "IgnitionRenderer.hh"
+#include "GzRenderer.hh"
 
 #include <QQuickItem>
 #include <QMutex>
@@ -109,7 +109,7 @@ public slots:
     void TextureReady(int _id, const QSize &_size);
 
 private:
-    IgnitionRenderer *renderer = nullptr;
+    GzRenderer *renderer = nullptr;
     QSize size;
 
     /// \brief reference to the render window item
diff --git a/examples/waves/media/GerstnerWaves_fs.metal b/examples/waves/media/GerstnerWaves_fs.metal
index 0aff1235b..da73b57a1 100644
--- a/examples/waves/media/GerstnerWaves_fs.metal
+++ b/examples/waves/media/GerstnerWaves_fs.metal
@@ -56,7 +56,7 @@ fragment float4 main_metal
   float3 E = normalize(inPs.eyeVec);
   float3 R = reflect(E, N);
 
-  // Negate z for use with the skybox texture that comes with ign-rendering
+  // Negate z for use with the skybox texture that comes with gz-rendering
   R = float3(R.x, R.y, -R.z);
 
   // uncomment this line if using other textures that are Y up
diff --git a/examples/waves/media/GerstnerWaves_fs_330.glsl b/examples/waves/media/GerstnerWaves_fs_330.glsl
index 9709de8a3..640380356 100644
--- a/examples/waves/media/GerstnerWaves_fs_330.glsl
+++ b/examples/waves/media/GerstnerWaves_fs_330.glsl
@@ -46,7 +46,7 @@ void main()
   vec3 E = normalize(inPs.eyeVec);
   vec3 R = reflect(E, N);
 
-  // negate z for use with the skybox texture that comes with ign-rendering
+  // negate z for use with the skybox texture that comes with gz-rendering
   R = vec3(R.x, R.y, -R.z);
 
   // uncomment this line if using other textures that are Y up
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 4b2bdd7bb..992a1312e 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_subdirectory(gz)
-install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
+install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL})
diff --git a/include/gz/rendering/RenderEngineManager.hh b/include/gz/rendering/RenderEngineManager.hh
index d12a73289..584fd9a7a 100644
--- a/include/gz/rendering/RenderEngineManager.hh
+++ b/include/gz/rendering/RenderEngineManager.hh
@@ -57,7 +57,7 @@ namespace gz
       public: unsigned int EngineCount() const;
 
       /// \brief Determine if a render-engine with the given name is avaiable.
-      /// It also checks the list of default engines supplied by ign-rendering.
+      /// It also checks the list of default engines supplied by gz-rendering.
       /// \param[in] _name Name of the desired render-engine
       /// \return True if the specified render-engine is available
       public: bool HasEngine(const std::string &_name) const;
diff --git a/include/gz/rendering/Scene.hh b/include/gz/rendering/Scene.hh
index bfe20bebb..847b96980 100644
--- a/include/gz/rendering/Scene.hh
+++ b/include/gz/rendering/Scene.hh
@@ -1210,7 +1210,7 @@ namespace gz
       ///
       /// # Legacy mode: Set this value to 0.
       ///
-      /// Old projects migrating to newer ign versions may break
+      /// Old projects migrating to newer gz versions may break
       /// these rules (e.g. not calling Render between Scene's
       /// Pre/PostRender).
       ///
diff --git a/include/gz/rendering/base/BaseRayQuery.hh b/include/gz/rendering/base/BaseRayQuery.hh
index b3ce884ab..490105c47 100644
--- a/include/gz/rendering/base/BaseRayQuery.hh
+++ b/include/gz/rendering/base/BaseRayQuery.hh
@@ -122,7 +122,7 @@ namespace gz
       math::Matrix4d viewProjInv = (projectionMatrix * viewMatrix).Inverse();
 
       // rotate start and end
-      // ign math does not support matrix4 * vec4
+      // gz math does not support matrix4 * vec4
       // so calc homogeneous coordinate w ourselves
       double startw = viewProjInv(3, 0) * start[0] +
                       viewProjInv(3, 1) * start[1] +
diff --git a/include/gz/rendering/base/base.hh.in b/include/gz/rendering/base/base.hh.in
index c4092f0cd..4ffcf3d38 100644
--- a/include/gz/rendering/base/base.hh.in
+++ b/include/gz/rendering/base/base.hh.in
@@ -1,3 +1,3 @@
 // Automatically generated
-#include <gz/${IGN_PROJECT_NAME}/config.hh>
+#include <gz/${GZ_PROJECT_NAME}/config.hh>
 ${ign_headers}
diff --git a/include/gz/rendering/rendering.hh.in b/include/gz/rendering/rendering.hh.in
index 2602ad19b..9bd7cdda0 100644
--- a/include/gz/rendering/rendering.hh.in
+++ b/include/gz/rendering/rendering.hh.in
@@ -1,3 +1,3 @@
 // Automatically generated
-//#include <gz/${IGN_PROJECT_NAME}/config.hh>
+//#include <gz/${GZ_PROJECT_NAME}/config.hh>
 ${ign_headers}
diff --git a/ogre/include/CMakeLists.txt b/ogre/include/CMakeLists.txt
index 4b2bdd7bb..992a1312e 100644
--- a/ogre/include/CMakeLists.txt
+++ b/ogre/include/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_subdirectory(gz)
-install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
+install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL})
diff --git a/ogre/include/gz/rendering/ogre/OgreConversions.hh b/ogre/include/gz/rendering/ogre/OgreConversions.hh
index d4402da60..a3f3b0067 100644
--- a/ogre/include/gz/rendering/ogre/OgreConversions.hh
+++ b/ogre/include/gz/rendering/ogre/OgreConversions.hh
@@ -41,45 +41,45 @@ namespace gz
     class GZ_RENDERING_OGRE_VISIBLE OgreConversions
     {
       /// \brief Return the equivalent ogre color
-      /// \param[in] _color ign-math color to convert
+      /// \param[in] _color gz-math color to convert
       /// \return Ogre color value
       public: static Ogre::ColourValue Convert(
           const math::Color &_color);
 
-      /// \brief Return the equivalent ign-math color
+      /// \brief Return the equivalent gz-math color
       /// \param[in] _color Ogre color to convert
-      /// \return ign-math color value
+      /// \return gz-math color value
       public: static math::Color Convert(
           const Ogre::ColourValue &_color);
 
-      /// \brief return Ogre Vector from ign-math Vector3
-      /// \param[in] _vector ign-math vector
+      /// \brief return Ogre Vector from gz-math Vector3
+      /// \param[in] _vector gz-math vector
       /// \return Ogre vector
       public: static Ogre::Vector3 Convert(const math::Vector3d &_vector);
 
-      /// \brief return ign-math Vector from ogre Vector3
+      /// \brief return gz-math Vector from ogre Vector3
       /// \param[in] _vector Ogre vector
-      /// \return ign-math vector
+      /// \return gz-math vector
       public: static math::Vector3d Convert(const Ogre::Vector3 &_vector);
 
       /// \brief gz-math quaternion to Ogre quaternion
-      /// \param[in] _quat ign-math quaternion
+      /// \param[in] _quat gz-math quaternion
       /// \return Ogre quaternion
       public: static Ogre::Quaternion Convert(const math::Quaterniond &_quat);
 
-      /// \brief Ogre quaternion to ign-math quaternion
+      /// \brief Ogre quaternion to gz-math quaternion
       /// \param[in] _quat Ogre quaternion
-      /// return ign-math quaternion
+      /// return gz-math quaternion
       public: static math::Quaterniond Convert(const Ogre::Quaternion &_quat);
 
       /// \brief gz-math angle to Ogre angle
-      /// \param[in] _angle ign-math angle
+      /// \param[in] _angle gz-math angle
       /// \return Ogre angle
       public: static Ogre::Radian Convert(const math::Angle &_angle);
 
-      /// \brief Ogre angle to ign-math angle
+      /// \brief Ogre angle to gz-math angle
       /// \param[in] _angle Ogre angle
-      /// return Ign-math angle
+      /// return gz-math angle
       public: static math::Angle Convert(const Ogre::Radian &_angle);
 
       /// \brief Ogre Matrix4 to Gazebo Math Matrix4d
@@ -93,7 +93,7 @@ namespace gz
       public: static Ogre::Matrix4 Convert(const math::Matrix4d &_m);
 
       /// \brief gz-rendering PixelFormat to Ogre PixelFormat
-      /// \param[in] _format Ign-rendering PixelFormat
+      /// \param[in] _format gz-rendering PixelFormat
       /// return Ogre PixelFormat
       public: static Ogre::PixelFormat Convert(PixelFormat _format);
 
diff --git a/ogre/include/gz/rendering/ogre/OgreMaterial.hh b/ogre/include/gz/rendering/ogre/OgreMaterial.hh
index 3efd6a586..501307cd2 100644
--- a/ogre/include/gz/rendering/ogre/OgreMaterial.hh
+++ b/ogre/include/gz/rendering/ogre/OgreMaterial.hh
@@ -197,7 +197,7 @@ namespace gz
       /// \brief bind shader parameters that have changed
       protected: void UpdateShaderParams();
 
-      /// \brief Transfer params from ign-rendering type to ogre type
+      /// \brief Transfer params from gz-rendering type to ogre type
       /// \param[in] _params Gazebo Rendering params
       /// \param[out] _ogreParams ogre type for holding params
       protected: void UpdateShaderParams(ConstShaderParamsPtr _params,
diff --git a/ogre/include/gz/rendering/ogre/ogre.hh.in b/ogre/include/gz/rendering/ogre/ogre.hh.in
index c4092f0cd..4ffcf3d38 100644
--- a/ogre/include/gz/rendering/ogre/ogre.hh.in
+++ b/ogre/include/gz/rendering/ogre/ogre.hh.in
@@ -1,3 +1,3 @@
 // Automatically generated
-#include <gz/${IGN_PROJECT_NAME}/config.hh>
+#include <gz/${GZ_PROJECT_NAME}/config.hh>
 ${ign_headers}
diff --git a/ogre/src/OgreHeightmap.cc b/ogre/src/OgreHeightmap.cc
index bdbfccc83..c3cdb6819 100644
--- a/ogre/src/OgreHeightmap.cc
+++ b/ogre/src/OgreHeightmap.cc
@@ -422,7 +422,7 @@ OgreHeightmap::OgreHeightmap(const HeightmapDescriptor &_desc)
   gz::common::env(GZ_HOMEDIR, home);
 
   this->dataPtr->pagingDir =
-      common::joinPaths(home, ".ignition", "rendering",
+      common::joinPaths(home, ".gz", "rendering",
       this->dataPtr->pagingDirname);
 }
 
@@ -465,7 +465,7 @@ void OgreHeightmap::Init()
 
   // \todo These parameters shouldn't be hardcoded, and instead parametrized so
   // that they can be made consistent across different libraries (like
-  // ign-physics)
+  // gz-physics)
   bool flipY = false;
   // sampling size along image width and height
   unsigned int vertSize = (this->descriptor.Data()->Width() *
@@ -490,7 +490,7 @@ void OgreHeightmap::Init()
     {
       int index = (vertSize - y - 1) * vertSize + x;
 
-      // Sanity check in case we get NaNs from ign-common, this prevents a crash
+      // Sanity check in case we get NaNs from gz-common, this prevents a crash
       // in Ogre
       auto value = lookup[index];
       if (!std::isfinite(value))
diff --git a/ogre/src/OgreMaterialSwitcher.cc b/ogre/src/OgreMaterialSwitcher.cc
index dfde297fd..7adac3688 100644
--- a/ogre/src/OgreMaterialSwitcher.cc
+++ b/ogre/src/OgreMaterialSwitcher.cc
@@ -75,7 +75,7 @@ Ogre::Technique *OgreMaterialSwitcher::handleSchemeNotFound(
     {
       // plain opaque material
       Ogre::ResourcePtr res =
-        Ogre::MaterialManager::getSingleton().load("ign-rendering/plain_color",
+        Ogre::MaterialManager::getSingleton().load("gz-rendering/plain_color",
             Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
 
       // OGRE 1.9 changes the shared pointer definition
diff --git a/ogre/src/OgreRTShaderSystem.cc b/ogre/src/OgreRTShaderSystem.cc
index fc16be481..7cc92137c 100644
--- a/ogre/src/OgreRTShaderSystem.cc
+++ b/ogre/src/OgreRTShaderSystem.cc
@@ -525,7 +525,7 @@ bool OgreRTShaderSystem::Paths(std::string &coreLibsPath,
       const char *homeEnv = std::getenv(GZ_HOMEDIR);
       std::string tmpDir = (homeEnv) ? std::string(homeEnv) : std::string(".");
 
-      tmpDir = common::joinPaths(tmpDir, ".ignition", "rendering",
+      tmpDir = common::joinPaths(tmpDir, ".gz", "rendering",
           "ogre-rtshader");
       // Get the user
       std::string user = "nobody";
diff --git a/ogre/src/OgreRenderEngine.cc b/ogre/src/OgreRenderEngine.cc
index 3be4fe173..787bf6e43 100644
--- a/ogre/src/OgreRenderEngine.cc
+++ b/ogre/src/OgreRenderEngine.cc
@@ -195,7 +195,7 @@ void OgreRenderEngine::AddResourcePath(const std::string &_uri)
         }
         std::sort(paths.begin(), paths.end());
 
-        // Iterate over all the models in the current ign-rendering path
+        // Iterate over all the models in the current gz-rendering path
         for (auto dIter = paths.begin(); dIter != paths.end(); ++dIter)
         {
           std::string fullPath = *dIter;
@@ -335,7 +335,7 @@ void OgreRenderEngine::CreateLogger()
   // create log file path
   std::string logPath;
   gz::common::env(GZ_HOMEDIR, logPath);
-  logPath = common::joinPaths(logPath, ".ignition", "rendering");
+  logPath = common::joinPaths(logPath, ".gz", "rendering");
   common::createDirectories(logPath);
   logPath = common::joinPaths(logPath, "ogre.log");
 
@@ -804,7 +804,7 @@ void OgreRenderEngine::InitAttempt()
   Ogre::ColourValue ambient;
 
   /// Create a dummy rendering context.
-  /// This will allow ign-rendering to run headless. And it also allows OGRE to
+  /// This will allow gz-rendering to run headless. And it also allows OGRE to
   /// initialize properly
 
   // Set default mipmap level (NB some APIs ignore this)
diff --git a/ogre/src/OgreSelectionBuffer.cc b/ogre/src/OgreSelectionBuffer.cc
index 61a0144a7..2b031152d 100644
--- a/ogre/src/OgreSelectionBuffer.cc
+++ b/ogre/src/OgreSelectionBuffer.cc
@@ -290,7 +290,7 @@ void OgreSelectionBuffer::CreateRTTOverlays()
   else
   {
     gzlog << "Unable to create selection buffer overlay. "
-      "This will not effect ignition-rendering unless you're trying to debug "
+      "This will not effect gz-rendering unless you're trying to debug "
       "the selection buffer.\n";
   }
 }
diff --git a/ogre/src/OgreText.cc b/ogre/src/OgreText.cc
index b0179669e..b1bf435d0 100644
--- a/ogre/src/OgreText.cc
+++ b/ogre/src/OgreText.cc
@@ -40,7 +40,7 @@ class gz::rendering::OgreMovableText
   public: virtual ~OgreMovableText();
 
   /// \brief Set the font. Valid fonts are defined in
-  /// media/fonts/ignition-rendering.fontdef
+  /// media/fonts/gz-rendering.fontdef
   /// \param[in] _font Name of the font
   public: void SetFontName(const std::string &_font);
 
diff --git a/ogre/src/media/fonts/ignition-rendering.fontdef b/ogre/src/media/fonts/gz-rendering.fontdef
similarity index 100%
rename from ogre/src/media/fonts/ignition-rendering.fontdef
rename to ogre/src/media/fonts/gz-rendering.fontdef
diff --git a/ogre/src/media/materials/scripts/picker.material b/ogre/src/media/materials/scripts/picker.material
index 5bf67970e..d37fb85b1 100644
--- a/ogre/src/media/materials/scripts/picker.material
+++ b/ogre/src/media/materials/scripts/picker.material
@@ -18,7 +18,7 @@ fragment_program plaincolor_fs glsl
   }
 }
 
-material ign-rendering/plain_color
+material gz-rendering/plain_color
 {
   // Material has one technique
   technique
diff --git a/ogre2/include/CMakeLists.txt b/ogre2/include/CMakeLists.txt
index 4b2bdd7bb..992a1312e 100644
--- a/ogre2/include/CMakeLists.txt
+++ b/ogre2/include/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_subdirectory(gz)
-install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
+install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL})
diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh
index a68c8823d..bfcf87199 100644
--- a/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh
+++ b/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh
@@ -53,45 +53,45 @@ namespace gz
     class GZ_RENDERING_OGRE2_VISIBLE Ogre2Conversions
     {
       /// \brief Return the equivalent ogre color
-      /// \param[in] _color ign-math color to convert
+      /// \param[in] _color gz-math color to convert
       /// \return Ogre color value
       public: static Ogre::ColourValue Convert(
           const math::Color &_color);
 
-      /// \brief Return the equivalent ign-math color
+      /// \brief Return the equivalent gz-math color
       /// \param[in] _color Ogre color to convert
-      /// \return ign-math color value
+      /// \return gz-math color value
       public: static math::Color Convert(
           const Ogre::ColourValue &_color);
 
-      /// \brief return Ogre Vector from ign-math Vector3
-      /// \param[in] _vector ign-math vector
+      /// \brief return Ogre Vector from gz-math Vector3
+      /// \param[in] _vector gz-math vector
       /// \return Ogre vector
       public: static Ogre::Vector3 Convert(const math::Vector3d &_vector);
 
-      /// \brief return ign-math Vector from ogre Vector3
+      /// \brief return gz-math Vector from ogre Vector3
       /// \param[in] _vector Ogre vector
-      /// \return ign-math vector
+      /// \return gz-math vector
       public: static math::Vector3d Convert(const Ogre::Vector3 &_vector);
 
       /// \brief gz-math quaternion to Ogre quaternion
-      /// \param[in] _quat ign-math quaternion
+      /// \param[in] _quat gz-math quaternion
       /// \return Ogre quaternion
       public: static Ogre::Quaternion Convert(const math::Quaterniond &_quat);
 
-      /// \brief Ogre quaternion to ign-math quaternion
+      /// \brief Ogre quaternion to gz-math quaternion
       /// \param[in] _quat Ogre quaternion
-      /// return ign-math quaternion
+      /// return gz-math quaternion
       public: static math::Quaterniond Convert(const Ogre::Quaternion &_quat);
 
       /// \brief gz-math angle to Ogre angle
-      /// \param[in] _angle ign-math angle
+      /// \param[in] _angle gz-math angle
       /// \return Ogre angle
       public: static Ogre::Radian Convert(const math::Angle &_angle);
 
-      /// \brief Ogre angle to ign-math angle
+      /// \brief Ogre angle to gz-math angle
       /// \param[in] _angle Ogre angle
-      /// return Ign-math angle
+      /// return gz-math angle
       public: static math::Angle Convert(const Ogre::Radian &_angle);
 
       /// \brief Ogre Matrix4 to Gazebo Math Matrix4d
@@ -105,7 +105,7 @@ namespace gz
       public: static Ogre::Matrix4 Convert(const math::Matrix4d &_m);
 
       /// \brief gz-rendering PixelFormat to Ogre PixelFormat
-      /// \param[in] _format Ign-rendering PixelFormat
+      /// \param[in] _format gz-rendering PixelFormat
       /// return Ogre PixelFormat
       public: static Ogre::PixelFormatGpu Convert(PixelFormat _format);
 
diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh
index cda523366..1021ef705 100644
--- a/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh
+++ b/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh
@@ -288,7 +288,7 @@ namespace gz
       /// \brief bind shader parameters that have changed
       protected: void UpdateShaderParams();
 
-      /// \brief Transfer params from ign-rendering type to ogre type
+      /// \brief Transfer params from gz-rendering type to ogre type
       /// \param[in] _params Gazebo Rendering params
       /// \param[out] _ogreParams ogre type for holding params
       protected: void UpdateShaderParams(ConstShaderParamsPtr _params,
diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh
index 741419b28..e0126d96e 100644
--- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh
+++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh
@@ -38,7 +38,7 @@ namespace gz
      */
     /// \brief Ogre2 Implementation of a render pass.
     ///
-    /// The ogre2 compositor chain in ign-rendering is set up as follows:
+    /// The ogre2 compositor chain in gz-rendering is set up as follows:
     ///  * Base scene pass -> [0..N] RenderPass'es -> Final compositor pass.
     /// This is set up by Ogre2RenderTarget which loads the compositor workspace
     /// definiton from script. The base scene pass node is responsible for
diff --git a/ogre2/include/gz/rendering/ogre2/ogre2.hh.in b/ogre2/include/gz/rendering/ogre2/ogre2.hh.in
index c4092f0cd..4ffcf3d38 100644
--- a/ogre2/include/gz/rendering/ogre2/ogre2.hh.in
+++ b/ogre2/include/gz/rendering/ogre2/ogre2.hh.in
@@ -1,3 +1,3 @@
 // Automatically generated
-#include <gz/${IGN_PROJECT_NAME}/config.hh>
+#include <gz/${GZ_PROJECT_NAME}/config.hh>
 ${ign_headers}
diff --git a/ogre2/src/Ogre2GzHlmsPbsPrivate.cc b/ogre2/src/Ogre2GzHlmsPbsPrivate.cc
index dc74f36db..7710b6210 100644
--- a/ogre2/src/Ogre2GzHlmsPbsPrivate.cc
+++ b/ogre2/src/Ogre2GzHlmsPbsPrivate.cc
@@ -280,10 +280,10 @@ namespace Ogre
     HlmsPbs::getDefaultPaths(_outDataFolderPath, _outLibraryFoldersPaths);
 
     _outLibraryFoldersPaths.push_back(
-      common::joinPaths("Hlms", "Ignition", "SolidColor"));
+      common::joinPaths("Hlms", "Gz", "SolidColor"));
     _outLibraryFoldersPaths.push_back(
-      common::joinPaths("Hlms", "Ignition", "SphericalClipMinDistance"));
+      common::joinPaths("Hlms", "Gz", "SphericalClipMinDistance"));
     _outLibraryFoldersPaths.push_back(
-      common::joinPaths("Hlms", "Ignition", "Pbs"));
+      common::joinPaths("Hlms", "Gz", "Pbs"));
   }
 }  // namespace Ogre
diff --git a/ogre2/src/Ogre2GzHlmsPbsPrivate.hh b/ogre2/src/Ogre2GzHlmsPbsPrivate.hh
index 80e24ba4c..c3e07e14b 100644
--- a/ogre2/src/Ogre2GzHlmsPbsPrivate.hh
+++ b/ogre2/src/Ogre2GzHlmsPbsPrivate.hh
@@ -44,7 +44,7 @@ namespace Ogre
   ///   - Sends relevant data to the GPU buffers for shaders to use
   ///
   /// This listener requires Hlms to have been created with the piece data
-  /// files in ogre2/src/media/Hlms/Ignition registered
+  /// files in ogre2/src/media/Hlms/Gz registered
   ///
   /// We need to derive from HlmsPbs/HlmsUnlit (rather than just using
   /// HlmsListener) when we need to use code that sends data
diff --git a/ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.hh b/ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.hh
index b32313691..99f6c1b25 100644
--- a/ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.hh
+++ b/ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.hh
@@ -41,7 +41,7 @@ namespace gz
     ///   - Sends relevant data to the GPU buffers for shaders to use
     ///
     /// This listener requires Hlms to have been created with the piece data
-    /// files in ogre2/src/media/Hlms/Ignition registered
+    /// files in ogre2/src/media/Hlms/Gz registered
     ///
     /// \internal
     /// \remark Public variables take effect immediately (i.e. for the
diff --git a/ogre2/src/Ogre2GzHlmsTerraPrivate.cc b/ogre2/src/Ogre2GzHlmsTerraPrivate.cc
index 563729e79..04772020e 100644
--- a/ogre2/src/Ogre2GzHlmsTerraPrivate.cc
+++ b/ogre2/src/Ogre2GzHlmsTerraPrivate.cc
@@ -300,12 +300,12 @@ namespace Ogre
     HlmsTerra::getDefaultPaths(_outDataFolderPath, _outLibraryFoldersPaths);
 
     _outLibraryFoldersPaths.push_back(
-      common::joinPaths("Hlms", "Ignition", "SolidColor"));
+      common::joinPaths("Hlms", "Gz", "SolidColor"));
     _outLibraryFoldersPaths.push_back(
-      common::joinPaths("Hlms", "Ignition", "SphericalClipMinDistance"));
+      common::joinPaths("Hlms", "Gz", "SphericalClipMinDistance"));
     _outLibraryFoldersPaths.push_back(
-      common::joinPaths("Hlms", "Terra", "ign"));
+      common::joinPaths("Hlms", "Terra", "gz"));
     _outLibraryFoldersPaths.push_back(
-      common::joinPaths("Hlms", "Ignition", "Pbs"));
+      common::joinPaths("Hlms", "Gz", "Pbs"));
   }
 }  // namespace Ogre
diff --git a/ogre2/src/Ogre2GzHlmsTerraPrivate.hh b/ogre2/src/Ogre2GzHlmsTerraPrivate.hh
index 8f1ec65ee..a0abadd57 100644
--- a/ogre2/src/Ogre2GzHlmsTerraPrivate.hh
+++ b/ogre2/src/Ogre2GzHlmsTerraPrivate.hh
@@ -42,7 +42,7 @@ namespace Ogre
   ///   - Sends relevant data to the GPU buffers for shaders to use
   ///
   /// This listener requires Hlms to have been created with the piece data
-  /// files in ogre2/src/media/Hlms/Ignition registered
+  /// files in ogre2/src/media/Hlms/Gz registered
   ///
   /// We need to derive from HlmsTerra (rather than just using
   /// HlmsListener) when we need to use code that sends data
diff --git a/ogre2/src/Ogre2GzHlmsUnlitPrivate.cc b/ogre2/src/Ogre2GzHlmsUnlitPrivate.cc
index 21057b145..157a5019b 100644
--- a/ogre2/src/Ogre2GzHlmsUnlitPrivate.cc
+++ b/ogre2/src/Ogre2GzHlmsUnlitPrivate.cc
@@ -234,10 +234,10 @@ namespace Ogre
     HlmsUnlit::getDefaultPaths(_outDataFolderPath, _outLibraryFoldersPaths);
 
     _outLibraryFoldersPaths.push_back(
-      common::joinPaths("Hlms", "Ignition", "SolidColor"));
+      common::joinPaths("Hlms", "Gz", "SolidColor"));
     _outLibraryFoldersPaths.push_back(
-      common::joinPaths("Hlms", "Ignition", "SphericalClipMinDistance"));
+      common::joinPaths("Hlms", "Gz", "SphericalClipMinDistance"));
     _outLibraryFoldersPaths.push_back(
-      common::joinPaths("Hlms", "Ignition", "Pbs"));
+      common::joinPaths("Hlms", "Gz", "Pbs"));
   }
 }  // namespace Ogre
diff --git a/ogre2/src/Ogre2GzHlmsUnlitPrivate.hh b/ogre2/src/Ogre2GzHlmsUnlitPrivate.hh
index 967a90aad..62de717c9 100644
--- a/ogre2/src/Ogre2GzHlmsUnlitPrivate.hh
+++ b/ogre2/src/Ogre2GzHlmsUnlitPrivate.hh
@@ -42,7 +42,7 @@ namespace Ogre
   ///   - Sends relevant data to the GPU buffers for shaders to use
   ///
   /// This listener requires Hlms to have been created with the piece data
-  /// files in ogre2/src/media/Hlms/Ignition registered
+  /// files in ogre2/src/media/Hlms/Gz registered
   ///
   /// We need to derive from HlmsUnlit/HlmsUnlit (rather than just using
   /// HlmsListener) when we need to use code that sends data
diff --git a/ogre2/src/Ogre2Heightmap.cc b/ogre2/src/Ogre2Heightmap.cc
index 9ef68af74..866e82f70 100644
--- a/ogre2/src/Ogre2Heightmap.cc
+++ b/ogre2/src/Ogre2Heightmap.cc
@@ -102,7 +102,7 @@ void Ogre2Heightmap::Init()
 
   // \todo These parameters shouldn't be hardcoded, and instead parametrized so
   // that they can be made consistent across different libraries (like
-  // ign-physics)
+  // gz-physics)
   bool flipY = false;
   // sampling size along image width and height
   const bool needsOgre1Compat =
@@ -168,7 +168,7 @@ void Ogre2Heightmap::Init()
       const size_t index = y * srcWidth + x;
       float heightVal = lookup[index];
 
-      // Sanity check in case we get NaNs from ign-common, this prevents a crash
+      // Sanity check in case we get NaNs from gz-common, this prevents a crash
       // in Ogre
       if (!std::isfinite(heightVal))
         heightVal = minElevation;
@@ -255,7 +255,7 @@ void Ogre2Heightmap::Init()
              "HlmsTerra incorrectly setup, memory corrupted, or "
              "HlmsTerra::getType changed while this code is out of sync");
 
-  Ogre::String datablockName = "IGN Terra " + this->name;
+  Ogre::String datablockName = "GZ Terra " + this->name;
 
   Ogre::HlmsDatablock *datablockBase = hlmsTerra->createDatablock(
               datablockName, datablockName, Ogre::HlmsMacroblock(),
diff --git a/ogre2/src/Ogre2RenderEngine.cc b/ogre2/src/Ogre2RenderEngine.cc
index decfa6190..aa1b406e1 100644
--- a/ogre2/src/Ogre2RenderEngine.cc
+++ b/ogre2/src/Ogre2RenderEngine.cc
@@ -239,7 +239,7 @@ void Ogre2RenderEngine::AddResourcePath(const std::string &_uri)
         }
         std::sort(paths.begin(), paths.end());
 
-        // Iterate over all the models in the current ign-rendering path
+        // Iterate over all the models in the current gz-rendering path
         for (auto dIter = paths.begin(); dIter != paths.end(); ++dIter)
         {
           std::string fullPath = *dIter;
@@ -385,7 +385,7 @@ void Ogre2RenderEngine::CreateLogger()
   // create log file path
   std::string logPath;
   gz::common::env(GZ_HOMEDIR, logPath);
-  logPath = common::joinPaths(logPath, ".ignition", "rendering");
+  logPath = common::joinPaths(logPath, ".gz", "rendering");
   common::createDirectories(logPath);
   logPath = common::joinPaths(logPath, "ogre2.log");
 
@@ -753,7 +753,7 @@ void Ogre2RenderEngine::RegisterHlms()
   Ogre::ArchiveManager &archiveManager = Ogre::ArchiveManager::getSingleton();
 
   Ogre::Archive *customizationsArchiveLibrary =
-      archiveManager.load(common::joinPaths(rootHlmsFolder, "Hlms", "Ignition"),
+      archiveManager.load(common::joinPaths(rootHlmsFolder, "Hlms", "Gz"),
       "FileSystem", true);
 
   {
diff --git a/ogre2/src/Ogre2Scene.cc b/ogre2/src/Ogre2Scene.cc
index eed180661..d42fb9dbf 100644
--- a/ogre2/src/Ogre2Scene.cc
+++ b/ogre2/src/Ogre2Scene.cc
@@ -518,12 +518,12 @@ void Ogre2Scene::UpdateAllHeightmaps(Ogre::Camera *_camera)
 #if OGRE_VERSION_MAJOR == 2 && OGRE_VERSION_MINOR == 2
   if (!this->heightmaps.empty())
   {
-      // Ogre 2.2 expects ign to provide Terra's shadow texture
+      // Ogre 2.2 expects gz to provide Terra's shadow texture
       // to each compositor that may use it to properly set barriers
       // (otherwise GPU may start rendering before the Compute Shader
       // is done ray marching terrain shadows)
       //
-      // This is insane with so many possible compositors ign has,
+      // This is insane with so many possible compositors gz has,
       // so we do a brute-force approach here (not that expensive actually)
       //
       // Ogre 2.3 got rid of this requirement due to being very user-hostile
diff --git a/ogre2/src/media/Hlms/Ignition/Pbs/500.IgnPbsStructs_piece_all.any b/ogre2/src/media/Hlms/Gz/Pbs/500.GzPbsStructs_piece_all.any
similarity index 100%
rename from ogre2/src/media/Hlms/Ignition/Pbs/500.IgnPbsStructs_piece_all.any
rename to ogre2/src/media/Hlms/Gz/Pbs/500.GzPbsStructs_piece_all.any
diff --git a/ogre2/src/media/Hlms/Ignition/Pbs/800.IgnPbsCode_piece_ps.any b/ogre2/src/media/Hlms/Gz/Pbs/800.GzPbsCode_piece_ps.any
similarity index 100%
rename from ogre2/src/media/Hlms/Ignition/Pbs/800.IgnPbsCode_piece_ps.any
rename to ogre2/src/media/Hlms/Gz/Pbs/800.GzPbsCode_piece_ps.any
diff --git a/ogre2/src/media/Hlms/Ignition/Pbs/800.IgnPbsCode_piece_vs.any b/ogre2/src/media/Hlms/Gz/Pbs/800.GzPbsCode_piece_vs.any
similarity index 100%
rename from ogre2/src/media/Hlms/Ignition/Pbs/800.IgnPbsCode_piece_vs.any
rename to ogre2/src/media/Hlms/Gz/Pbs/800.GzPbsCode_piece_vs.any
diff --git a/ogre2/src/media/Hlms/Ignition/SolidColor/500.IgnSolidColorStructs_piece_all.any b/ogre2/src/media/Hlms/Gz/SolidColor/500.GzSolidColorStructs_piece_all.any
similarity index 100%
rename from ogre2/src/media/Hlms/Ignition/SolidColor/500.IgnSolidColorStructs_piece_all.any
rename to ogre2/src/media/Hlms/Gz/SolidColor/500.GzSolidColorStructs_piece_all.any
diff --git a/ogre2/src/media/Hlms/Ignition/SolidColor/800.IgnSolidColor_piece_ps.any b/ogre2/src/media/Hlms/Gz/SolidColor/800.GzSolidColor_piece_ps.any
similarity index 100%
rename from ogre2/src/media/Hlms/Ignition/SolidColor/800.IgnSolidColor_piece_ps.any
rename to ogre2/src/media/Hlms/Gz/SolidColor/800.GzSolidColor_piece_ps.any
diff --git a/ogre2/src/media/Hlms/Ignition/SolidColor/800.IgnSolidColor_piece_vs.any b/ogre2/src/media/Hlms/Gz/SolidColor/800.GzSolidColor_piece_vs.any
similarity index 100%
rename from ogre2/src/media/Hlms/Ignition/SolidColor/800.IgnSolidColor_piece_vs.any
rename to ogre2/src/media/Hlms/Gz/SolidColor/800.GzSolidColor_piece_vs.any
diff --git a/ogre2/src/media/Hlms/Ignition/SphericalClipMinDistance/IgnSphericalClipMinDistance_piece_vs.any b/ogre2/src/media/Hlms/Gz/SphericalClipMinDistance/GzSphericalClipMinDistance_piece_vs.any
similarity index 100%
rename from ogre2/src/media/Hlms/Ignition/SphericalClipMinDistance/IgnSphericalClipMinDistance_piece_vs.any
rename to ogre2/src/media/Hlms/Gz/SphericalClipMinDistance/GzSphericalClipMinDistance_piece_vs.any
diff --git a/ogre2/src/media/Hlms/Ignition/SphericalClipMinDistance/SphericalClipMinDistanceStructs_piece_all.any b/ogre2/src/media/Hlms/Gz/SphericalClipMinDistance/SphericalClipMinDistanceStructs_piece_all.any
similarity index 100%
rename from ogre2/src/media/Hlms/Ignition/SphericalClipMinDistance/SphericalClipMinDistanceStructs_piece_all.any
rename to ogre2/src/media/Hlms/Gz/SphericalClipMinDistance/SphericalClipMinDistanceStructs_piece_all.any
diff --git a/ogre2/src/media/Hlms/Terra/Any/800.PixelShader_piece_ps.any b/ogre2/src/media/Hlms/Terra/Any/800.PixelShader_piece_ps.any
index 1e3272840..2abb60a4e 100644
--- a/ogre2/src/media/Hlms/Terra/Any/800.PixelShader_piece_ps.any
+++ b/ogre2/src/media/Hlms/Terra/Any/800.PixelShader_piece_ps.any
@@ -102,11 +102,11 @@
 		float4 detailWeights = float4( 0.25f, 0.25f, 0.25f, 0.25f );
 		@insertpiece( ign_weights )
 	@else
-		// IGN CUSTOMIZE BEGIN
+		// GZ CUSTOMIZE BEGIN
 		//pixelData.diffuse.xyz *= (detailCol0.xyz * detailWeights.x + detailCol1.xyz * detailWeights.y) +
 		//						 (detailCol2.xyz * detailWeights.z + detailCol3.xyz * detailWeights.w);
 		@insertpiece( ign_weights )
-		// IGN CUSTOMIZE END
+		// GZ CUSTOMIZE END
 	@end
 
 	/// Apply the material's diffuse over the textures
@@ -130,7 +130,7 @@
 
 	pixelData.specular.xyz = float3( 1.0f, 1.0f, 1.0f );
 
-	// IGN CUSTOMIZE BEGIN
+	// GZ CUSTOMIZE BEGIN
 	//	float metalness =	(metalness0 * detailWeights.x * material.metalness.x +
 	//						 metalness1 * detailWeights.y * material.metalness.y) +
 	//						(metalness2 * detailWeights.z * material.metalness.z +
@@ -140,7 +140,7 @@
 	metalness = lerp( metalness, metalness1, detailWeights.y );
 	metalness = lerp( metalness, metalness2, detailWeights.z );
 	metalness = lerp( metalness, metalness3, detailWeights.w );
-	// IGN CUSTOMIZE END
+	// GZ CUSTOMIZE END
 
 	pixelData.F0 = lerp( float3( 0.03f, 0.03f, 0.03f ), pixelData.diffuse.xyz * 3.14159f, metalness );
 	pixelData.diffuse.xyz = pixelData.diffuse.xyz - pixelData.diffuse.xyz * metalness;
@@ -161,7 +161,7 @@
 		@end
 	@end
 
-	// IGN CUSTOMIZE BEGIN
+	// GZ CUSTOMIZE BEGIN
 	//	pixelData.roughness =	(roughness0 * detailWeights.x * material.roughness.x +
 	//							 roughness1 * detailWeights.y * material.roughness.y) +
 	//							(roughness2 * detailWeights.z * material.roughness.z +
@@ -171,7 +171,7 @@
 	roughness = lerp( roughness, roughness1, detailWeights.y );
 	roughness = lerp( roughness, roughness2, detailWeights.z );
 	roughness = lerp( roughness, roughness3, detailWeights.w );
-	// IGN CUSTOMIZE END
+	// GZ CUSTOMIZE END
 	pixelData.roughness = max( pixelData.roughness, 0.001f );
 @end
 
diff --git a/ogre2/src/media/Hlms/Terra/ign/100.ign_CustomVs_piece_vs.any b/ogre2/src/media/Hlms/Terra/gz/100.gz_CustomVs_piece_vs.any
similarity index 100%
rename from ogre2/src/media/Hlms/Terra/ign/100.ign_CustomVs_piece_vs.any
rename to ogre2/src/media/Hlms/Terra/gz/100.gz_CustomVs_piece_vs.any
diff --git a/ogre2/src/media/Hlms/Terra/ign/100.ign_CustomWeights_piece_ps.any b/ogre2/src/media/Hlms/Terra/gz/100.gz_CustomWeights_piece_ps.any
similarity index 100%
rename from ogre2/src/media/Hlms/Terra/ign/100.ign_CustomWeights_piece_ps.any
rename to ogre2/src/media/Hlms/Terra/gz/100.gz_CustomWeights_piece_ps.any
diff --git a/ogre2/src/media/Hlms/Terra/ign/500.ign_Structs_piece_all.any b/ogre2/src/media/Hlms/Terra/gz/500.gz_Structs_piece_all.any
similarity index 100%
rename from ogre2/src/media/Hlms/Terra/ign/500.ign_Structs_piece_all.any
rename to ogre2/src/media/Hlms/Terra/gz/500.gz_Structs_piece_all.any
diff --git a/ogre2/src/media/materials/scripts/picker.material b/ogre2/src/media/materials/scripts/picker.material
index 44cc1ef81..fdc4d4bc1 100644
--- a/ogre2/src/media/materials/scripts/picker.material
+++ b/ogre2/src/media/materials/scripts/picker.material
@@ -33,7 +33,7 @@ vertex_program plaincolor_vs unified
   delegate plaincolor_vs_Metal
 }
 
-material ign-rendering/plain_color
+material gz-rendering/plain_color
 {
   // Material has one technique
   technique
diff --git a/ogre2/src/terrain/Terra/CMakeLists.txt b/ogre2/src/terrain/Terra/CMakeLists.txt
index 7b56a69ed..cfb7ad520 100644
--- a/ogre2/src/terrain/Terra/CMakeLists.txt
+++ b/ogre2/src/terrain/Terra/CMakeLists.txt
@@ -8,7 +8,7 @@ file( GLOB_RECURSE TERRA_SOURCES
 
 add_library(${PROJECT_NAME} STATIC ${TERRA_SOURCES})
 
-if(IGN_ADD_fPIC_TO_LIBRARIES AND NOT _gz_add_library_INTERFACE)
+if(GZ_ADD_fPIC_TO_LIBRARIES AND NOT _gz_add_library_INTERFACE)
   target_compile_options(${PROJECT_NAME} PRIVATE -fPIC)
 endif()
 
diff --git a/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsJsonTerra.h b/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsJsonTerra.h
index 7158ee7af..2a122dd3c 100644
--- a/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsJsonTerra.h
+++ b/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsJsonTerra.h
@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#if !OGRE_NO_JSON && defined( IGN_TERRA_JSON_ENABLED )
+#if !OGRE_NO_JSON && defined( GZ_TERRA_JSON_ENABLED )
 #ifndef _OgreHlmsJsonTerra_H_
 #define _OgreHlmsJsonTerra_H_
 
diff --git a/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerra.h b/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerra.h
index d4b2ceb40..60666b4ae 100644
--- a/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerra.h
+++ b/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerra.h
@@ -110,7 +110,7 @@ namespace Ogre
 
         static void getDefaultPaths( String& outDataFolderPath, StringVector& outLibraryFoldersPaths );
 
-#if !OGRE_NO_JSON && defined( IGN_TERRA_JSON_ENABLED )
+#if !OGRE_NO_JSON && defined( GZ_TERRA_JSON_ENABLED )
         /// @copydoc Hlms::_loadJson
         virtual void _loadJson( const rapidjson::Value &jsonValue, const HlmsJson::NamedBlocks &blocks,
                                 HlmsDatablock *datablock, const String &resourceGroup,
diff --git a/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerraDatablock.h b/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerraDatablock.h
index 27c3a2d5c..bdfb1e8df 100644
--- a/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerraDatablock.h
+++ b/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerraDatablock.h
@@ -178,10 +178,10 @@ namespace Ogre
         Vector4 mDetailsOffsetScale[4];
         //uint16  mTexIndices[NUM_TERRA_TEXTURE_TYPES];
 
-        // IGN CUSTOMIZE BEGIN
+        // GZ CUSTOMIZE BEGIN
         float mIgnWeightsMinHeight[4];
         float mIgnWeightsMaxHeight[4];
-        // IGN CUSTOMIZE END
+        // GZ CUSTOMIZE END
 
         /// @see TerraBrdf::TerraBrdf
         uint32  mBrdf;
@@ -243,13 +243,13 @@ namespace Ogre
         void setBrdf( TerraBrdf::TerraBrdf brdf );
         uint32 getBrdf(void) const;
 
-        // IGN CUSTOMIZE BEGIN
+        // GZ CUSTOMIZE BEGIN
         void setIgnWeightsHeights( const Vector4 &ignWeightsMinHeight,
                                    const Vector4 &ignWeightsMaxHeight );
         using HlmsTerraBaseTextureDatablock::setTexture;
         void setTexture( TerraTextureTypes texUnit, const String &name,
                          const HlmsSamplerblock *refParams );
-        // IGN CUSTOMIZE END
+        // GZ CUSTOMIZE END
 
         /** Suggests the TextureMapType (aka texture category) for each type of texture
             (i.e. normals should load from TEXTURE_TYPE_NORMALS).
diff --git a/ogre2/src/terrain/Terra/include/Terra/Terra.h b/ogre2/src/terrain/Terra/include/Terra/Terra.h
index 45bbf9db8..5680cccb3 100644
--- a/ogre2/src/terrain/Terra/include/Terra/Terra.h
+++ b/ogre2/src/terrain/Terra/include/Terra/Terra.h
@@ -107,12 +107,12 @@ namespace Ogre
         CompositorManager2      *m_compositorManager;
         Camera const            *m_camera;
 
-        // IGN CUSTOMIZE BEGIN
+        // GZ CUSTOMIZE BEGIN
         /// See IORM_SOLID_COLOR and IORM_SOLID_THERMAL_COLOR_TEXTURED
         Vector4 mSolidColor[2];
         /// See IORM_SOLID_COLOR and IORM_SOLID_THERMAL_COLOR_TEXTURED
         bool mSolidColorSet[2];
-        // IGN CUSTOMIZE END
+        // GZ CUSTOMIZE END
 
         /// Converts value from Y-up to whatever the user up vector is (see m_zUp)
         inline Vector3 fromYUp( Vector3 value ) const;
@@ -177,7 +177,7 @@ namespace Ogre
         void setCustomSkirtMinHeight( const float skirtMinHeight ) { m_skirtSize = skirtMinHeight; }
         float getCustomSkirtMinHeight( void ) const { return m_skirtSize; }
 
-        // IGN CUSTOMIZE BEGIN
+        // GZ CUSTOMIZE BEGIN
         /// \brief See IORM_SOLID_COLOR and IORM_SOLID_THERMAL_COLOR_TEXTURED
         /// Replaces renderable->setCustomRenderable(...) because
         /// a Terrain may have many renderables but the color is the same
@@ -202,7 +202,7 @@ namespace Ogre
         /// Marks all SetSolidColor as unset so that SolidColor throws
         /// if used again without setting.
         void UnsetSolidColors();
-        // IGN CUSTOMIZE END
+        // GZ CUSTOMIZE END
 
         /** Must be called every frame so we can check the camera's position
             (passed in the constructor) and update our visible batches (and LODs)
diff --git a/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsJsonTerra.cpp b/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsJsonTerra.cpp
index 541807eb1..521622eaf 100644
--- a/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsJsonTerra.cpp
+++ b/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsJsonTerra.cpp
@@ -28,7 +28,7 @@ THE SOFTWARE.
 
 #include "OgreBuildSettings.h"
 
-#if !OGRE_NO_JSON && defined( IGN_TERRA_JSON_ENABLED )
+#if !OGRE_NO_JSON && defined( GZ_TERRA_JSON_ENABLED )
 
 #include "Terra/Hlms/OgreHlmsJsonTerra.h"
 #include "OgreHlmsManager.h"
diff --git a/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerra.cpp b/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerra.cpp
index 949c5c604..1b5ba8bd4 100644
--- a/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerra.cpp
+++ b/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerra.cpp
@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include "OgreHlmsListener.h"
 #include "OgreLwString.h"
 
-#if !OGRE_NO_JSON && defined( IGN_TERRA_JSON_ENABLED )
+#if !OGRE_NO_JSON && defined( GZ_TERRA_JSON_ENABLED )
     #include "Terra/Hlms/OgreHlmsJsonTerra.h"
 #endif
 
@@ -377,7 +377,7 @@ namespace Ogre
 //            }
         }
 
-        // IGN CUSTOMIZE BEGIN
+        // GZ CUSTOMIZE BEGIN
         for( size_t i = 0u; i < 4u; ++i )
         {
             const IdString c_ignWeightProperties[4] = {
@@ -390,7 +390,7 @@ namespace Ogre
                          fabsf( datablock->mIgnWeightsMinHeight[i] -
                                 datablock->mIgnWeightsMaxHeight[i] ) >= 1e-6f );
         }
-        // IGN CUSTOMIZE END
+        // GZ CUSTOMIZE END
 
 #ifdef OGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS
         if( mPlanarReflections && mPlanarReflections->hasPlanarReflections( renderable ) )
@@ -627,9 +627,9 @@ namespace Ogre
 //            mRenderSystem->_executeResourceTransition( &resourceTransition );
 //            mRenderSystem->_resourceTransitionDestroyed( &resourceTransition );
 
-            // IGN CUSTOMIZE BEGIN
+            // GZ CUSTOMIZE BEGIN
             // Barriers dealt with in Ogre2Scene::UpdateAllHeightmaps
-    #ifdef IGN_DISABLED
+    #ifdef GZ_DISABLED
             TextureGpu *terraShadowText = terraObj->_getShadowMapTex();
             const CompositorTextureVec &compositorTextures = queuedRenderable.movableObject->
                     _getManager()->getCompositorTextures();
@@ -645,7 +645,7 @@ namespace Ogre
                         " to the compositor pass so Ogre can place the proper Barriers" && false );
             }
     #endif
-            // IGN CUSTOMIZE END
+            // GZ CUSTOMIZE END
 #endif
 
             mLastMovableObject = queuedRenderable.movableObject;
@@ -750,7 +750,7 @@ namespace Ogre
         //Fill the data folder path
         outDataFolderPath = "Hlms/Terra/" + shaderSyntax;
     }
-#if !OGRE_NO_JSON && defined( IGN_TERRA_JSON_ENABLED )
+#if !OGRE_NO_JSON && defined( GZ_TERRA_JSON_ENABLED )
     //-----------------------------------------------------------------------------------
     void HlmsTerra::_loadJson( const rapidjson::Value &jsonValue, const HlmsJson::NamedBlocks &blocks,
                                HlmsDatablock *datablock, const String &resourceGroup,
diff --git a/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerraDatablock.cpp b/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerraDatablock.cpp
index 2de6429ed..19355c902 100644
--- a/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerraDatablock.cpp
+++ b/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerraDatablock.cpp
@@ -50,9 +50,9 @@ THE SOFTWARE.
 
 namespace Ogre
 {
-    // IGN CUSTOMIZE BEGIN
+    // GZ CUSTOMIZE BEGIN
     const size_t HlmsTerraDatablock::MaterialSizeInGpu          = 4 * 12 * 4;
-    // IGN CUSTOMIZE END
+    // GZ CUSTOMIZE END
     const size_t HlmsTerraDatablock::MaterialSizeInGpuAligned   = alignToNextMultiple(
                                                                     HlmsTerraDatablock::MaterialSizeInGpu,
                                                                     4 * 4 );
@@ -65,10 +65,10 @@ namespace Ogre
         HlmsTerraBaseTextureDatablock( name, creator, macroblock, blendblock, params ),
         mkDr( 0.318309886f ), mkDg( 0.318309886f ), mkDb( 0.318309886f ), //Max Diffuse = 1 / PI
         mShadowConstantBiasGpu( 0.0f ),
-        // IGN CUSTOMIZE BEGIN
+        // GZ CUSTOMIZE BEGIN
         mIgnWeightsMinHeight{ 0.0f, 0.0f, 0.0f, 0.0f },
         mIgnWeightsMaxHeight{ 0.0f, 0.0f, 0.0f, 0.0f },
-        // IGN CUSTOMIZE END
+        // GZ CUSTOMIZE END
         mBrdf( TerraBrdf::Default )
     {
         mShadowConstantBiasGpu = mShadowConstantBias = 0.0f;
@@ -163,7 +163,7 @@ namespace Ogre
         for( size_t i = 0u; i < numOffsetScale; ++i )
             detailsOffsetScale[i] = mDetailsOffsetScale[i];
 
-        // IGN CUSTOMIZE BEGIN
+        // GZ CUSTOMIZE BEGIN
         const size_t sizeOfIgnData = sizeof( mIgnWeightsMinHeight ) + sizeof( mIgnWeightsMinHeight );
 
         memcpy( dstPtr, &mkDr,
@@ -171,7 +171,7 @@ namespace Ogre
                     sizeOfIgnData );
         dstPtr += MaterialSizeInGpu - numOffsetScale * sizeof( float4 ) - sizeof( mTexIndices ) -
                   sizeOfIgnData;
-        // IGN CUSTOMIZE END
+        // GZ CUSTOMIZE END
 
         memcpy( dstPtr, &detailsOffsetScale, numOffsetScale * sizeof( float4 ) );
         dstPtr += numOffsetScale * sizeof( float4 );
@@ -179,10 +179,10 @@ namespace Ogre
         memcpy( dstPtr, texIndices, sizeof( texIndices ) );
         dstPtr += sizeof( texIndices );
 
-        // IGN CUSTOMIZE BEGIN
+        // GZ CUSTOMIZE BEGIN
         memcpy( dstPtr, mIgnWeightsMinHeight, sizeOfIgnData );
         dstPtr += sizeOfIgnData;
-        // IGN CUSTOMIZE END
+        // GZ CUSTOMIZE END
     }
     //-----------------------------------------------------------------------------------
     void HlmsTerraDatablock::setDiffuse( const Vector3 &diffuseColour )
@@ -278,7 +278,7 @@ namespace Ogre
         return mBrdf;
     }
     //-----------------------------------------------------------------------------------
-    // IGN CUSTOMIZE BEGIN
+    // GZ CUSTOMIZE BEGIN
     void HlmsTerraDatablock::setIgnWeightsHeights( const Vector4 &ignWeightsMinHeight,
                                                    const Vector4 &ignWeightsMaxHeight )
     {
@@ -327,7 +327,7 @@ namespace Ogre
         }
         setTexture( texUnit, texture, refParams );
     }
-    // IGN CUSTOMIZE END
+    // GZ CUSTOMIZE END
     //-----------------------------------------------------------------------------------
     bool HlmsTerraDatablock::suggestUsingSRGB( TerraTextureTypes type ) const
     {
diff --git a/ogre2/src/terrain/Terra/src/Hlms/PbsListener/OgreHlmsPbsTerraShadows.cpp b/ogre2/src/terrain/Terra/src/Hlms/PbsListener/OgreHlmsPbsTerraShadows.cpp
index f2a13c0de..7410dfef4 100644
--- a/ogre2/src/terrain/Terra/src/Hlms/PbsListener/OgreHlmsPbsTerraShadows.cpp
+++ b/ogre2/src/terrain/Terra/src/Hlms/PbsListener/OgreHlmsPbsTerraShadows.cpp
@@ -163,9 +163,9 @@ namespace Ogre
                                                                  mTerraSamplerblock );
 
 #if OGRE_DEBUG_MODE
-            // IGN CUSTOMIZE BEGIN
+            // GZ CUSTOMIZE BEGIN
             // Barriers dealt with in Ogre2Scene::UpdateAllHeightmaps
-    #ifdef IGN_DISABLED
+    #ifdef GZ_DISABLED
             const CompositorTextureVec &compositorTextures = mSceneManager->getCompositorTextures();
             CompositorTextureVec::const_iterator itor = compositorTextures.begin();
             CompositorTextureVec::const_iterator end  = compositorTextures.end();
@@ -179,7 +179,7 @@ namespace Ogre
                         " to the compositor pass so Ogre can place the proper Barriers" && false );
             }
     #endif
-            // IGN CUSTOMIZE END
+            // GZ CUSTOMIZE END
 #endif
         }
     }
diff --git a/ogre2/src/terrain/Terra/src/Terra.cpp b/ogre2/src/terrain/Terra/src/Terra.cpp
index a97e0a669..09242221a 100644
--- a/ogre2/src/terrain/Terra/src/Terra.cpp
+++ b/ogre2/src/terrain/Terra/src/Terra.cpp
@@ -94,13 +94,13 @@ namespace Ogre
         m_camera( camera ),
         mHlmsTerraIndex( std::numeric_limits<uint32>::max() )
     {
-      // IGN CUSTOMIZE BEGIN
+      // GZ CUSTOMIZE BEGIN
       for(int i = 0; i < 2; ++i)
       {
         mSolidColor[i] = Vector4::ZERO;
         mSolidColorSet[i] = false;
       }
-      // IGN CUSTOMIZE END
+      // GZ CUSTOMIZE END
     }
     //-----------------------------------------------------------------------------------
     Terra::~Terra()
@@ -530,7 +530,7 @@ namespace Ogre
         m_collectedCells[0].clear();
     }
     //-----------------------------------------------------------------------------------
-    // IGN CUSTOMIZE BEGIN
+    // GZ CUSTOMIZE BEGIN
     void Terra::SetSolidColor(size_t _idx, const Vector4 solidColor)
     {
       assert(_idx > 0u && _idx < 3u);
@@ -565,7 +565,7 @@ namespace Ogre
       mSolidColorSet[0] = false;
       mSolidColorSet[1] = false;
     }
-    // IGN CUSTOMIZE END
+    // GZ CUSTOMIZE END
     //-----------------------------------------------------------------------------------
     void Terra::update( const Vector3 &lightDir, float lightEpsilon )
     {
diff --git a/optix/include/CMakeLists.txt b/optix/include/CMakeLists.txt
index 4b2bdd7bb..992a1312e 100644
--- a/optix/include/CMakeLists.txt
+++ b/optix/include/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_subdirectory(gz)
-install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
+install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL})
diff --git a/optix/include/gz/rendering/optix/OptixConversions.hh b/optix/include/gz/rendering/optix/OptixConversions.hh
index 0d7122292..f2e777708 100644
--- a/optix/include/gz/rendering/optix/OptixConversions.hh
+++ b/optix/include/gz/rendering/optix/OptixConversions.hh
@@ -44,7 +44,7 @@ namespace gz
       /// \return Optix color value
       public: static float4 ConvertColor(const math::Color &_color);
 
-      /// \brief Return the equivalent ign-math color
+      /// \brief Return the equivalent gz-math color
       /// \param[in] _color Optix color to convert
       /// \return Gazebo color value
       public: static math::Color ConvertColor(const float4 &_color);
@@ -54,7 +54,7 @@ namespace gz
       /// \return Optix vector
       public: static float3 ConvertVector(const math::Vector3d &_vector);
 
-      /// \brief return ign-math Vector from optix Vector3
+      /// \brief return gz-math Vector from optix Vector3
       /// \param[in] _vector Optix vector
       /// \return Gazebo vector
       public: static math::Vector3d ConvertVector(const float3 &_vector);
diff --git a/optix/include/gz/rendering/optix/optix.hh.in b/optix/include/gz/rendering/optix/optix.hh.in
index c4092f0cd..4ffcf3d38 100644
--- a/optix/include/gz/rendering/optix/optix.hh.in
+++ b/optix/include/gz/rendering/optix/optix.hh.in
@@ -1,3 +1,3 @@
 // Automatically generated
-#include <gz/${IGN_PROJECT_NAME}/config.hh>
+#include <gz/${GZ_PROJECT_NAME}/config.hh>
 ${ign_headers}
diff --git a/src/RenderEngineManager.cc b/src/RenderEngineManager.cc
index c38916db7..a09672b94 100644
--- a/src/RenderEngineManager.cc
+++ b/src/RenderEngineManager.cc
@@ -61,7 +61,7 @@ class gz::rendering::RenderEngineManagerPrivate
   /// \return True if the engine is unloaded
   public: bool UnloadEngine(EngineIter _iter);
 
-  /// \brief Register default engines supplied by ign-rendering
+  /// \brief Register default engines supplied by gz-rendering
   public: void RegisterDefaultEngines();
 
   /// \brief Unregister an engine using an EngineMap iterator.
diff --git a/test/integration/all_symbols_have_version.bash.in b/test/integration/all_symbols_have_version.bash.in
index f95072554..0809555fb 100644
--- a/test/integration/all_symbols_have_version.bash.in
+++ b/test/integration/all_symbols_have_version.bash.in
@@ -2,10 +2,10 @@
 
 LIBPATH=$1
 VERSIONED_NS=v@PROJECT_VERSION_MAJOR@
-IGN_PROJECT=@IGN_DESIGNATION@
+GZ_PROJECT=@GZ_DESIGNATION@
 
 # Sanity check - there should be at least one symbol
-NUM_SYMBOLS=$(nm $LIBPATH | grep -e "gz.*$IGN_PROJECT" | wc -l)
+NUM_SYMBOLS=$(nm $LIBPATH | grep -e "gz.*$GZ_PROJECT" | wc -l)
 
 if [ $NUM_SYMBOLS -eq 0 ]
 then
@@ -14,7 +14,7 @@ then
 fi
 
 # There must be no unversioned symbols
-UNVERSIONED_SYMBOLS=$(nm $LIBPATH | grep -e "gz.*$IGN_PROJECT" | grep -e "$VERSIONED_NS" -v)
+UNVERSIONED_SYMBOLS=$(nm $LIBPATH | grep -e "gz.*$GZ_PROJECT" | grep -e "$VERSIONED_NS" -v)
 UNVERSIONED_SYMBOL_CHARS=$(printf "$UNVERSIONED_SYMBOLS" | wc -m)
 
 if [ $UNVERSIONED_SYMBOL_CHARS -ne 0 ]
diff --git a/test/integration/depth_camera.cc b/test/integration/depth_camera.cc
index e92523b20..f5c36e008 100644
--- a/test/integration/depth_camera.cc
+++ b/test/integration/depth_camera.cc
@@ -86,7 +86,7 @@ void DepthCameraTest::DepthCameraBoxes(
     return;
   }
 
-  // Setup ign-rendering with an empty scene
+  // Setup gz-rendering with an empty scene
   auto *engine = gz::rendering::engine(_renderEngine);
   if (!engine)
   {
@@ -501,7 +501,7 @@ void DepthCameraTest::DepthCameraParticles(
     return;
   }
 
-  // Setup ign-rendering with an empty scene
+  // Setup gz-rendering with an empty scene
   auto *engine = gz::rendering::engine(_renderEngine);
   if (!engine)
   {
diff --git a/test/integration/render_pass.cc b/test/integration/render_pass.cc
index 639f7a6a0..8f9183db2 100644
--- a/test/integration/render_pass.cc
+++ b/test/integration/render_pass.cc
@@ -197,7 +197,7 @@ void RenderPassTest::DepthGaussianNoise(const std::string &_renderEngine)
     return;
   }
 
-  // Setup ign-rendering with an empty scene
+  // Setup gz-rendering with an empty scene
   auto *engine = gz::rendering::engine(_renderEngine);
   if (!engine)
   {
diff --git a/test/integration/segmentation_camera.cc b/test/integration/segmentation_camera.cc
index 16c3aff6e..3f2d6bd32 100644
--- a/test/integration/segmentation_camera.cc
+++ b/test/integration/segmentation_camera.cc
@@ -125,7 +125,7 @@ void SegmentationCameraTest::SegmentationCameraBoxes(
     return;
   }
 
-  // Setup ign-rendering with an empty scene
+  // Setup gz-rendering with an empty scene
   auto *engine = gz::rendering::engine(_renderEngine);
   if (!engine)
   {
diff --git a/test/integration/thermal_camera.cc b/test/integration/thermal_camera.cc
index 72577f29b..9d3986eec 100644
--- a/test/integration/thermal_camera.cc
+++ b/test/integration/thermal_camera.cc
@@ -107,7 +107,7 @@ void ThermalCameraTest::ThermalCameraBoxes(
     return;
   }
 
-  // Setup ign-rendering with an empty scene
+  // Setup gz-rendering with an empty scene
   auto *engine = gz::rendering::engine(_renderEngine);
   if (!engine)
   {
@@ -288,7 +288,7 @@ void ThermalCameraTest::ThermalCameraBoxes8Bit(
     return;
   }
 
-  // Setup ign-rendering with an empty scene
+  // Setup gz-rendering with an empty scene
   auto *engine = gz::rendering::engine(_renderEngine);
   if (!engine)
   {
@@ -476,7 +476,7 @@ void ThermalCameraTest::ThermalCameraParticles(
     return;
   }
 
-  // Setup ign-rendering with an empty scene
+  // Setup gz-rendering with an empty scene
   auto *engine = gz::rendering::engine(_renderEngine);
   if (!engine)
   {
diff --git a/test/integration/wide_angle_camera.cc b/test/integration/wide_angle_camera.cc
index 759adde32..b5a35559e 100644
--- a/test/integration/wide_angle_camera.cc
+++ b/test/integration/wide_angle_camera.cc
@@ -241,7 +241,7 @@ void WideAngleCameraTest::Projection(const std::string &_renderEngine)
     return;
   }
 
-  // Setup ign-rendering with an empty scene
+  // Setup gz-rendering with an empty scene
   auto *engine = gz::rendering::engine(_renderEngine);
   if (!engine)
   {
diff --git a/tutorials.md.in b/tutorials.md.in
index 450265038..1a3229941 100644
--- a/tutorials.md.in
+++ b/tutorials.md.in
@@ -1,8 +1,8 @@
 \page tutorials Tutorials
 
-Welcome to the Gazebo @IGN_DESIGNATION_CAP@ tutorials. These tutorials
+Welcome to the Gazebo @GZ_DESIGNATION_CAP@ tutorials. These tutorials
 will guide you through the process of understanding the capabilities of the
-Gazebo @IGN_DESIGNATION_CAP@ library and how to use the library effectively.
+Gazebo @GZ_DESIGNATION_CAP@ library and how to use the library effectively.
 
 **The tutorials**
 
diff --git a/tutorials/02_install.md b/tutorials/02_install.md
index b7b55d71c..411ab425f 100644
--- a/tutorials/02_install.md
+++ b/tutorials/02_install.md
@@ -31,7 +31,7 @@ wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -
 Install:
 ```
 sudo apt-get update
-sudo apt-get install libignition-rendering<#>-dev
+sudo apt-get install libgz-rendering<#>-dev
 ```
 
 Be sure to replace `<#>` with a number value, such as `1` or `2`, depending on which version you need.
@@ -57,10 +57,10 @@ sudo apt install -y \
     freeglut3-dev \
     libxmu-dev \
     libxi-dev \
-    libignition-cmake3-dev \
-    libignition-math7-dev \
-    libignition-common5-dev \
-    libignition-plugin2-dev
+    libgz-cmake3-dev \
+    libgz-math7-dev \
+    libgz-common5-dev \
+    libgz-plugin2-dev
 ```
 
 ### Supported Rendering Engines
@@ -98,14 +98,14 @@ CUDA: http://docs.nvidia.com/cuda
 OptiX: https://developer.nvidia.com/optix
 
 Update `LD_LIBRARY_PATH` and add an `OPTIX_INSTALL_DIR` environment variables
-so that ign-rendering can find Optix, e.g. if you installed version 4.0.2 in HOME/optix:
+so that gz-rendering can find Optix, e.g. if you installed version 4.0.2 in HOME/optix:
 ```
 export LD_LIBRARY_PATH=${HOME}/optix/NVIDIA-OptiX-SDK-4.0.2-linux64/lib64:${LD_LIBRARY_PATH}
 export OPTIX_INSTALL_DIR=${HOME}/optix/NVIDIA-OptiX-SDK-4.0.2-linux64
 ```
 
 Note: If you encounter errors about different exception specifiers in optix math
-when building Ign Rendering OptiX plugin, edit
+when building Gazebo Rendering OptiX plugin, edit
 `[optix_install_dir]/include/optixu/optixu_math_namespace.h` and comment
 out the section that defines `fminf`, fmaxf, and `copysignf` (for optix
 sdk 4.0.2, comment out lines 167-206).
@@ -151,7 +151,7 @@ conda activate gz-ws
 
 ## Binary Installation
 
-`libignition-rendering<#>` Conda feedstock is not yet available, pending [conda-forge/staged-recipes#13551](https://github.com/conda-forge/staged-recipes/issues/13551).
+`libgz-rendering<#>` Conda feedstock is not yet available, pending [conda-forge/staged-recipes#13551](https://github.com/conda-forge/staged-recipes/issues/13551).
 
 ## Source Installation
 
@@ -166,12 +166,12 @@ This assumes you have created and activated a Conda environment while installing
 
   You can view available versions and their dependencies:
   ```
-  conda search libignition-rendering* --channel conda-forge --info
+  conda search libgz-rendering* --channel conda-forge --info
   ```
 
   Install dependencies, replacing `<#>` with the desired versions:
   ```
-  conda install libignition-cmake<#> libignition-common<#> libignition-math<#> libignition-plugin<#> --channel conda-forge
+  conda install libgz-cmake<#> libgz-common<#> libgz-math<#> libgz-plugin<#> --channel conda-forge
   ```
 
 3. Navigate to where you would like to build the library, and clone the repository.
@@ -206,7 +206,7 @@ On macOS, add OSRF packages:
 
 Install Gazebo Rendering:
   ```
-  brew install ignition-rendering<#>
+  brew install gz-rendering<#>
   ```
 
 Be sure to replace `<#>` with a number value, such as 5 or 6, depending on
@@ -223,7 +223,7 @@ which version you need.
 
 2. Install dependencies
   ```
-  brew install --only-dependencies ignition-rendering<#>
+  brew install --only-dependencies gz-rendering<#>
   ```
   Be sure to replace `<#>` with a number value, such as 5 or 6, depending on
   which version you need.
diff --git a/tutorials/03_rendering_plugins.md b/tutorials/03_rendering_plugins.md
index 7b4098396..a3b34190e 100644
--- a/tutorials/03_rendering_plugins.md
+++ b/tutorials/03_rendering_plugins.md
@@ -14,11 +14,11 @@ It is also possible to integrate your own selected rendering engine by writing a
 A mocked example of a custom rendering engine plugin can be found [here](https://github.com/gazebosim/gz-rendering/tree/main/examples/hello_world_plugin).  In order
 to make your own custom rendering engine, this example is a good starting point.  There are a few key things which will need to be done in order for a custom rendering engine to function:
 
- * A singleton Render Engine class which implements the pure virtual functions in [`gz::rendering::BaseRenderEngine`](https://github.com/gazebosim/gz-rendering/blob/main/include/ignition/rendering/base/BaseRenderEngine.hh).
- * A plugin class which implements the pure virtual functions in [`gz::rendering::RenderEnginePlugin`](https://github.com/gazebosim/gz-rendering/blob/main/include/ignition/rendering/RenderEnginePlugin.hh)
+ * A singleton Render Engine class which implements the pure virtual functions in [`gz::rendering::BaseRenderEngine`](https://github.com/gazebosim/gz-rendering/blob/main/include/gz/rendering/base/BaseRenderEngine.hh).
+ * A plugin class which implements the pure virtual functions in [`gz::rendering::RenderEnginePlugin`](https://github.com/gazebosim/gz-rendering/blob/main/include/gz/rendering/RenderEnginePlugin.hh)
  * Registering the plugin, this line can be seen at the bottom of the [`HelloWorldPlugin`](https://github.com/gazebosim/gz-rendering/tree/main/examples/hello_world_plugin/HelloWorldPlugin.cc) example
 
-Finally, for your custom rendering engine to actually have any functionality and at minimum, display something in a window, you will need to implement your own `Scene` and `Camera` classes, which inherit from and implement the pure virtual functions of [`gz::rendering::Scene`](https://github.com/gazebosim/gz-rendering/blob/main/include/ignition/rendering/Scene.hh) and  [`gz::rendering::Camera`](https://github.com/gazebosim/gz-rendering/blob/main/include/ignition/rendering/Camera.hh), respectively.  The mocked example simply returns `nullptr` for its `CreateSceneImpl(...)` function, so it may be useful to look at the current `Scene` implementations for the other rendering engines within `gz::rendering` such as [`OGRE`](https://github.com/gazebosim/gz-rendering/blob/main/ogre/src/OgreScene.cc) or [`OGRE2`](https://github.com/gazebosim/gz-rendering/blob/main/ogre2/src/Ogre2Scene.cc).  Likewise, it may be helpful to look at the `Camera` implementations from [`OGRE`](https://github.com/gazebosim/gz-rendering/blob/main/ogre/src/OgreCamera.cc) and [`OGRE2`](https://github.com/gazebosim/gz-rendering/blob/main/ogre2/src/Ogre2Camera.cc)
+Finally, for your custom rendering engine to actually have any functionality and at minimum, display something in a window, you will need to implement your own `Scene` and `Camera` classes, which inherit from and implement the pure virtual functions of [`gz::rendering::Scene`](https://github.com/gazebosim/gz-rendering/blob/main/include/gz/rendering/Scene.hh) and  [`gz::rendering::Camera`](https://github.com/gazebosim/gz-rendering/blob/main/include/gz/rendering/Camera.hh), respectively.  The mocked example simply returns `nullptr` for its `CreateSceneImpl(...)` function, so it may be useful to look at the current `Scene` implementations for the other rendering engines within `gz::rendering` such as [`OGRE`](https://github.com/gazebosim/gz-rendering/blob/main/ogre/src/OgreScene.cc) or [`OGRE2`](https://github.com/gazebosim/gz-rendering/blob/main/ogre2/src/Ogre2Scene.cc).  Likewise, it may be helpful to look at the `Camera` implementations from [`OGRE`](https://github.com/gazebosim/gz-rendering/blob/main/ogre/src/OgreCamera.cc) and [`OGRE2`](https://github.com/gazebosim/gz-rendering/blob/main/ogre2/src/Ogre2Camera.cc)
 
 #### Building and Running Your Rendering Engine Plugin with Gazebo
 
diff --git a/tutorials/10_actor_animation_tutorial.md b/tutorials/10_actor_animation_tutorial.md
index a8728449d..43ab8a992 100644
--- a/tutorials/10_actor_animation_tutorial.md
+++ b/tutorials/10_actor_animation_tutorial.md
@@ -45,7 +45,7 @@ Create a `Visual` pointer with the scene manager and set the position and rotati
 
 \snippet examples/actor_animation/Main.cc create a visual for the actor
 
-Create the mesh in ign-rendering - this loads the animations into the render engine
+Create the mesh in gz-rendering - this loads the animations into the render engine
 
 \snippet examples/actor_animation/Main.cc create mesh
 
diff --git a/tutorials/15_custom_shaders_tutorial.md b/tutorials/15_custom_shaders_tutorial.md
index 817da8150..6d7e98c95 100644
--- a/tutorials/15_custom_shaders_tutorial.md
+++ b/tutorials/15_custom_shaders_tutorial.md
@@ -1,6 +1,6 @@
 \page custom_shaders Custom shaders
 
-This example shows how use custom shaders in ign-rendering to change the appearance of objects in the scene. It demonstrates two uses of shaders: The first is setting shaders for a camera and the other is setting shaders for an object in the scene.
+This example shows how use custom shaders in gz-rendering to change the appearance of objects in the scene. It demonstrates two uses of shaders: The first is setting shaders for a camera and the other is setting shaders for an object in the scene.
 
 ## Compile and run the example
 
diff --git a/tutorials/22_environment_map.md b/tutorials/22_environment_map.md
index 0ed4fe348..7141b10aa 100644
--- a/tutorials/22_environment_map.md
+++ b/tutorials/22_environment_map.md
@@ -4,7 +4,7 @@ This tutorial shows how to add an environment map to a mesh.
 
 An environment map, also known as a reflection map, is an efficient way to
 create reflective surfaces using a precomputed texture. The environment
-map texture used by ignition rendering needs to be the form of a cube map.
+map texture used by gz rendering needs to be the form of a cube map.
 
 ## Example mesh with Environment map
 
@@ -57,14 +57,14 @@ to see that each face of the cube map is in its own individual layer.
 
 To create a new cube map, you will need to have a similar setup to the one
 shown above. One way to do this is to modify an existing cube map in
-ignition rendering and replace the image in each layer with your new cube map
+gz rendering and replace the image in each layer with your new cube map
 images (there should be 6 of them - one for each face). You can resize the
 canvas to match the texture size of you new cube map. Pay attention
 to the orientation of the image in each layer as it could be different from
-the orientation of other readily available cube maps online since ignition
+the orientation of other readily available cube maps online since gz
 rendering uses Z up instead of Y up.
 
 Once you are done, export the new cube map by going to `File` > `Export As`,
 give it a new name, and click `Export`. In the `Save as DDS` dialog, make sure
 to select `Save`: `As cube map` and `Mipmaps`: `No mipmaps`. Your newly
-exported cube map should be ready to use in ignition rendering.
+exported cube map should be ready to use in gz rendering.