diff --git a/examples/actor_animation/CMakeLists.txt b/examples/actor_animation/CMakeLists.txt
index cc3af1d94..fff46d96a 100644
--- a/examples/actor_animation/CMakeLists.txt
+++ b/examples/actor_animation/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-actor-animation)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/boundingbox_camera/CMakeLists.txt b/examples/boundingbox_camera/CMakeLists.txt
index cf632c268..cdc68353f 100644
--- a/examples/boundingbox_camera/CMakeLists.txt
+++ b/examples/boundingbox_camera/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-boundingbox-camera)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/camera_tracking/CMakeLists.txt b/examples/camera_tracking/CMakeLists.txt
index 2eae4aa92..dfc9a636e 100644
--- a/examples/camera_tracking/CMakeLists.txt
+++ b/examples/camera_tracking/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-camera-tracking)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 find_package(GLUT REQUIRED)
 include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
diff --git a/examples/custom_scene_viewer/CMakeLists.txt b/examples/custom_scene_viewer/CMakeLists.txt
index 4a3b53661..5e580c7bc 100644
--- a/examples/custom_scene_viewer/CMakeLists.txt
+++ b/examples/custom_scene_viewer/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-custom-scene-viewer)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/custom_shaders_uniforms/CMakeLists.txt b/examples/custom_shaders_uniforms/CMakeLists.txt
index ab2baabf6..ee8aed720 100644
--- a/examples/custom_shaders_uniforms/CMakeLists.txt
+++ b/examples/custom_shaders_uniforms/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(SYSTEM
 )
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 set(TARGET_THIRD_PARTY_DEPENDS "")
 
diff --git a/examples/depth_camera/CMakeLists.txt b/examples/depth_camera/CMakeLists.txt
index 14eb80948..66ad49f33 100644
--- a/examples/depth_camera/CMakeLists.txt
+++ b/examples/depth_camera/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-depth-camera)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/gazebo_scene_viewer/CMakeLists.txt b/examples/gazebo_scene_viewer/CMakeLists.txt
index 3494dac0f..744ae03be 100644
--- a/examples/gazebo_scene_viewer/CMakeLists.txt
+++ b/examples/gazebo_scene_viewer/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-gazebo-scene-viewer)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 find_package(gazebo REQUIRED)
 
 include_directories(SYSTEM ${GAZEBO_INCLUDE_DIRS})
diff --git a/examples/heightmap/CMakeLists.txt b/examples/heightmap/CMakeLists.txt
index 0aa666ff9..1b44a325b 100644
--- a/examples/heightmap/CMakeLists.txt
+++ b/examples/heightmap/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-heightmap)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/lidar_visual/CMakeLists.txt b/examples/lidar_visual/CMakeLists.txt
index 1b4facfd2..cef180f40 100644
--- a/examples/lidar_visual/CMakeLists.txt
+++ b/examples/lidar_visual/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-lidar_visual)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/mesh_viewer/CMakeLists.txt b/examples/mesh_viewer/CMakeLists.txt
index fe1e2ff61..33a1ee9d0 100644
--- a/examples/mesh_viewer/CMakeLists.txt
+++ b/examples/mesh_viewer/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-mesh-viewer)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/mouse_picking/CMakeLists.txt b/examples/mouse_picking/CMakeLists.txt
index aefee4a27..c3139365e 100644
--- a/examples/mouse_picking/CMakeLists.txt
+++ b/examples/mouse_picking/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-mouse-picking)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/ogre2_demo/CMakeLists.txt b/examples/ogre2_demo/CMakeLists.txt
index 89785971d..159439814 100644
--- a/examples/ogre2_demo/CMakeLists.txt
+++ b/examples/ogre2_demo/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 project(ignition-rendering-ogre2-demo)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/particles_demo/CMakeLists.txt b/examples/particles_demo/CMakeLists.txt
index 8be01835e..322e64e9c 100644
--- a/examples/particles_demo/CMakeLists.txt
+++ b/examples/particles_demo/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-particles-demo)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/render_pass/CMakeLists.txt b/examples/render_pass/CMakeLists.txt
index 62483514a..38898238a 100644
--- a/examples/render_pass/CMakeLists.txt
+++ b/examples/render_pass/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-render-pass)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 find_package(GLUT REQUIRED)
 include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
diff --git a/examples/segmentation_camera/CMakeLists.txt b/examples/segmentation_camera/CMakeLists.txt
index fc5e993df..2fffb5803 100644
--- a/examples/segmentation_camera/CMakeLists.txt
+++ b/examples/segmentation_camera/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-segmentation-camera)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/simple_demo/CMakeLists.txt b/examples/simple_demo/CMakeLists.txt
index f44390f5f..c62f442ae 100644
--- a/examples/simple_demo/CMakeLists.txt
+++ b/examples/simple_demo/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-simple-demo)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 find_package(GLUT REQUIRED)
 include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
diff --git a/examples/simple_demo_qml/CMakeLists.txt b/examples/simple_demo_qml/CMakeLists.txt
index c9e39a2b1..41c0100f9 100644
--- a/examples/simple_demo_qml/CMakeLists.txt
+++ b/examples/simple_demo_qml/CMakeLists.txt
@@ -15,7 +15,7 @@ set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
 #------------------------------------------------------------------------
 # Find ign-rendering
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 #======================================
 # Find Qt
diff --git a/examples/text_geom/CMakeLists.txt b/examples/text_geom/CMakeLists.txt
index c2b014ac9..5893f3c97 100644
--- a/examples/text_geom/CMakeLists.txt
+++ b/examples/text_geom/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-text-geom)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 find_package(GLUT REQUIRED)
 include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
diff --git a/examples/thermal_camera/CMakeLists.txt b/examples/thermal_camera/CMakeLists.txt
index da786631a..dc895da77 100644
--- a/examples/thermal_camera/CMakeLists.txt
+++ b/examples/thermal_camera/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-thermal-camera)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/transform_control/CMakeLists.txt b/examples/transform_control/CMakeLists.txt
index f3125afd1..aa30be565 100644
--- a/examples/transform_control/CMakeLists.txt
+++ b/examples/transform_control/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-transform-control)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/view_control/CMakeLists.txt b/examples/view_control/CMakeLists.txt
index 08f012998..5974115e1 100644
--- a/examples/view_control/CMakeLists.txt
+++ b/examples/view_control/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-view-control)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 find_package(GLUT REQUIRED)
 include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
diff --git a/examples/visualization_demo/CMakeLists.txt b/examples/visualization_demo/CMakeLists.txt
index 0bf76d629..e7c5c8082 100644
--- a/examples/visualization_demo/CMakeLists.txt
+++ b/examples/visualization_demo/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-rendering-visualization-demo)
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 if (APPLE OR UNIX)
   find_package(GLUT REQUIRED)
diff --git a/examples/waves/CMakeLists.txt b/examples/waves/CMakeLists.txt
index a1a813c55..5aae828ea 100644
--- a/examples/waves/CMakeLists.txt
+++ b/examples/waves/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(SYSTEM
 )
 
 find_package(ignition-rendering6 REQUIRED)
-find_package(ignition-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common4 REQUIRED)
 
 set(TARGET_THIRD_PARTY_DEPENDS "")