diff --git a/projects/rdc/CMakeLists.txt b/projects/rdc/CMakeLists.txt
index 798dcf784f..fb93c8716c 100755
--- a/projects/rdc/CMakeLists.txt
+++ b/projects/rdc/CMakeLists.txt
@@ -152,16 +152,14 @@ if(BUILD_STANDALONE AND GRPC_ROOT STREQUAL GRPC_ROOT_DEFAULT)
     Continuing without gRPC install")
 endif()
 
-find_package(SMI
+find_package(amd_smi
     NAMES amd_smi
     HINTS ${ROCM_DIR}/lib/cmake
     CONFIGURE REQUIRED)
-set(SMI_INC_DIR "${AMD_SMI_INCLUDE_DIR}" CACHE INTERNAL "AMD SMI include directory.")
-set(SMI_LIB_DIR "${AMD_SMI_LIB_DIR}" CACHE INTERNAL "AMD SMI library directory.")
 
-if(NOT EXISTS "${SMI_INC_DIR}" OR NOT EXISTS "${SMI_LIB_DIR}")
-    message(FATAL_ERROR "amd_smi not found in ${SMI_INC_DIR}. Please
-    make sure amd_smi is installed and present in ${SMI_INC_DIR}.")
+if(NOT EXISTS "${AMD_SMI_INCLUDE_DIR}" OR NOT EXISTS "${AMD_SMI_LIB_DIR}")
+    message(FATAL_ERROR "amd_smi not found in ${AMD_SMI_INCLUDE_DIR}. Please
+    make sure amd_smi is installed and present in ${AMD_SMI_INCLUDE_DIR}.")
 endif()
 
 set(${RDC}_VERSION_MAJOR "${VERSION_MAJOR}")
diff --git a/projects/rdc/rdc_libs/CMakeLists.txt b/projects/rdc/rdc_libs/CMakeLists.txt
index 210d8649c3..0f9b5ed8ce 100755
--- a/projects/rdc/rdc_libs/CMakeLists.txt
+++ b/projects/rdc/rdc_libs/CMakeLists.txt
@@ -46,8 +46,8 @@ message("--------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
 message("--------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
 message("--------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
 message("--------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
-message("---------SMI Lib Dir: " ${SMI_LIB_DIR})
-message("---------SMI Inc Dir: " ${SMI_INC_DIR})
+message("---------SMI Lib Dir: " ${AMD_SMI_LIB_DIR})
+message("---------SMI Inc Dir: " ${AMD_SMI_INCLUDE_DIR})
 message("")
 
 
@@ -83,7 +83,7 @@ set(CPACK_DEBIAN_PACKAGE_DEPENDS "rocm-core")
 set(CPACK_RPM_PACKAGE_REQUIRES "rocm-core")
 
 # link SMI
-link_directories(${SMI_LIB_DIR})
+link_directories(${AMD_SMI_LIB_DIR})
 
 # add librdc_bootstrap.so
 add_subdirectory(bootstrap)
diff --git a/projects/rdc/rdc_libs/bootstrap/CMakeLists.txt b/projects/rdc/rdc_libs/bootstrap/CMakeLists.txt
index e5031391e3..c3e6768d7c 100644
--- a/projects/rdc/rdc_libs/bootstrap/CMakeLists.txt
+++ b/projects/rdc/rdc_libs/bootstrap/CMakeLists.txt
@@ -28,7 +28,7 @@ target_include_directories(${BOOTSTRAP_LIB} PRIVATE
     "${PROJECT_SOURCE_DIR}"
     "${PROJECT_SOURCE_DIR}/include"
     "${COMMON_DIR}"
-    "${SMI_INC_DIR}"
+    "${AMD_SMI_INCLUDE_DIR}"
     "${ROCM_DIR}/include")
 
 target_include_directories(${BOOTSTRAP_LIB}
diff --git a/projects/rdc/rdc_libs/rdc/CMakeLists.txt b/projects/rdc/rdc_libs/rdc/CMakeLists.txt
index 2282802a99..2210950c7d 100644
--- a/projects/rdc/rdc_libs/rdc/CMakeLists.txt
+++ b/projects/rdc/rdc_libs/rdc/CMakeLists.txt
@@ -69,7 +69,7 @@ target_link_libraries(${RDC_LIB} ${BOOTSTRAP_LIB} pthread amd_smi cap)
 target_include_directories(${RDC_LIB} PRIVATE
     "${PROJECT_SOURCE_DIR}"
     "${PROJECT_SOURCE_DIR}/include"
-    "${SMI_INC_DIR}")
+    "${AMD_SMI_INCLUDE_DIR}")
 
 # Set the VERSION and SOVERSION values
 set_property(TARGET ${RDC_LIB} PROPERTY
diff --git a/projects/rdc/rdc_libs/rdc_modules/rdc_rocp/CMakeLists.txt b/projects/rdc/rdc_libs/rdc_modules/rdc_rocp/CMakeLists.txt
index 252749c1f0..448dd2daae 100644
--- a/projects/rdc/rdc_libs/rdc_modules/rdc_rocp/CMakeLists.txt
+++ b/projects/rdc/rdc_libs/rdc_modules/rdc_rocp/CMakeLists.txt
@@ -38,7 +38,7 @@ if(BUILD_PROFILER)
         "${PROJECT_SOURCE_DIR}"
         "${PROJECT_SOURCE_DIR}/include"
         "${COMMON_DIR}"
-        "${SMI_INC_DIR}"
+        "${AMD_SMI_INCLUDE_DIR}"
         "${ROCM_DIR}/include"
         "${ROCM_DIR}/include/hsa")
 
diff --git a/projects/rdc/rdc_libs/rdc_modules/rdc_rocr/CMakeLists.txt b/projects/rdc/rdc_libs/rdc_modules/rdc_rocr/CMakeLists.txt
index d441539a34..4fd2dfddb2 100644
--- a/projects/rdc/rdc_libs/rdc_modules/rdc_rocr/CMakeLists.txt
+++ b/projects/rdc/rdc_libs/rdc_modules/rdc_rocr/CMakeLists.txt
@@ -45,7 +45,7 @@ if(BUILD_RUNTIME)
         "${PROJECT_SOURCE_DIR}"
         "${PROJECT_SOURCE_DIR}/include"
         "${COMMON_DIR}"
-        "${SMI_INC_DIR}"
+        "${AMD_SMI_INCLUDE_DIR}"
         "${ROCM_DIR}/include")
 
     # let bootstrap find this module at build time
diff --git a/projects/rdc/rdc_libs/rdc_modules/rdc_rvs/CMakeLists.txt b/projects/rdc/rdc_libs/rdc_modules/rdc_rvs/CMakeLists.txt
index 5d6e177e4c..0be124cc3a 100644
--- a/projects/rdc/rdc_libs/rdc_modules/rdc_rvs/CMakeLists.txt
+++ b/projects/rdc/rdc_libs/rdc_modules/rdc_rvs/CMakeLists.txt
@@ -39,7 +39,7 @@ if(BUILD_RVS)
         "${PROJECT_SOURCE_DIR}"
         "${PROJECT_SOURCE_DIR}/include"
         "${COMMON_DIR}"
-        "${SMI_INC_DIR}"
+        "${AMD_SMI_INCLUDE_DIR}"
         "${ROCM_DIR}/include"
         "${ROCM_DIR}/include/hsa"
         "${ROCM_VALIDATION_SUITE_INCLUDE_DIR}")
diff --git a/projects/rdc/rdci/CMakeLists.txt b/projects/rdc/rdci/CMakeLists.txt
index 07a7a612cf..f7ac5cbe42 100644
--- a/projects/rdc/rdci/CMakeLists.txt
+++ b/projects/rdc/rdci/CMakeLists.txt
@@ -34,8 +34,8 @@ message("--------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
 message("--------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
 message("--------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
 message("--------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
-message("--------SMI Lib Dir: " ${SMI_LIB_DIR})
-message("--------SMI Inc Dir: " ${SMI_INC_DIR})
+message("--------SMI Lib Dir: " ${AMD_SMI_LIB_DIR})
+message("--------SMI Inc Dir: " ${AMD_SMI_INCLUDE_DIR})
 message("-------GRPC ROOT Dir: " ${GRPC_ROOT})
 message("")
 
@@ -77,7 +77,7 @@ set(RDCI_SRC_LIST
 message("RDCI_SRC_LIST=${RDCI_SRC_LIST}")
 set(RDCI_EXE "rdci")
 
-link_directories(${SMI_LIB_DIR})
+link_directories(${AMD_SMI_LIB_DIR})
 
 add_executable(${RDCI_EXE} "${RDCI_SRC_LIST}")
 target_compile_definitions(${RDCI_EXE} PRIVATE CURRENT_GIT_HASH=${GIT_HASH})
diff --git a/projects/rdc/server/CMakeLists.txt b/projects/rdc/server/CMakeLists.txt
index 85321b0217..98c1d9630c 100755
--- a/projects/rdc/server/CMakeLists.txt
+++ b/projects/rdc/server/CMakeLists.txt
@@ -31,8 +31,8 @@ message("----------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
 message("----------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
 message("----------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
 message("----------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
-message("----------SMI Lib Dir: " ${SMI_LIB_DIR})
-message("----------SMI Inc Dir: " ${SMI_INC_DIR})
+message("----------SMI Lib Dir: " ${AMD_SMI_LIB_DIR})
+message("----------SMI Inc Dir: " ${AMD_SMI_INCLUDE_DIR})
 message("---------GRPC Root Dir: " ${GRPC_ROOT})
 message("")
 
@@ -59,7 +59,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include
     "${PROJECT_SOURCE_DIR}/include"
     "${GRPC_ROOT}/include"
     "${PROTOB_OUT_DIR}"
-    "${SMI_INC_DIR}"
+    "${AMD_SMI_INCLUDE_DIR}"
     "${PROJECT_SOURCE_DIR}")
 
 set(SERVER_SRC_LIST
@@ -77,7 +77,7 @@ configure_file("rdc.service.in" "${PROJECT_BINARY_DIR}/${SERVICE_FILE_NAME}" @ON
 set(SERVER_CONFIG_FILE "rdc_options")
 configure_file("${SERVER_CONFIG_FILE}" "${PROJECT_BINARY_DIR}/${SERVER_CONFIG_FILE}" COPYONLY)
 
-link_directories(${SMI_LIB_DIR})
+link_directories(${AMD_SMI_LIB_DIR})
 
 add_executable(${SERVER_DAEMON_EXE} "${SERVER_SRC_LIST}")
 target_compile_definitions(${SERVER_DAEMON_EXE} PRIVATE CURRENT_GIT_HASH=${GIT_HASH})
diff --git a/projects/rdc/tests/example/CMakeLists.txt b/projects/rdc/tests/example/CMakeLists.txt
index a07a0924eb..336bca4114 100755
--- a/projects/rdc/tests/example/CMakeLists.txt
+++ b/projects/rdc/tests/example/CMakeLists.txt
@@ -45,7 +45,7 @@ message("--------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
 message("--------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
 message("--------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
 message("--------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
-message("--------SMI Inc Dir: " ${SMI_INC_DIR})
+message("--------SMI Inc Dir: " ${AMD_SMI_INCLUDE_DIR})
 message("")
 
 set(SRC_DIR "${PROJECT_SOURCE_DIR}/tests/example")
@@ -69,7 +69,7 @@ add_executable(${TEST_CLIENT_EXE} "${EXAMPLE_SRC_LIST}")
 
 target_include_directories(${TEST_CLIENT_EXE} PRIVATE
     "${CMAKE_CURRENT_SOURCE_DIR}/../../client/include"
-    "${SMI_INC_DIR}")
+    "${AMD_SMI_INCLUDE_DIR}")
 
 target_link_libraries(${TEST_CLIENT_EXE} rdc_client)
 
diff --git a/projects/rdc/tests/rdc_tests/CMakeLists.txt b/projects/rdc/tests/rdc_tests/CMakeLists.txt
index 7795d15b0e..273c5f3144 100755
--- a/projects/rdc/tests/rdc_tests/CMakeLists.txt
+++ b/projects/rdc/tests/rdc_tests/CMakeLists.txt
@@ -39,8 +39,8 @@ message("--------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
 message("--------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
 message("--------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
 message("--------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
-message("--------SMI Lib Dir: " ${SMI_LIB_DIR})
-message("--------SMI Inc Dir: " ${SMI_INC_DIR})
+message("--------SMI Lib Dir: " ${AMD_SMI_LIB_DIR})
+message("--------SMI Inc Dir: " ${AMD_SMI_INCLUDE_DIR})
 message("")
 
 set(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
@@ -61,7 +61,7 @@ aux_source_directory(${SRC_DIR} rdctstSources)
 # Other source directories
 aux_source_directory(${SRC_DIR}/functional functionalSources)
 
-link_directories(${ROCM_INSTALL_DIR} ${SMI_LIB_DIR})
+link_directories(${ROCM_INSTALL_DIR} ${AMD_SMI_LIB_DIR})
 
 # Build rules
 add_executable(${RDCTST} ${rdctstSources} ${functionalSources})
@@ -70,7 +70,7 @@ add_executable(${RDCTST} ${rdctstSources} ${functionalSources})
 target_include_directories(
     ${RDCTST}
     PUBLIC ${PROJECT_SOURCE_DIR}/include
-    PUBLIC ${SMI_INC_DIR}
+    PUBLIC ${AMD_SMI_INCLUDE_DIR}
     PUBLIC ${SRC_DIR}/..)
 
 target_link_libraries(${RDCTST}