From a781e09ddbb5cd499f48dd7d9bd17055a17972e6 Mon Sep 17 00:00:00 2001
From: methylDragon <methylDragon@gmail.com>
Date: Tue, 28 Jun 2022 10:46:00 -0700
Subject: [PATCH] ign -> gz Partial Docs Migration and Project Name Followups :
 gz-rendering (#657)

---
 CMakeLists.txt                                |  2 +-
 Changelog.md                                  | 20 +++++++++----------
 Migration.md                                  | 10 ++++++++++
 README.md                                     |  2 +-
 api.md.in                                     |  4 ++--
 examples/hello_world_plugin/README.md         |  6 +++---
 examples/simple_demo_qml/CMakeLists.txt       |  2 +-
 .../gz/rendering/ogre/OgreConversions.hh      |  6 +++---
 ogre/src/OgreDistortionPass.cc                |  2 +-
 .../gz/rendering/ogre2/Ogre2Conversions.hh    |  6 +++---
 ogre2/src/Ogre2Material.cc                    |  2 +-
 src/RenderEngineManager.cc                    |  2 +-
 src/Utils_TEST.cc                             |  2 +-
 test/integration/depth_camera.cc              |  2 +-
 test/integration/render_pass.cc               |  2 +-
 tutorials.md.in                               |  4 ++--
 tutorials/01_intro.md                         |  2 +-
 tutorials/02_install.md                       | 18 ++++++++---------
 tutorials/03_rendering_plugins.md             |  2 +-
 tutorials/04_lightmap.md                      | 10 +++++-----
 tutorials/10_actor_animation_tutorial.md      |  2 +-
 tutorials/11_gazebo_scene_viewer_tutorial.md  |  2 +-
 tutorials/12_mesh_viewer_tutorial.md          |  2 +-
 tutorials/13_custom_scene_viewer.md           |  2 +-
 tutorials/14_camera_tracking_tutorial.md      |  2 +-
 tutorials/15_custom_shaders_tutorial.md       |  2 +-
 tutorials/17_render_pass_tutorial.md          |  4 ++--
 tutorials/18_simple_demo_tutorial.md          |  4 ++--
 tutorials/19_text_geom_tutorial.md            |  4 ++--
 tutorials/20_particles_tutorial.md            |  4 ++--
 tutorials/21_heightmap.md                     |  4 ++--
 tutorials/21_render_order.md                  |  2 +-
 tutorials/22_environment_map.md               |  2 +-
 tutorials/23_depth_camera_tutorial.md         |  2 +-
 34 files changed, 77 insertions(+), 67 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41174aec0..736c60f96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,7 +125,7 @@ endif()
 
 # Plugin install dirs
 set(GZ_RENDERING_ENGINE_INSTALL_DIR
-  ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins
+  ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/gz-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins
 )
 
 #--------------------------------------
diff --git a/Changelog.md b/Changelog.md
index a67a3c965..88e8971c8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -194,7 +194,7 @@
 1. Fix particle effect randomness
     * [Pull request #388](https://github.com/gazebosim/gz-rendering/pull/388)
 
-1. Update test config to run ogre 1.x tests in ign-rendering6 on macOS
+1. Update test config to run ogre 1.x tests in gz-rendering6 on macOS
     * [Pull request #407](https://github.com/gazebosim/gz-rendering/pull/407)
     * [Pull request #409](https://github.com/gazebosim/gz-rendering/pull/409)
     * [Pull request #409](https://github.com/gazebosim/gz-rendering/pull/409)
@@ -334,7 +334,7 @@
     * [Pull request #398](https://github.com/gazebosim/gz-rendering/pull/398)
     * [Pull request #389](https://github.com/gazebosim/gz-rendering/pull/389)
 
-1. Set OGRE minimal version to 1.8. Warn on versions not supported (ign-rendering3)
+1. Set OGRE minimal version to 1.8. Warn on versions not supported (gz-rendering3)
     * [Pull request #376](https://github.com/gazebosim/gz-rendering/pull/376)
 
 1. 👩‍🌾 Remove bitbucket-pipelines.yml
@@ -343,7 +343,7 @@
 1. [macOS] support OpenGL < 4.2 in PBS shader
     * [Pull request #377](https://github.com/gazebosim/gz-rendering/pull/377)
 
-1. Moved ScreenToPlane and ScreenToScene from ign-gui to ign-rendering
+1. Moved ScreenToPlane and ScreenToScene from gz-gui to gz-rendering
     * [Pull request #363](https://github.com/gazebosim/gz-rendering/pull/363)
     * [Pull request #368](https://github.com/gazebosim/gz-rendering/pull/368)
 
@@ -388,7 +388,7 @@
 1. Test re-enabling depth camera integration test on mac
     * [Pull request #335](https://github.com/gazebosim/gz-rendering/pull/335)
 
-1. Include MoveTo Helper class to ign-rendering
+1. Include MoveTo Helper class to gz-rendering
     * [Pull request #311](https://github.com/gazebosim/gz-rendering/pull/311)
 
 1. Remove `tools/code_check` and update codecov
@@ -455,7 +455,7 @@
 1. ogre2: explicitly request OpenGL 3.3 core profile context.
     * [Pull request #244](https://github.com/gazebosim/gz-rendering/pull/244)
 
-1. Bump in edifice: ign-common4
+1. Bump in edifice: gz-common4
     * [Pull request #209](https://github.com/gazebosim/gz-rendering/pull/209)
 
 1. Support setting horizontal and vertical resolution for GpuRays
@@ -496,7 +496,7 @@
     * [Pull request #378](https://github.com/gazebosim/gz-rendering/pull/378)
     * [Pull request #383](https://github.com/gazebosim/gz-rendering/pull/383)
 
-1. All changes merged forward from ign-rendering3
+1. All changes merged forward from gz-rendering3
     * [Pull request #382](https://github.com/gazebosim/gz-rendering/pull/382)
     * [Pull request #398](https://github.com/gazebosim/gz-rendering/pull/398)
 
@@ -521,7 +521,7 @@
 1. Fix floating point precision bug handling alpha channel (#332)
     * [Pull request #333](https://github.com/gazebosim/gz-rendering/pull/333)
 
-1. Include MoveTo Helper class to ign-rendering
+1. Include MoveTo Helper class to gz-rendering
     * [Pull request #311](https://github.com/gazebosim/gz-rendering/pull/311)
 
 1. Remove `tools/code_check` and update codecov
@@ -741,7 +741,7 @@
 1. Ogre: Do not assume that ogre plugins have lib prefix on macOS
     * [Pull request 454](https://github.com/gazebosim/gz-rendering/pull/454)
 
-1. Moved ScreenToPlane and ScreenToScene from ign-gui to ign-rendering
+1. Moved ScreenToPlane and ScreenToScene from gz-gui to gz-rendering
     * [Pull request 363](https://github.com/gazebosim/gz-rendering/pull/363)
     * [Pull request 368](https://github.com/gazebosim/gz-rendering/pull/368)
 
@@ -760,7 +760,7 @@
 
 ### Gazebo Rendering 3.5.0 (2021-05-25)
 
-1. Include MoveTo Helper class to ign-rendering
+1. Include MoveTo Helper class to gz-rendering
     * [Pull request 311](https://github.com/gazebosim/gz-rendering/pull/311)
 
 1. Remove tools/code_check and update codecov
@@ -835,7 +835,7 @@
 
 ### Gazebo Rendering 3.1.0 (2020-03-05)
 
-1. Use default material properties from ign-common PBR material when loading a mesh
+1. Use default material properties from gz-common PBR material when loading a mesh
     * [BitBucket pull request 242](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-rendering/pull-requests/242)
 
 1. Fix build for ogre version >= 1.12.0
diff --git a/Migration.md b/Migration.md
index 1c828b782..516e303ff 100644
--- a/Migration.md
+++ b/Migration.md
@@ -27,6 +27,16 @@ release will remove the deprecated code.
     3. `IGN_VISIBILITY_SELECTION`
     4. `IGN_VISIBILITY_GUI`
     5. `IGN_VISIBILITY_SELECTABLE`
+
+### Breaking Changes
+
+1. The project name has been changed to use the `gz-` prefix, you **must** use the `gz` prefix!
+  * This also means that any generated code that use the project name (e.g. CMake variables, in-source macros) would have to be migrated.
+  * Some non-exhaustive examples of this include:
+    * `GZ_<PROJECT>_<VISIBLE/HIDDEN>`
+    * CMake `-config` files
+    * Paths that depend on the project name
+
 ## Gazebo Rendering 6.2.1 to 6.X
 
 ### Modifications
diff --git a/README.md b/README.md
index 60c6485ed..73004a750 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Rendering engine plugin implementation code is stored in their own folders
 
 * `ogre` : OGRE 1.x rendering engine plugin
 
-* `ogre2` : OGRE 2.x rendering engine plugin (available in versions >= ign-rendering1)
+* `ogre2` : OGRE 2.x rendering engine plugin (available in versions >= gz-rendering1)
 
 * `optix` : OptiX rendering engine plugin
 
diff --git a/api.md.in b/api.md.in
index 1987b3bec..076d03826 100644
--- a/api.md.in
+++ b/api.md.in
@@ -1,6 +1,6 @@
-## Ignition @IGN_DESIGNATION_CAP@
+## Gazebo @IGN_DESIGNATION_CAP@
 
-Ignition @IGN_DESIGNATION_CAP@ is a component in Gazebo, a set of libraries
+Gazebo @IGN_DESIGNATION_CAP@ is a component in Gazebo, a set of libraries
 designed to rapidly develop robot and simulation applications.
 
 ## License
diff --git a/examples/hello_world_plugin/README.md b/examples/hello_world_plugin/README.md
index ffc253342..adc9fee32 100644
--- a/examples/hello_world_plugin/README.md
+++ b/examples/hello_world_plugin/README.md
@@ -5,7 +5,7 @@ Gazebo Rendering and how to load it with Gazebo.
 
 ## Build
 
-From the root of the `ign-rendering` repository, do the following to build the example:
+From the root of the `gz-rendering` repository, do the following to build the example:
 
 ~~~
 cd examples/hello_world_plugin
@@ -32,11 +32,11 @@ export GZ_SIM_RENDER_ENGINE_PATH=$PWD
 to set the environment variable accordingly.
 
 
-Now you can run `ign gazebo` with the name of the resultant library file (without the `lib` prefix
+Now you can run `gz sim` with the name of the resultant library file (without the `lib` prefix
 or the file extension, i.e., libHelloWorldPlugin.so -> HelloWorldPlugin):
 
 ~~~
-ign gazebo --render-engine HelloWorldPlugin
+gz sim --render-engine HelloWorldPlugin
 ~~~
 
 You should see a blank screen within the Gazebo GUI, as this mocked plugin provides no implementation
diff --git a/examples/simple_demo_qml/CMakeLists.txt b/examples/simple_demo_qml/CMakeLists.txt
index a59a11f25..83edf990e 100644
--- a/examples/simple_demo_qml/CMakeLists.txt
+++ b/examples/simple_demo_qml/CMakeLists.txt
@@ -13,7 +13,7 @@ find_package(gz-cmake3 REQUIRED)
 set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
 
 #------------------------------------------------------------------------
-# Find ign-rendering
+# Find gz-rendering
 find_package(gz-rendering7)
 
 #======================================
diff --git a/ogre/include/gz/rendering/ogre/OgreConversions.hh b/ogre/include/gz/rendering/ogre/OgreConversions.hh
index 0baebc10e..d4402da60 100644
--- a/ogre/include/gz/rendering/ogre/OgreConversions.hh
+++ b/ogre/include/gz/rendering/ogre/OgreConversions.hh
@@ -62,7 +62,7 @@ namespace gz
       /// \return ign-math vector
       public: static math::Vector3d Convert(const Ogre::Vector3 &_vector);
 
-      /// \brief Ign-math quaternion to Ogre quaternion
+      /// \brief gz-math quaternion to Ogre quaternion
       /// \param[in] _quat ign-math quaternion
       /// \return Ogre quaternion
       public: static Ogre::Quaternion Convert(const math::Quaterniond &_quat);
@@ -72,7 +72,7 @@ namespace gz
       /// return ign-math quaternion
       public: static math::Quaterniond Convert(const Ogre::Quaternion &_quat);
 
-      /// \brief Ign-math angle to Ogre angle
+      /// \brief gz-math angle to Ogre angle
       /// \param[in] _angle ign-math angle
       /// \return Ogre angle
       public: static Ogre::Radian Convert(const math::Angle &_angle);
@@ -92,7 +92,7 @@ namespace gz
       /// \return Ogre Matrix4
       public: static Ogre::Matrix4 Convert(const math::Matrix4d &_m);
 
-      /// \brief Ign-rendering PixelFormat to Ogre PixelFormat
+      /// \brief gz-rendering PixelFormat to Ogre PixelFormat
       /// \param[in] _format Ign-rendering PixelFormat
       /// return Ogre PixelFormat
       public: static Ogre::PixelFormat Convert(PixelFormat _format);
diff --git a/ogre/src/OgreDistortionPass.cc b/ogre/src/OgreDistortionPass.cc
index 637798237..7c97c471d 100644
--- a/ogre/src/OgreDistortionPass.cc
+++ b/ogre/src/OgreDistortionPass.cc
@@ -55,7 +55,7 @@ namespace gz
       public: unsigned int distortionTexHeight = 0u;
 
       /// \brief Distortion compositor listener
-      /// uses <gz/utils/ImplPtr.hh> from ign-rendering7
+      /// uses <gz/utils/ImplPtr.hh> from gz-rendering7
       GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
       public: std::shared_ptr<DistortionCompositorListener>
           distortionCompositorListener;
diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh
index fcbe1b718..a68c8823d 100644
--- a/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh
+++ b/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh
@@ -74,7 +74,7 @@ namespace gz
       /// \return ign-math vector
       public: static math::Vector3d Convert(const Ogre::Vector3 &_vector);
 
-      /// \brief Ign-math quaternion to Ogre quaternion
+      /// \brief gz-math quaternion to Ogre quaternion
       /// \param[in] _quat ign-math quaternion
       /// \return Ogre quaternion
       public: static Ogre::Quaternion Convert(const math::Quaterniond &_quat);
@@ -84,7 +84,7 @@ namespace gz
       /// return ign-math quaternion
       public: static math::Quaterniond Convert(const Ogre::Quaternion &_quat);
 
-      /// \brief Ign-math angle to Ogre angle
+      /// \brief gz-math angle to Ogre angle
       /// \param[in] _angle ign-math angle
       /// \return Ogre angle
       public: static Ogre::Radian Convert(const math::Angle &_angle);
@@ -104,7 +104,7 @@ namespace gz
       /// \return Ogre Matrix4
       public: static Ogre::Matrix4 Convert(const math::Matrix4d &_m);
 
-      /// \brief Ign-rendering PixelFormat to Ogre PixelFormat
+      /// \brief gz-rendering PixelFormat to Ogre PixelFormat
       /// \param[in] _format Ign-rendering PixelFormat
       /// return Ogre PixelFormat
       public: static Ogre::PixelFormatGpu Convert(PixelFormat _format);
diff --git a/ogre2/src/Ogre2Material.cc b/ogre2/src/Ogre2Material.cc
index 663828f45..3d363aaa1 100644
--- a/ogre2/src/Ogre2Material.cc
+++ b/ogre2/src/Ogre2Material.cc
@@ -592,7 +592,7 @@ void Ogre2Material::SetLightMap(const std::string &_name, unsigned int _uvSet)
   this->lightMapName = _name;
   this->lightMapUvSet = _uvSet;
 
-  // in ign-rendering5 + ogre 2.1, we reserved detail map 0 for light map
+  // in gz-rendering5 + ogre 2.1, we reserved detail map 0 for light map
   // and set a blend mode (PBSM_BLEND_OVERLAY AND PBSM_BLEND_MULTIPLY2X
   // produces better results) to blend with base albedo map. However, this
   // creates unwanted red highlights with ogre 2.2. So switching to use the
diff --git a/src/RenderEngineManager.cc b/src/RenderEngineManager.cc
index 04776fd94..c38916db7 100644
--- a/src/RenderEngineManager.cc
+++ b/src/RenderEngineManager.cc
@@ -206,7 +206,7 @@ std::vector<std::string> RenderEngineManager::LoadedEngines() const
     std::string n = name;
     if (nullptr != engine)
     {
-      // ign-rendering3 changed loaded engine names to the actual lib name.
+      // gz-rendering3 changed loaded engine names to the actual lib name.
       // For backward compatibility, return engine name if it is one of the
       // default engines
       for (const auto &it : this->dataPtr->defaultEngines)
diff --git a/src/Utils_TEST.cc b/src/Utils_TEST.cc
index f02a4a84d..7ada5c7c8 100644
--- a/src/Utils_TEST.cc
+++ b/src/Utils_TEST.cc
@@ -135,7 +135,7 @@ void UtilTest::ClickToScene(const std::string &_renderEngine)
   result = screenToScene(centerClick, camera, rayQuery, rayResult);
 
   // high tol is used for z due to depth buffer precision.
-  // Do not merge the tol changes forward to ign-rendering6.
+  // Do not merge the tol changes forward to gz-rendering6.
   EXPECT_NEAR(0.5, result.Z(), 1e-3);
   EXPECT_NEAR(0.0, result.X(), 2e-6);
   EXPECT_NEAR(0.0, result.Y(), 2e-6);
diff --git a/test/integration/depth_camera.cc b/test/integration/depth_camera.cc
index 72595b636..3b82d765c 100644
--- a/test/integration/depth_camera.cc
+++ b/test/integration/depth_camera.cc
@@ -286,7 +286,7 @@ void DepthCameraTest::DepthCameraBoxes(
       // Note: internal texture format used is RGB with no alpha channel
       // We observed the values can be either 255 or 0 but graphics card
       // drivers are free to fill it with any value they want.
-      // This should be fixed in ogre 2.2 in ign-rendering6 which forbids
+      // This should be fixed in ogre 2.2 in gz-rendering6 which forbids
       // the use of RGB format.
       // see https://github.com/gazebosim/gz-rendering/issues/315
       EXPECT_TRUE(255u == ma || 0u == ma);
diff --git a/test/integration/render_pass.cc b/test/integration/render_pass.cc
index a039b3e45..fcd8bee26 100644
--- a/test/integration/render_pass.cc
+++ b/test/integration/render_pass.cc
@@ -385,7 +385,7 @@ void RenderPassTest::DepthGaussianNoise(const std::string &_renderEngine)
       // Note: internal texture format used is RGB with no alpha channel
       // We observed the values can be either 255 or 0 but graphics card
       // drivers are free to fill it with any value they want.
-      // This should be fixed in ogre 2.2 in ign-rendering6 which forbids
+      // This should be fixed in ogre 2.2 in gz-rendering6 which forbids
       // the use of RGB format.
       // see https://github.com/gazebosim/gz-rendering/issues/315
       EXPECT_TRUE(255u == ma || 0u == ma);
diff --git a/tutorials.md.in b/tutorials.md.in
index abe3d43e5..450265038 100644
--- a/tutorials.md.in
+++ b/tutorials.md.in
@@ -1,8 +1,8 @@
 \page tutorials Tutorials
 
-Welcome to the Ignition @IGN_DESIGNATION_CAP@ tutorials. These tutorials
+Welcome to the Gazebo @IGN_DESIGNATION_CAP@ tutorials. These tutorials
 will guide you through the process of understanding the capabilities of the
-Ignition @IGN_DESIGNATION_CAP@ library and how to use the library effectively.
+Gazebo @IGN_DESIGNATION_CAP@ library and how to use the library effectively.
 
 **The tutorials**
 
diff --git a/tutorials/01_intro.md b/tutorials/01_intro.md
index 209b81e2e..d31d36154 100644
--- a/tutorials/01_intro.md
+++ b/tutorials/01_intro.md
@@ -4,7 +4,7 @@ Next Tutorial: \ref installation
 
 ## What is Gazebo Rendering?
 
-Ignition Rendering is an open source library that provides an abstraction layer
+Gazebo Rendering is an open source library that provides an abstraction layer
 to multiple rendering engines. The goal is to provide a set of unified C++
 rendering APIs that are rendering-engine-agnostic. For instance, a scene created
 through the Gazebo Rendering API could be rendered using an OpenGL based
diff --git a/tutorials/02_install.md b/tutorials/02_install.md
index 85cd2ef46..b7b55d71c 100644
--- a/tutorials/02_install.md
+++ b/tutorials/02_install.md
@@ -1,7 +1,7 @@
 \page installation Installation
 
 These instructions are for installing only Gazebo Rendering.
-If you're interested in using all the Ignition libraries, check out this [Ignition installation](https://gazebosim.org/docs/latest/install).
+If you're interested in using all the Gazebo libraries, check out this [Gazebo installation](https://gazebosim.org/docs/latest/install).
 
 We recommend following the Binary Install instructions to get up and running as quickly and painlessly as possible.
 
@@ -74,7 +74,7 @@ build the relevant plugins if dependencies are found.
 sudo apt-get install libogre-1.9-dev
 ```
 
-**OGRE 2.x (supported in Versions >= ign-rendering1)**
+**OGRE 2.x (supported in Versions >= gz-rendering1)**
 
 Add OSRF packages if you have not done so already:
 ```
@@ -120,7 +120,7 @@ sdk 4.0.2, comment out lines 167-206).
 
 2. Configure and build
   ```
-  cd ign-rendering
+  cd gz-rendering
   mkdir build
   cd build
   cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/install/dir
@@ -139,14 +139,14 @@ On Windows, only OGRE 1 is currently supported.
 
 ## Prerequisites
 
-First, follow the [ign-cmake](https://github.com/gazebosim/gz-cmake) tutorial for installing Conda, Visual Studio, CMake, and other prerequisites, and also for creating a Conda environment.
+First, follow the [gz-cmake](https://github.com/gazebosim/gz-cmake) tutorial for installing Conda, Visual Studio, CMake, and other prerequisites, and also for creating a Conda environment.
 
 Navigate to ``condabin`` if necessary to use the ``conda`` command (i.e., if Conda is not in your `PATH` environment variable. You can find the location of ``condabin`` in Anaconda Prompt, ``where conda``).
 
 Create if necessary, and activate a Conda environment:
 ```
-conda create -n ign-ws
-conda activate ign-ws
+conda create -n gz-ws
+conda activate gz-ws
 ```
 
 ## Binary Installation
@@ -162,7 +162,7 @@ This assumes you have created and activated a Conda environment while installing
   conda install ogre --channel conda-forge
   ```
 
-2. Install Ignition dependencies:
+2. Install Gazebo dependencies:
 
   You can view available versions and their dependencies:
   ```
@@ -182,7 +182,7 @@ This assumes you have created and activated a Conda environment while installing
 
 4. Configure and build
   ```
-  cd ign-rendering
+  cd gz-rendering
   mkdir build
   cd build
   cmake .. -DBUILD_TESTING=OFF  # Optionally, -DCMAKE_INSTALL_PREFIX=path\to\install
@@ -230,7 +230,7 @@ which version you need.
 
 3. Configure and build
   ```
-  cd ign-rendering
+  cd gz-rendering
   mkdir build
   cd build
   cmake ..
diff --git a/tutorials/03_rendering_plugins.md b/tutorials/03_rendering_plugins.md
index 999a42165..7b4098396 100644
--- a/tutorials/03_rendering_plugins.md
+++ b/tutorials/03_rendering_plugins.md
@@ -31,5 +31,5 @@ From here, you should be able to reference your rendering plugin within Gazebo b
 \note You can use the `--render-engine`, `--render-engine-server`, and `--render-engine-gui` flags to specify any supported or custom rendering engine at runtime, this flag will override any other pre-existing rendering engine specifications (such as in an `.sdf` file).  The command line call would look something like:
 
 ~~~
-ign gazebo --render-engine HelloWorldPlugin shapes.sdf
+gz sim --render-engine HelloWorldPlugin shapes.sdf
 ~~~
diff --git a/tutorials/04_lightmap.md b/tutorials/04_lightmap.md
index e35e152b1..be240a0fa 100644
--- a/tutorials/04_lightmap.md
+++ b/tutorials/04_lightmap.md
@@ -1,6 +1,6 @@
 \page lightmap Creating and using light maps
 
-This example shows how to bake light maps in Blender and apply the light map texture in Ignition.
+This example shows how to bake light maps in Blender and apply the light map texture in Gazebo.
 
 ## Light maps
 
@@ -80,15 +80,15 @@ Light map baking applied to a more complex scene:
 
 @image html img/lightmap_depot_render.png
 
-## Using the light map in Ignition
+## Using the light map in Gazebo
 
-When baking we have the option to either bake in all the lighting, both indirect and direct, or just the indirect lighting, also known as global illumination or bounced lighting, and use real time lights in Ignition for the direct lighting and shadows. With the latter method we get sharper lighting and shadow detail as well as more accurate lighting on our dynamic objects however performance will be impacted by having more real time lights. Even with all the lighting baked it’s still a good idea to have one real time light such as a large point light or directional light works particularly well in order to enhance the effects of the physically based materials.
+When baking we have the option to either bake in all the lighting, both indirect and direct, or just the indirect lighting, also known as global illumination or bounced lighting, and use real time lights in Gazebo for the direct lighting and shadows. With the latter method we get sharper lighting and shadow detail as well as more accurate lighting on our dynamic objects however performance will be impacted by having more real time lights. Even with all the lighting baked it’s still a good idea to have one real time light such as a large point light or directional light works particularly well in order to enhance the effects of the physically based materials.
 
-Lightmaps can be applied to a mesh in Ignition the same way as other texture maps. Create an `gz::rendering::Material` and specify a light map texture by calling
+Lightmaps can be applied to a mesh in Gazebo the same way as other texture maps. Create an `gz::rendering::Material` and specify a light map texture by calling
 [SetLightMap](https://gazebosim.org/api/rendering/5.0/classignition_1_1rendering_1_1Material.html#addc6eb6206e0a17ab82aeaea543e8c71). Recall that when creating the light map UV texture in Step 2, we typically use a secondary UV set for light maps. Make sure to specify the index of the light map UV set as the second argument to this function.
 
 There are existing example models on Gazebo Fuel that use light maps. The [Depot](https://app.gazebosim.org/OpenRobotics/fuel/models/Depot) model mentioned earlier is one such example, and another one is the [Indoor Lightmap](https://app.gazebosim.org/OpenRobotics/fuel/models/Indoor%20light map) model. To see the Indoor Lightmap model with [Gazebo](https://gazebosim.org/docs/all/getstarted), you can run the following command (requires Gazebo Edifice or above):
 
 ```
-ign gazebo -v lightmap.sdf
+gz sim -v lightmap.sdf
 ```
diff --git a/tutorials/10_actor_animation_tutorial.md b/tutorials/10_actor_animation_tutorial.md
index 5835daee4..a8728449d 100644
--- a/tutorials/10_actor_animation_tutorial.md
+++ b/tutorials/10_actor_animation_tutorial.md
@@ -8,7 +8,7 @@ Clone the source code, Create a build directory and use `cmake` and `make` to co
 
 ```{.sh}
 git clone https://github.com/gazebosim/gz-rendering
-cd ign-rendering/examples/actor_animation
+cd gz-rendering/examples/actor_animation
 mkdir build
 cd build
 cmake ..
diff --git a/tutorials/11_gazebo_scene_viewer_tutorial.md b/tutorials/11_gazebo_scene_viewer_tutorial.md
index d5269c1d6..34bab044b 100644
--- a/tutorials/11_gazebo_scene_viewer_tutorial.md
+++ b/tutorials/11_gazebo_scene_viewer_tutorial.md
@@ -8,7 +8,7 @@ Clone the source code, create a build directory and use `cmake` and `make` to co
 
 ```{.sh}
 git clone https://github.com/gazebosim/gz-rendering
-cd ign-rendering/examples/gazebo_scene_viewer
+cd gz-rendering/examples/gazebo_scene_viewer
 mkdir build
 cd build
 cmake ..
diff --git a/tutorials/12_mesh_viewer_tutorial.md b/tutorials/12_mesh_viewer_tutorial.md
index 32f76c798..74e7f5534 100644
--- a/tutorials/12_mesh_viewer_tutorial.md
+++ b/tutorials/12_mesh_viewer_tutorial.md
@@ -6,7 +6,7 @@ Clone the source code, create a build directory and use `cmake` and `make` to co
 
 ```{.sh}
 git clone https://github.com/gazebosim/gz-rendering
-cd ign-rendering/examples/mesh_viewer
+cd gz-rendering/examples/mesh_viewer
 mkdir build
 cd build
 cmake ..
diff --git a/tutorials/13_custom_scene_viewer.md b/tutorials/13_custom_scene_viewer.md
index 594af1c10..ac06a969a 100644
--- a/tutorials/13_custom_scene_viewer.md
+++ b/tutorials/13_custom_scene_viewer.md
@@ -27,7 +27,7 @@ Clone the source code, create a build directory and use `cmake` and `make` to co
 
 ```{.sh}
 git clone https://github.com/gazebosim/gz-rendering
-cd ign-rendering/examples/custom_scene_viewer
+cd gz-rendering/examples/custom_scene_viewer
 mkdir build
 cd build
 cmake ..
diff --git a/tutorials/14_camera_tracking_tutorial.md b/tutorials/14_camera_tracking_tutorial.md
index 9901a92dc..84e9f5cea 100644
--- a/tutorials/14_camera_tracking_tutorial.md
+++ b/tutorials/14_camera_tracking_tutorial.md
@@ -8,7 +8,7 @@ Clone the source code, create a build directory and use `cmake` and `make` to co
 
 ```{.sh}
 git clone https://github.com/gazebosim/gz-rendering
-cd ign-rendering/examples/camera_tracking
+cd gz-rendering/examples/camera_tracking
 mkdir build
 cd build
 cmake ..
diff --git a/tutorials/15_custom_shaders_tutorial.md b/tutorials/15_custom_shaders_tutorial.md
index 2c192d6ff..817da8150 100644
--- a/tutorials/15_custom_shaders_tutorial.md
+++ b/tutorials/15_custom_shaders_tutorial.md
@@ -8,7 +8,7 @@ Clone the source code, create a build directory and use `cmake` and `make` to co
 
 ```{.sh}
 git clone https://github.com/gazebosim/gz-rendering
-cd ign-rendering/examples/custom_shaders
+cd gz-rendering/examples/custom_shaders
 mkdir build
 cd build
 cmake ..
diff --git a/tutorials/17_render_pass_tutorial.md b/tutorials/17_render_pass_tutorial.md
index b9b4cbd92..c16f9079c 100644
--- a/tutorials/17_render_pass_tutorial.md
+++ b/tutorials/17_render_pass_tutorial.md
@@ -8,7 +8,7 @@ Clone the source code, create a build directory and use `cmake` and `make` to co
 
 ```{.sh}
 git clone https://github.com/gazebosim/gz-rendering
-cd ign-rendering/examples/render_pass
+cd gz-rendering/examples/render_pass
 mkdir build
 cd build
 cmake ..
@@ -23,7 +23,7 @@ Execute the example:
 You'll see:
 
 ```{.sh}
-[Msg] Loading plugin [ignition-rendering7-ogre]
+[Msg] Loading plugin [gz-rendering7-ogre]
 Engine 'optix' is not supported
 ===============================
   TAB - Switch render engines
diff --git a/tutorials/18_simple_demo_tutorial.md b/tutorials/18_simple_demo_tutorial.md
index e665a67e5..6d4e10cde 100644
--- a/tutorials/18_simple_demo_tutorial.md
+++ b/tutorials/18_simple_demo_tutorial.md
@@ -8,7 +8,7 @@ Clone the source code, create a build directory and use `cmake` and `make` to co
 
 ```{.sh}
 git clone https://github.com/gazebosim/gz-rendering
-cd ign-rendering/examples/simple_demo
+cd gz-rendering/examples/simple_demo
 mkdir build
 cd build
 cmake ..
@@ -23,7 +23,7 @@ Execute the example:
 You'll see:
 
 ```{.sh}
-[Msg] Loading plugin [ignition-rendering7-ogre]
+[Msg] Loading plugin [gz-rendering7-ogre]
 Engine 'optix' is not supported
 ===============================
   TAB - Switch render engines
diff --git a/tutorials/19_text_geom_tutorial.md b/tutorials/19_text_geom_tutorial.md
index a2d48e582..f26540718 100644
--- a/tutorials/19_text_geom_tutorial.md
+++ b/tutorials/19_text_geom_tutorial.md
@@ -8,7 +8,7 @@ Clone the source code, create a build directory and use `cmake` and `make` to co
 
 ```{.sh}
 git clone https://github.com/gazebosim/gz-rendering
-cd ign-rendering/examples/text_geom
+cd gz-rendering/examples/text_geom
 mkdir build
 cd build
 cmake ..
@@ -23,7 +23,7 @@ Execute the example:
 You'll see:
 
 ```{.sh}
-[Msg] Loading plugin [ignition-rendering7-ogre]
+[Msg] Loading plugin [gz-rendering7-ogre]
 Engine 'optix' is not supported
 ===============================
   TAB - Switch render engines
diff --git a/tutorials/20_particles_tutorial.md b/tutorials/20_particles_tutorial.md
index 88c32f556..8ff5426b6 100644
--- a/tutorials/20_particles_tutorial.md
+++ b/tutorials/20_particles_tutorial.md
@@ -8,7 +8,7 @@ Clone the source code, create a build directory and use `cmake` and `make` to co
 
 ```{.sh}
 git clone https://github.com/gazebosim/gz-rendering
-cd ign-rendering/examples/particles_demo
+cd gz-rendering/examples/particles_demo
 mkdir build
 cd build
 cmake ..
@@ -23,7 +23,7 @@ Execute the example:
 You'll see:
 
 ```{.sh}
-[Msg] Loading plugin [ignition-rendering7-ogre2]
+[Msg] Loading plugin [gz-rendering7-ogre2]
 ===============================
   TAB - Switch render engines
   ESC - Exit
diff --git a/tutorials/21_heightmap.md b/tutorials/21_heightmap.md
index 1723ebeff..bca43a378 100644
--- a/tutorials/21_heightmap.md
+++ b/tutorials/21_heightmap.md
@@ -10,7 +10,7 @@ Clone the source code, create a build directory and use `cmake` and `make` to co
 
 ```{.sh}
 git clone https://github.com/gazebosim/gz-rendering
-cd ign-rendering/examples/heightmap
+cd gz-rendering/examples/heightmap
 mkdir build
 cd build
 cmake ..
@@ -25,7 +25,7 @@ Example 1 (image heightmap):
 You'll see:
 
 ```{.sh}
-[Msg] Loading plugin [ignition-rendering7-ogre]
+[Msg] Loading plugin [gz-rendering7-ogre]
 [Msg] Loading heightmap: scene::Heightmap(65528)
 [Msg] Heightmap loaded. Process took 217 ms.
 ===============================
diff --git a/tutorials/21_render_order.md b/tutorials/21_render_order.md
index f0d208bd3..334204ef5 100644
--- a/tutorials/21_render_order.md
+++ b/tutorials/21_render_order.md
@@ -38,7 +38,7 @@ Clone the source code, create a build directory and use `cmake` and `make` to co
 
 ```{.sh}
 git clone https://github.com/gazebosim/gz-rendering
-cd ign-rendering/examples/simple_demo
+cd gz-rendering/examples/simple_demo
 mkdir build
 cd build
 cmake ..
diff --git a/tutorials/22_environment_map.md b/tutorials/22_environment_map.md
index ee6d68318..0ed4fe348 100644
--- a/tutorials/22_environment_map.md
+++ b/tutorials/22_environment_map.md
@@ -14,7 +14,7 @@ which uses the ogre2 render engine.
 To see the example mesh, build and run the demo:
 
 ```{.sh}
-cd ign-rendering/examples/ogre2_demo
+cd gz-rendering/examples/ogre2_demo
 mkdir build
 cd build
 cmake ..
diff --git a/tutorials/23_depth_camera_tutorial.md b/tutorials/23_depth_camera_tutorial.md
index 4c3b09839..0e94761d0 100644
--- a/tutorials/23_depth_camera_tutorial.md
+++ b/tutorials/23_depth_camera_tutorial.md
@@ -8,7 +8,7 @@ Clone the source code, create a build directory and use `cmake` and `make` to co
 
 ```{.sh}
 git clone https://github.com/gazebosim/gz-rendering
-cd ign-rendering/examples/simple_demo
+cd gz-rendering/examples/simple_demo
 mkdir build
 cd build
 cmake ..