diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98a05fc42..e9d2dbbbd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,9 @@ set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR})
 #============================================================================
 # Configure the project
 #============================================================================
-ign_configure_project(VERSION_SUFFIX pre1)
+ign_configure_project(
+  REPLACE_IGNITION_INCLUDE_PATH gz/transport
+  VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 25ec89762..4b2bdd7bb 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1 +1,2 @@
-add_subdirectory(ignition)
+add_subdirectory(gz)
+install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
diff --git a/include/gz/transport/CMakeLists.txt b/include/gz/transport/CMakeLists.txt
index 140e1fff3..ce4971051 100644
--- a/include/gz/transport/CMakeLists.txt
+++ b/include/gz/transport/CMakeLists.txt
@@ -3,4 +3,4 @@
 # that the detail headers are not installed. The next install line solves this
 # problem.
 ign_install_all_headers(EXCLUDE_DIRS detail)
-install(DIRECTORY detail DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/ignition/${IGN_DESIGNATION})
+install(DIRECTORY detail DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/gz/${IGN_DESIGNATION})
diff --git a/log/include/CMakeLists.txt b/log/include/CMakeLists.txt
new file mode 100644
index 000000000..4b2bdd7bb
--- /dev/null
+++ b/log/include/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(gz)
+install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
diff --git a/log/include/gz/CMakeLists.txt b/log/include/gz/CMakeLists.txt
new file mode 100644
index 000000000..321a9fe17
--- /dev/null
+++ b/log/include/gz/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(transport)
diff --git a/log/test/CMakeLists.txt b/log/test/CMakeLists.txt
index 947672e6d..f497486d4 100644
--- a/log/test/CMakeLists.txt
+++ b/log/test/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_subdirectory(integration)
 
-configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/log/include/ignition/transport/log/test_config.h)
+configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/log/include/gz/transport/log/test_config.h)
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 974f01d71..050382601 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories (
   ${PROJECT_BINARY_DIR}
 )
 
-configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/include/ignition/transport/test_config.h)
+configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/include/gz/transport/test_config.h)
 
 # Build gtest
 add_library(gtest STATIC gtest/src/gtest-all.cc)