diff --git a/projects/rocprofiler-sdk/CMakeLists.txt b/projects/rocprofiler-sdk/CMakeLists.txt
index a9dbe9efe0..dccafa1623 100644
--- a/projects/rocprofiler-sdk/CMakeLists.txt
+++ b/projects/rocprofiler-sdk/CMakeLists.txt
@@ -11,8 +11,8 @@ endif()
 
 file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" FULL_VERSION_STRING LIMIT_COUNT 1)
 string(REGEX REPLACE "(\n|\r)" "" FULL_VERSION_STRING "${FULL_VERSION_STRING}")
-string(REGEX REPLACE "([0-9]+)\.([0-9]+)\.([0-9]+)(.*)" "\\1.\\2.\\3" ROCPROFILER_VERSION
-                     "${FULL_VERSION_STRING}")
+string(REGEX REPLACE "([0-9]+)\.([0-9]+)\.([0-9]+)(.*)" "\\1.\\2.\\3"
+                     ROCPROFILER_SDK_VERSION "${FULL_VERSION_STRING}")
 
 foreach(_LANG C CXX)
     set(CMAKE_${_LANG}_FLAGS_COVERAGE_INIT
@@ -24,21 +24,21 @@ foreach(_LANG C CXX)
 endforeach()
 
 project(
-    rocprofiler
+    rocprofiler-sdk
     LANGUAGES C CXX
-    VERSION ${ROCPROFILER_VERSION}
+    VERSION ${ROCPROFILER_SDK_VERSION}
     DESCRIPTION "ROCm GPU performance analysis SDK"
     HOMEPAGE_URL "https://github.com/ROCm/rocprofiler-sdk")
 
 set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "core")
-set(PACKAGE_NAME ${PROJECT_NAME}-sdk)
+set(PACKAGE_NAME ${PROJECT_NAME})
 
 find_package(Git)
 
 if(Git_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
     execute_process(
         COMMAND ${GIT_EXECUTABLE} describe --tags
-        OUTPUT_VARIABLE ROCPROFILER_GIT_DESCRIBE
+        OUTPUT_VARIABLE ROCPROFILER_SDK_GIT_DESCRIBE
         OUTPUT_STRIP_TRAILING_WHITESPACE
         RESULT_VARIABLE _GIT_DESCRIBE_RESULT
         ERROR_QUIET)
@@ -46,7 +46,7 @@ if(Git_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
     if(NOT _GIT_DESCRIBE_RESULT EQUAL 0)
         execute_process(
             COMMAND ${GIT_EXECUTABLE} describe
-            OUTPUT_VARIABLE ROCPROFILER_GIT_DESCRIBE
+            OUTPUT_VARIABLE ROCPROFILER_SDK_GIT_DESCRIBE
             OUTPUT_STRIP_TRAILING_WHITESPACE
             RESULT_VARIABLE _GIT_DESCRIBE_RESULT
             ERROR_QUIET)
@@ -54,11 +54,11 @@ if(Git_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
 
     execute_process(
         COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
-        OUTPUT_VARIABLE ROCPROFILER_GIT_REVISION
+        OUTPUT_VARIABLE ROCPROFILER_SDK_GIT_REVISION
         OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
 else()
-    set(ROCPROFILER_GIT_DESCRIBE "v${ROCPROFILER_VERSION}")
-    set(ROCPROFILER_GIT_REVISION "")
+    set(ROCPROFILER_SDK_GIT_DESCRIBE "v${ROCPROFILER_SDK_VERSION}")
+    set(ROCPROFILER_SDK_GIT_REVISION "")
 endif()
 
 # make sure that cmake re-runs when version file changes
@@ -68,8 +68,8 @@ message(
     STATUS
         "[${PROJECT_NAME}] version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} (${FULL_VERSION_STRING})"
     )
-message(STATUS "[${PROJECT_NAME}] git revision: ${ROCPROFILER_GIT_REVISION}")
-message(STATUS "[${PROJECT_NAME}] git describe: ${ROCPROFILER_GIT_DESCRIBE}")
+message(STATUS "[${PROJECT_NAME}] git revision: ${ROCPROFILER_SDK_GIT_REVISION}")
+message(STATUS "[${PROJECT_NAME}] git describe: ${ROCPROFILER_SDK_GIT_DESCRIBE}")
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${PROJECT_SOURCE_DIR}/cmake/Modules
                       ${CMAKE_MODULE_PATH})
 
diff --git a/projects/rocprofiler-sdk/cmake/Templates/rocprofiler-sdk/config.cmake.in b/projects/rocprofiler-sdk/cmake/Templates/rocprofiler-sdk/config.cmake.in
index 3b6703beda..972361391c 100644
--- a/projects/rocprofiler-sdk/cmake/Templates/rocprofiler-sdk/config.cmake.in
+++ b/projects/rocprofiler-sdk/cmake/Templates/rocprofiler-sdk/config.cmake.in
@@ -105,9 +105,9 @@ else()
 
     include("${@PACKAGE_NAME@_CMAKE_DIR}/@PACKAGE_NAME@-targets.cmake")
 
-    @PROJECT_NAME@_config_nolink_target(@PACKAGE_NAME@::@PACKAGE_NAME@-external-nolink hip::host)
-    @PROJECT_NAME@_config_nolink_target(@PACKAGE_NAME@::@PACKAGE_NAME@-external-nolink hsa-runtime64::hsa-runtime64)
-    @PROJECT_NAME@_config_nolink_target(@PACKAGE_NAME@::@PACKAGE_NAME@-external-nolink amd_comgr)
+    rocprofiler_config_nolink_target(@PACKAGE_NAME@::@PACKAGE_NAME@-external-nolink hip::host)
+    rocprofiler_config_nolink_target(@PACKAGE_NAME@::@PACKAGE_NAME@-external-nolink hsa-runtime64::hsa-runtime64)
+    rocprofiler_config_nolink_target(@PACKAGE_NAME@::@PACKAGE_NAME@-external-nolink amd_comgr)
 
     # Library dependencies
     if(@PACKAGE_NAME@_FIND_COMPONENTS)
diff --git a/projects/rocprofiler-sdk/cmake/rocprofiler_config_install.cmake b/projects/rocprofiler-sdk/cmake/rocprofiler_config_install.cmake
index 46df9ad4fe..0a2836986d 100644
--- a/projects/rocprofiler-sdk/cmake/rocprofiler_config_install.cmake
+++ b/projects/rocprofiler-sdk/cmake/rocprofiler_config_install.cmake
@@ -90,7 +90,7 @@ write_basic_package_version_file(
 
 configure_file(
     ${PROJECT_SOURCE_DIR}/cmake/rocprofiler_config_nolink_target.cmake
-    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-sdk/${PROJECT_NAME}-sdk-config-nolink-target.cmake
+    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME}/${PACKAGE_NAME}-config-nolink-target.cmake
     COPYONLY)
 
 configure_file(
@@ -106,7 +106,7 @@ install(
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME}
     COMPONENT development)
 
-export(PACKAGE ${PROJECT_NAME})
+export(PACKAGE ${PACKAGE_NAME})
 
 # ------------------------------------------------------------------------------#
 # build tree
diff --git a/projects/rocprofiler-sdk/cmake/rocprofiler_config_install_roctx.cmake b/projects/rocprofiler-sdk/cmake/rocprofiler_config_install_roctx.cmake
index 797093df6d..b66f0cfbaa 100644
--- a/projects/rocprofiler-sdk/cmake/rocprofiler_config_install_roctx.cmake
+++ b/projects/rocprofiler-sdk/cmake/rocprofiler_config_install_roctx.cmake
@@ -4,8 +4,8 @@ include_guard(GLOBAL)
 include(CMakePackageConfigHelpers)
 
 set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME roctx)
-set(SDK_PACKAGE_NAME "${PROJECT_NAME}-sdk")
-set(PACKAGE_NAME "rocprofiler-sdk-roctx")
+set(SDK_PACKAGE_NAME "${PROJECT_NAME}")
+set(PACKAGE_NAME "${PROJECT_NAME}-roctx")
 
 install(
     EXPORT ${PACKAGE_NAME}-targets
@@ -27,7 +27,7 @@ set(PROJECT_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
 set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
 set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
 set(PROJECT_BUILD_TARGETS ${PACKAGE_NAME}-shared-library)
-set(PROJECT_EXTRA_DIRS "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}-sdk-roctx")
+set(PROJECT_EXTRA_DIRS "${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_NAME}")
 
 configure_package_config_file(
     ${PROJECT_SOURCE_DIR}/cmake/Templates/${PACKAGE_NAME}/config.cmake.in
diff --git a/projects/rocprofiler-sdk/cmake/rocprofiler_config_packaging.cmake b/projects/rocprofiler-sdk/cmake/rocprofiler_config_packaging.cmake
index 1830b8fb3b..b5a48e32ed 100644
--- a/projects/rocprofiler-sdk/cmake/rocprofiler_config_packaging.cmake
+++ b/projects/rocprofiler-sdk/cmake/rocprofiler_config_packaging.cmake
@@ -24,7 +24,7 @@ if(DEFINED ENV{ROCM_LIBPATCH_VERSION})
 endif()
 
 # Add packaging directives
-set(CPACK_PACKAGE_NAME ${PROJECT_NAME}-sdk)
+set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
 set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
 set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
@@ -42,7 +42,7 @@ set(ROCPROFILER_CPACK_SYSTEM_NAME
 set(ROCPROFILER_CPACK_PACKAGE_SUFFIX "")
 
 set(CPACK_PACKAGE_FILE_NAME
-    "${CPACK_PACKAGE_NAME}-${ROCPROFILER_VERSION}-${ROCPROFILER_CPACK_SYSTEM_NAME}${ROCPROFILER_CPACK_PACKAGE_SUFFIX}"
+    "${CPACK_PACKAGE_NAME}-${ROCPROFILER_SDK_VERSION}-${ROCPROFILER_CPACK_SYSTEM_NAME}${ROCPROFILER_CPACK_PACKAGE_SUFFIX}"
     CACHE STRING "")
 if(DEFINED ENV{CPACK_PACKAGE_FILE_NAME})
     set(CPACK_PACKAGE_FILE_NAME
diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk-roctx/version.h.in b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk-roctx/version.h.in
index 06fa186f81..f11c9d7f15 100644
--- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk-roctx/version.h.in
+++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk-roctx/version.h.in
@@ -96,8 +96,8 @@
 #define ROCTX_VERSION_PATCH   @PROJECT_VERSION_PATCH@
 #define ROCTX_SOVERSION       (10000 * @PROJECT_VERSION_MAJOR@)
 #define ROCTX_VERSION_STRING "@FULL_VERSION_STRING@"
-#define ROCTX_GIT_DESCRIBE   "@ROCPROFILER_GIT_DESCRIBE@"
-#define ROCTX_GIT_REVISION   "@ROCPROFILER_GIT_REVISION@"
+#define ROCTX_GIT_DESCRIBE   "@ROCPROFILER_SDK_GIT_DESCRIBE@"
+#define ROCTX_GIT_REVISION   "@ROCPROFILER_SDK_GIT_REVISION@"
 
 // system info during compilation
 #define ROCTX_LIBRARY_ARCH     "@CMAKE_LIBRARY_ARCHITECTURE@"
diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/version.h.in b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/version.h.in
index 30bdc63d81..85d4f0531b 100644
--- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/version.h.in
+++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/version.h.in
@@ -96,8 +96,8 @@
 #define ROCPROFILER_VERSION_PATCH   @PROJECT_VERSION_PATCH@
 #define ROCPROFILER_SOVERSION       (10000 * @PROJECT_VERSION_MAJOR@)
 #define ROCPROFILER_VERSION_STRING "@FULL_VERSION_STRING@"
-#define ROCPROFILER_GIT_DESCRIBE   "@ROCPROFILER_GIT_DESCRIBE@"
-#define ROCPROFILER_GIT_REVISION   "@ROCPROFILER_GIT_REVISION@"
+#define ROCPROFILER_GIT_DESCRIBE   "@ROCPROFILER_SDK_GIT_DESCRIBE@"
+#define ROCPROFILER_GIT_REVISION   "@ROCPROFILER_SDK_GIT_REVISION@"
 
 // system info during compilation
 #define ROCPROFILER_LIBRARY_ARCH     "@CMAKE_LIBRARY_ARCHITECTURE@"