diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt
index b8e2c6947b..7fbb5f4739 100644
--- a/hipamd/CMakeLists.txt
+++ b/hipamd/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.4.3)
 project(hip)
-# sample command for hip-vdi, you'll need to have vdi installed
+# sample command for hip-rocclr, you'll need to have rocclr installed
 #  cmake -DHIP_COMPILER=clang -DHIP_PLATFORM=vdi ..
-#  cmake -DHIP_COMPILER=clang -DHIP_PLATFORM=vdi -DVDI_DIR=/extra/lmoriche/hip-vdi/vdi -DOPENCL_DIR=/extra/lmoriche/clients/lmoriche_opencl_dev2/drivers/opencl/api/opencl -DLIBVDI_STATIC_DIR=/extra/lmoriche/hip-vdi/build/vdi ..
+#  cmake -DHIP_COMPILER=clang -DHIP_PLATFORM=vdi -DVDI_DIR=/extra/lmoriche/hip-rocclr/rocclr -DOPENCL_DIR=/extra/lmoriche/clients/lmoriche_opencl_dev2/drivers/opencl/api/opencl -DLIBVDI_STATIC_DIR=/extra/lmoriche/hip-rocclr/build/rocclr ..
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
@@ -530,10 +530,10 @@ if(HIP_PLATFORM STREQUAL "hcc")
     DEPENDS hip_hcc hip_hcc_static hiprtc)
 else()
   set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/vdi)
-  configure_file(packaging/hip-vdi.txt ${BUILD_DIR}/CMakeLists.txt @ONLY)
-  configure_file(packaging/hip-vdi.postinst ${BUILD_DIR}/postinst @ONLY)
-  configure_file(packaging/hip-vdi.prerm ${BUILD_DIR}/prerm @ONLY)
-  add_custom_target(hip_on_vdi COMMAND ${CMAKE_COMMAND} .
+  configure_file(packaging/hip-rocclr.txt ${BUILD_DIR}/CMakeLists.txt @ONLY)
+  configure_file(packaging/hip-rocclr.postinst ${BUILD_DIR}/postinst @ONLY)
+  configure_file(packaging/hip-rocclr.prerm ${BUILD_DIR}/prerm @ONLY)
+  add_custom_target(hip_on_rocclr COMMAND ${CMAKE_COMMAND} .
     COMMAND rm -rf *.deb *.rpm *.tar.gz
     COMMAND make package
     COMMAND cp *.deb ${PROJECT_BINARY_DIR}
@@ -594,7 +594,7 @@ elseif(HIP_PLATFORM STREQUAL "vdi")
     add_custom_target(package
     COMMAND bash ${PROJECT_BINARY_DIR}/fixnames
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-    DEPENDS pkg_hip_base hip_on_vdi pkg_hip_nvcc pkg_hip_doc pkg_hip_samples)
+    DEPENDS pkg_hip_base hip_on_rocclr pkg_hip_nvcc pkg_hip_doc pkg_hip_samples)
 endif()
 
 if(POLICY CMP0037)
diff --git a/hipamd/packaging/hip-vdi.postinst b/hipamd/packaging/hip-rocclr.postinst
similarity index 100%
rename from hipamd/packaging/hip-vdi.postinst
rename to hipamd/packaging/hip-rocclr.postinst
diff --git a/hipamd/packaging/hip-vdi.prerm b/hipamd/packaging/hip-rocclr.prerm
similarity index 100%
rename from hipamd/packaging/hip-vdi.prerm
rename to hipamd/packaging/hip-rocclr.prerm
diff --git a/hipamd/packaging/hip-vdi.txt b/hipamd/packaging/hip-rocclr.txt
similarity index 100%
rename from hipamd/packaging/hip-vdi.txt
rename to hipamd/packaging/hip-rocclr.txt
diff --git a/hipamd/vdi/CMakeLists.txt b/hipamd/vdi/CMakeLists.txt
index 5460b2ba6b..5283748724 100644
--- a/hipamd/vdi/CMakeLists.txt
+++ b/hipamd/vdi/CMakeLists.txt
@@ -28,7 +28,7 @@ set(USE_PROF_API "1")
 if(NOT DEFINED LIBVDI_STATIC_DIR)
    find_path(LIBVDI_STATIC_DIR
         NAMES libamdvdi_static.a
-        PATHS /opt/rocm/vdi
+        PATHS /opt/rocm/rocclr
         PATH_SUFFIXES lib
    )
 endif()
@@ -37,10 +37,10 @@ if(NOT DEFINED VDI_DIR)
    find_path(VDI_DIR
         NAMES top.hpp
         PATH_SUFFIXES include
-        PATHS /opt/rocm/vdi
+        PATHS /opt/rocm/rocclr
    )
 endif()
-message("Found Static vdi lib:${LIBVDI_STATIC_DIR} and vdi includes: ${VDI_DIR}")
+message("Found Static rocclr lib:${LIBVDI_STATIC_DIR} and rocclr includes: ${VDI_DIR}")
 set(PROF_API_HEADER_PATH ${VDI_DIR}/platform)
 #############################
 # Profiling API support
@@ -161,7 +161,7 @@ set_target_properties(
         VERSION ${HIP_LIB_VERSION_STRING}
         SOVERSION ${HIP_LIB_VERSION_MAJOR}
 )
-# We expect amdhip64_static to contain objects of vdi and hip. But linker
+# We expect amdhip64_static to contain objects of rocclr and hip. But linker
 # let amdhip64_static contain objects of hip only. So we will use a
 # a custom amdhip64_static_combiner to combine objects of vid and hip into
 # amdhip64_static. To avoid amdhip64_static contains itself,