diff --git a/projects/clr/hipamd/CMakeLists.txt b/projects/clr/hipamd/CMakeLists.txt
index 8048f712e1..28f9daf015 100755
--- a/projects/clr/hipamd/CMakeLists.txt
+++ b/projects/clr/hipamd/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.4.3)
 project(hip)
 # 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-rocclr/rocclr -DOPENCL_DIR=/extra/lmoriche/clients/lmoriche_opencl_dev2/drivers/opencl/api/opencl -DLIBVDI_STATIC_DIR=/extra/lmoriche/hip-rocclr/build/rocclr ..
+#  cmake -DHIP_COMPILER=clang -DHIP_PLATFORM=rocclr ..
+#  cmake -DHIP_COMPILER=clang -DHIP_PLATFORM=rocclr -DROCclr_DIR=/extra/lmoriche/hip-rocclr/rocclr -DOPENCL_DIR=/extra/lmoriche/clients/lmoriche_opencl_dev2/drivers/opencl/api/opencl -DLIBROCclr_STATIC_DIR=/extra/lmoriche/hip-rocclr/build/rocclr ..
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
@@ -123,19 +123,19 @@ message(STATUS "HIP Compiler: " ${HIP_COMPILER})
 add_to_config(_buildInfo HIP_COMPILER)
 
 # Determine HIP_RUNTIME
-# Either HCC or VDI; default is HCC
+# Either HCC or ROCclr; default is HCC
 if(NOT DEFINED ENV{HIP_RUNTIME})
   if(HIP_PLATFORM STREQUAL "hcc")
     set(HIP_RUNTIME "HCC" CACHE STRING "HIP Runtime")
-  elseif (HIP_PLATFORM STREQUAL "vdi")
-    set(HIP_RUNTIME "VDI" CACHE STRING "HIP Runtime")
+  elseif (HIP_PLATFORM STREQUAL "rocclr")
+    set(HIP_RUNTIME "ROCclr" CACHE STRING "HIP Runtime")
   elseif (HIP_PLATFORM STREQUAL "nvcc")
     set(HIP_RUNTIME "CUDA" CACHE STRING "HIP Runtime")
   endif()
 endif()
 add_to_config(_buildInfo HIP_RUNTIME)
 
-if(HIP_PLATFORM STREQUAL "vdi")
+if(HIP_PLATFORM STREQUAL "rocclr")
    set(USE_PROF_API "1")
 endif()
 
@@ -283,7 +283,7 @@ endif()
 #    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lpl_ca)
 #endif ()
 
-if(HIP_PLATFORM STREQUAL "vdi")
+if(HIP_PLATFORM STREQUAL "rocclr")
     # Determine HSA_PATH
     if(NOT DEFINED HSA_PATH)
         if(NOT DEFINED ENV{HSA_PATH})
@@ -299,14 +299,14 @@ if(HIP_PLATFORM STREQUAL "vdi")
     endif()
 
     include_directories(${PROJECT_SOURCE_DIR}/include)
-    add_subdirectory(vdi)
+    add_subdirectory(rocclr)
     file(WRITE "${PROJECT_BINARY_DIR}/.hipInfo" ${_buildInfo})
 
 
-# set(VDI_CXX_FLAGS  "-hc -fno-gpu-rdc --amdgpu-target=gfx803 --amdgpu-target=gfx900 --amdgpu-target=gfx906 --amdgpu-target=gfx908 ")
-    set(HIP_VDI_BUILD_FLAGS "${HIP_VDI_BUILD_FLAGS} -fPIC ${VDI_CXX_FLAGS} -I${HSA_PATH}/include")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HIP_VDI_BUILD_FLAGS}")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HIP_VDI_BUILD_FLAGS}")
+# set(ROCclr_CXX_FLAGS  "-hc -fno-gpu-rdc --amdgpu-target=gfx803 --amdgpu-target=gfx900 --amdgpu-target=gfx906 --amdgpu-target=gfx908 ")
+    set(HIP_ROCclr_BUILD_FLAGS "${HIP_ROCclr_BUILD_FLAGS} -fPIC ${ROCclr_CXX_FLAGS} -I${HSA_PATH}/include")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HIP_ROCclr_BUILD_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HIP_ROCclr_BUILD_FLAGS}")
     set(HCC_CXX_FLAGS  "-hc -fno-gpu-rdc --amdgpu-target=gfx803 --amdgpu-target=gfx900 --amdgpu-target=gfx906 --amdgpu-target=gfx908 ")
     set(HIP_HCC_BUILD_FLAGS "${HIP_HCC_BUILD_FLAGS} -fPIC ${HCC_CXX_FLAGS} -I${HSA_PATH}/include")
 
@@ -408,7 +408,7 @@ if(HIP_PLATFORM STREQUAL "hcc")
     file(WRITE "${PROJECT_BINARY_DIR}/.hipInfo" ${_buildInfo})
 endif()
 
-if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "vdi")
+if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "rocclr")
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lpl_ca)
 endif()
 # Generate .hipVersion
@@ -443,7 +443,7 @@ if(HIP_PLATFORM STREQUAL "hcc")
 endif()
 
 # Install .hipInfo
-if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "vdi")
+if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "rocclr")
     install(FILES ${PROJECT_BINARY_DIR}/.hipInfo DESTINATION lib)
 endif()
 
@@ -475,8 +475,8 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/hip
 if(HIP_PLATFORM STREQUAL "hcc")
     install(TARGETS hip_hcc_static hip_hcc host device EXPORT hip-targets DESTINATION ${LIB_INSTALL_DIR})
     install(EXPORT hip-targets DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR} NAMESPACE hip::)
-elseif( HIP_PLATFORM STREQUAL "vdi")
-#    install(TARGETS hip_on_vdi host device EXPORT hip-targets DESTINATION ${LIB_INSTALL_DIR})
+elseif( HIP_PLATFORM STREQUAL "rocclr")
+#    install(TARGETS hip_on_rocclr host device EXPORT hip-targets DESTINATION ${LIB_INSTALL_DIR})
 endif()
     include(CMakePackageConfigHelpers)
 
@@ -539,7 +539,7 @@ if(HIP_PLATFORM STREQUAL "hcc")
     WORKING_DIRECTORY ${BUILD_DIR}
     DEPENDS hip_hcc hip_hcc_static hiprtc)
 else()
-  set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/vdi)
+  set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/rocclr)
   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)
@@ -600,7 +600,7 @@ if(HIP_PLATFORM STREQUAL "hcc")
     COMMAND bash ${PROJECT_BINARY_DIR}/fixnames
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
     DEPENDS pkg_hip_base pkg_hip_hcc pkg_hip_nvcc pkg_hip_doc pkg_hip_samples)
-elseif(HIP_PLATFORM STREQUAL "vdi")
+elseif(HIP_PLATFORM STREQUAL "rocclr")
     add_custom_target(package
     COMMAND bash ${PROJECT_BINARY_DIR}/fixnames
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
diff --git a/projects/clr/hipamd/bin/hipcc b/projects/clr/hipamd/bin/hipcc
index 87ac826b3c..d5ae94f9c3 100755
--- a/projects/clr/hipamd/bin/hipcc
+++ b/projects/clr/hipamd/bin/hipcc
@@ -26,7 +26,7 @@ use Cwd 'abs_path';
 #                  script's abs_path). Used on AMD platforms only.
 # HSA_PATH       : Path to HSA dir (defaults to ../../hsa relative to abs_path
 #                  of this script). Used on AMD platforms only.
-# HIP_VDI_HOME   : Path to HIP/VDI directory. Used on AMD platforms only.
+# HIP_ROCclr_HOME : Path to HIP/ROCclr directory. Used on AMD platforms only.
 # HIP_CLANG_PATH : Path to HIP-Clang (default to ../../llvm/bin relative to this
 #                  script's abs_path). Used on AMD platforms only.
 
@@ -82,15 +82,15 @@ if (-e "$HIP_PATH/../.info/version") {
 } else {
     $ROCM_PATH=$ENV{'ROCM_PATH'} // "/opt/rocm";
 }
-$HIP_VDI_HOME=$ENV{'HIP_VDI_HOME'};
+$HIP_ROCclr_HOME=$ENV{'HIP_ROCclr_HOME'};
 $HIP_LIB_PATH=$ENV{'HIP_LIB_PATH'};
 $HIP_CLANG_PATH=$ENV{'HIP_CLANG_PATH'};
 $DEVICE_LIB_PATH=$ENV{'DEVICE_LIB_PATH'};
 $HIP_CLANG_HCC_COMPAT_MODE=$ENV{'HIP_CLANG_HCC_COMPAT_MODE'}; # HCC compatibility mode
 $HIP_COMPILE_CXX_AS_HIP=$ENV{'HIP_COMPILE_CXX_AS_HIP'} // "1";
 
-if (defined $HIP_VDI_HOME) {
-    $HIP_INFO_PATH= "$HIP_VDI_HOME/lib/.hipInfo";
+if (defined $HIP_ROCclr_HOME) {
+    $HIP_INFO_PATH= "$HIP_ROCclr_HOME/lib/.hipInfo";
 } else {
     $HIP_INFO_PATH= "$HIP_PATH/lib/.hipInfo"; # use actual file
 }
@@ -130,28 +130,28 @@ $HIP_COMPILER= `$HIP_PATH/bin/hipconfig --compiler`;
 #HIP_RUNTIME controls whether to use HCC, VDI, or NVCC as the runtime:
 $HIP_RUNTIME= `$HIP_PATH/bin/hipconfig --runtime`;
 
-# If using VDI runtime, need to find HIP_VDI_HOME
-if (defined $HIP_RUNTIME and $HIP_RUNTIME eq "VDI" and !defined $HIP_VDI_HOME) {
+# If using ROCclr runtime, need to find HIP_ROCclr_HOME
+if (defined $HIP_RUNTIME and $HIP_RUNTIME eq "ROCclr" and !defined $HIP_ROCclr_HOME) {
     my $hipcc_dir = dirname($0);
     if (-e "$hipcc_dir/../lib/bitcode") {
-        $HIP_VDI_HOME = abs_path($hipcc_dir . "/..");
+        $HIP_ROCclr_HOME = abs_path($hipcc_dir . "/..");
     } else {
-        $HIP_VDI_HOME = $HIP_PATH; # use HIP_PATH
+        $HIP_ROCclr_HOME = $HIP_PATH; # use HIP_PATH
     }
-    $HIPCXXFLAGS .= "-D__HIP_VDI__";
-    $HIPCFLAGS .= "-D__HIP_VDI__";
+    $HIPCXXFLAGS .= "-D__HIP_ROCclr__";
+    $HIPCFLAGS .= "-D__HIP_ROCclr__";
 }
 
-if (defined $HIP_VDI_HOME) {
-    if (!defined $HIP_CLANG_PATH and (-e "$HIP_VDI_HOME/bin/clang" or -e "$HIP_VDI_HOME/bin/clang.exe")) {
-        $HIP_CLANG_PATH = "$HIP_VDI_HOME/bin";
+if (defined $HIP_ROCclr_HOME) {
+    if (!defined $HIP_CLANG_PATH and (-e "$HIP_ROCclr_HOME/bin/clang" or -e "$HIP_ROCclr_HOME/bin/clang.exe")) {
+        $HIP_CLANG_PATH = "$HIP_ROCclr_HOME/bin";
     }
-    if (!defined $DEVICE_LIB_PATH and -e "$HIP_VDI_HOME/lib/bitcode") {
-        $DEVICE_LIB_PATH = "$HIP_VDI_HOME/lib/bitcode";
+    if (!defined $DEVICE_LIB_PATH and -e "$HIP_ROCclr_HOME/lib/bitcode") {
+        $DEVICE_LIB_PATH = "$HIP_ROCclr_HOME/lib/bitcode";
     }
-    $HIP_INCLUDE_PATH = "$HIP_VDI_HOME/include";
+    $HIP_INCLUDE_PATH = "$HIP_ROCclr_HOME/include";
     if (!defined $HIP_LIB_PATH) {
-        $HIP_LIB_PATH = "$HIP_VDI_HOME/lib";
+        $HIP_LIB_PATH = "$HIP_ROCclr_HOME/lib";
     }
 }
 
@@ -199,8 +199,8 @@ if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") {
         $HIP_LIB_PATH = "$HIP_PATH/lib";
     }
     if ($verbose & 0x2) {
-        if (defined $HIP_VDI_HOME) {
-            print ("HIP_VDI_HOME=$HIP_VDI_HOME\n");
+        if (defined $HIP_ROCclr_HOME) {
+            print ("HIP_ROCclr_HOME=$HIP_ROCclr_HOME\n");
         }
         print ("HIP_CLANG_PATH=$HIP_CLANG_PATH\n");
         print ("HIP_CLANG_INCLUDE_PATH=$HIP_CLANG_INCLUDE_PATH\n");
@@ -229,8 +229,8 @@ if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") {
     $HIPCXXFLAGS .= " -isystem $HSA_PATH/include";
     $HIPCFLAGS .= " -isystem $HSA_PATH/include";
     if ($HIP_RUNTIME ne "HCC" ) {
-      $HIPCXXFLAGS .= " -D__HIP_VDI__";
-      $HIPCFLAGS .= " -D__HIP_VDI__";
+      $HIPCXXFLAGS .= " -D__HIP_ROCclr__";
+      $HIPCFLAGS .= " -D__HIP_ROCclr__";
     }
 
 } elsif ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "hcc") {
diff --git a/projects/clr/hipamd/bin/hipconfig b/projects/clr/hipamd/bin/hipconfig
index b3414213f2..03b412421b 100755
--- a/projects/clr/hipamd/bin/hipconfig
+++ b/projects/clr/hipamd/bin/hipconfig
@@ -33,7 +33,7 @@ if ($p_help) {
     print "  --cpp_config, -C   : print C++ compiler options\n";
     print "  --compiler, -c     : print compiler (hcc or clang or nvcc)\n";
     print "  --platform, -P     : print platform (hcc or nvcc)\n";
-    print "  --runtime, -r      : print runtime (HCC or VDI)\n";
+    print "  --runtime, -r      : print runtime (HCC or ROCclr)\n";
     print "  --full, -f         : print full config\n";
     print "  --version, -v      : print hip version\n";
     print "  --check            : check configuration\n";
diff --git a/projects/clr/hipamd/hip-config.cmake.in b/projects/clr/hipamd/hip-config.cmake.in
index 859e2fa0fc..9ff5832cd9 100644
--- a/projects/clr/hipamd/hip-config.cmake.in
+++ b/projects/clr/hipamd/hip-config.cmake.in
@@ -111,14 +111,14 @@ set_target_properties(hip::host PROPERTIES
   INTERFACE_COMPILE_DEFINITIONS "__HIP_PLATFORM_HCC__=1"
 )
 
-if(HIP_RUNTIME MATCHES "VDI")
+if(HIP_RUNTIME MATCHES "ROCclr")
   set_target_properties(hip::amdhip64 PROPERTIES
-    INTERFACE_COMPILE_DEFINITIONS "__HIP_VDI__=1"
+    INTERFACE_COMPILE_DEFINITIONS "__HIP_ROCclr__=1"
     INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}"
     INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}"
   )
   set_target_properties(hip::device PROPERTIES
-    INTERFACE_COMPILE_DEFINITIONS "__HIP_VDI__=1"
+    INTERFACE_COMPILE_DEFINITIONS "__HIP_ROCclr__=1"
     INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
     INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
   )
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/channel_descriptor.h b/projects/clr/hipamd/include/hip/hcc_detail/channel_descriptor.h
index a69558c8e4..417451fb85 100644
--- a/projects/clr/hipamd/include/hip/hcc_detail/channel_descriptor.h
+++ b/projects/clr/hipamd/include/hip/hcc_detail/channel_descriptor.h
@@ -29,12 +29,12 @@ THE SOFTWARE.
 
 #ifdef __cplusplus
 
-#if __HIP_VDI__
+#if __HIP_ROCclr__
 extern "C" {
 #endif
 HIP_PUBLIC_API
 hipChannelFormatDesc hipCreateChannelDesc(int x, int y, int z, int w, hipChannelFormatKind f);
-#if __HIP_VDI__
+#if __HIP_ROCclr__
 }
 #endif
 
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/device_functions.h b/projects/clr/hipamd/include/hip/hcc_detail/device_functions.h
index 76ac8710d5..eaee437cea 100644
--- a/projects/clr/hipamd/include/hip/hcc_detail/device_functions.h
+++ b/projects/clr/hipamd/include/hip/hcc_detail/device_functions.h
@@ -34,7 +34,7 @@ THE SOFTWARE.
 #include <hip/hcc_detail/device_library_decls.h>
 #include <hip/hcc_detail/llvm_intrinsics.h>
 
-#if __HIP_CLANG_ONLY__ && __HIP_VDI__ && !_WIN32
+#if __HIP_CLANG_ONLY__ && __HIP_ROCclr__ && !_WIN32
 extern "C" __device__ int printf(const char *fmt, ...);
 #else
 #if HC_FEATURE_PRINTF
@@ -46,7 +46,7 @@ static inline __device__ void printf(const char* format, All... all) {
 template <typename... All>
 static inline __device__ void printf(const char* format, All... all) {}
 #endif // HC_FEATURE_PRINTF
-#endif // __HIP_CLANG_ONLY__ && __HIP_VDI__
+#endif // __HIP_CLANG_ONLY__ && __HIP_ROCclr__
 
 /*
 Integer Intrinsics
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h b/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h
index 47b84bd022..7363f904ed 100644
--- a/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h
+++ b/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h
@@ -35,8 +35,8 @@ THE SOFTWARE.
 #define GENERIC_GRID_LAUNCH 1
 #endif
 
-#ifndef __HIP_VDI__
-#define __HIP_VDI__ 0
+#ifndef __HIP_ROCclr__
+#define __HIP_ROCclr__ 0
 #endif
 
 #include <hip/hcc_detail/host_defines.h>
@@ -44,7 +44,7 @@ THE SOFTWARE.
 #include <hip/hcc_detail/hip_texture_types.h>
 #include <hip/hcc_detail/hip_surface_types.h>
 
-#if !__HIP_VDI__ && defined(__cplusplus)
+#if !__HIP_ROCclr__ && defined(__cplusplus)
 #include <hsa/hsa.h>
 #include <hip/hcc_detail/program_state.hpp>
 #endif
@@ -105,7 +105,7 @@ typedef struct hipIpcMemHandle_st {
     char reserved[HIP_IPC_HANDLE_SIZE];
 } hipIpcMemHandle_t;
 
-#if __HIP_VDI__
+#if __HIP_ROCclr__
 // TODO: IPC event handle currently unsupported
 struct ihipIpcEventHandle_t;
 typedef struct ihipIpcEventHandle_t* hipIpcEventHandle_t;
@@ -1483,7 +1483,7 @@ hipError_t hipMemcpyDtoHAsync(void* dst, hipDeviceptr_t src, size_t sizeBytes, h
 hipError_t hipMemcpyDtoDAsync(hipDeviceptr_t dst, hipDeviceptr_t src, size_t sizeBytes,
                               hipStream_t stream);
 
-#if __HIP_VDI__
+#if __HIP_ROCclr__
 hipError_t hipModuleGetGlobal(hipDeviceptr_t* dptr, size_t* bytes,
     hipModule_t hmod, const char* name);
 
@@ -1700,7 +1700,7 @@ hipError_t hipMemcpyFromSymbolAsync(void* dst, const void* symbolName,
 }
 #endif // End : Not supported in gcc
 
-#endif // __HIP_VDI__
+#endif // __HIP_ROCclr__
 /**
  *  @brief Copy data from src to dst asynchronously.
  *
@@ -2844,7 +2844,7 @@ hipError_t hipFuncGetAttributes(struct hipFuncAttributes* attr, const void* func
  */
 hipError_t hipFuncGetAttribute(int* value, hipFunction_attribute attrib, hipFunction_t hfunc);
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 #if defined(__cplusplus)
 } // extern "C"
 #endif
@@ -2899,7 +2899,7 @@ extern "C" {
  */
 hipError_t hipModuleGetGlobal(hipDeviceptr_t* dptr, size_t* bytes,
                               hipModule_t hmod, const char* name);
-#endif // __HIP_VDI__
+#endif // __HIP_ROCclr__
 
 hipError_t hipModuleGetTexRef(textureReference** texRef, hipModule_t hmod, const char* name);
 
@@ -2960,7 +2960,7 @@ hipError_t hipModuleLaunchKernel(hipFunction_t f, unsigned int gridDimX, unsigne
                                  void** kernelParams, void** extra);
 
 
-#if __HIP_VDI__ && !defined(__HCC__)
+#if __HIP_ROCclr__ && !defined(__HCC__)
 /**
  * @brief launches kernel f with launch parameters and shared memory on stream with arguments passed
  * to kernelparams or extra, where thread blocks can cooperate and synchronize as they execute
@@ -3345,7 +3345,7 @@ hipError_t hipLaunchKernel(const void* function_address,
                            size_t sharedMemBytes __dparm(0),
                            hipStream_t stream __dparm(0));
 
-#if __HIP_VDI__
+#if __HIP_ROCclr__
 hipError_t hipBindTexture(
     size_t* offset,
     const textureReference* tex,
@@ -3646,12 +3646,12 @@ inline hipError_t hipOccupancyMaxActiveBlocksPerMultiprocessorWithFlags(
 
 class TlsData;
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 hipError_t hipBindTexture(size_t* offset, textureReference* tex, const void* devPtr,
                           const hipChannelFormatDesc* desc, size_t size = UINT_MAX);
 #endif
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 hipError_t ihipBindTextureImpl(TlsData *tls, int dim, enum hipTextureReadMode readMode, size_t* offset,
                                const void* devPtr, const struct hipChannelFormatDesc* desc,
                                size_t size, textureReference* tex);
@@ -3672,7 +3672,7 @@ hipError_t ihipBindTextureImpl(TlsData *tls, int dim, enum hipTextureReadMode re
  *  @param[in]  size - Size of the memory area pointed to by devPtr
  *  @return #hipSuccess, #hipErrorInvalidValue, #hipErrorMemoryFree, #hipErrorUnknown
  **/
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 template <class T, int dim, enum hipTextureReadMode readMode>
 hipError_t hipBindTexture(size_t* offset, struct texture<T, dim, readMode>& tex, const void* devPtr,
                           const struct hipChannelFormatDesc& desc, size_t size = UINT_MAX) {
@@ -3694,7 +3694,7 @@ hipError_t hipBindTexture(size_t* offset, struct texture<T, dim, readMode>& tex,
  *  @param[in]  size - Size of the memory area pointed to by devPtr
  *  @return #hipSuccess, #hipErrorInvalidValue, #hipErrorMemoryFree, #hipErrorUnknown
  **/
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 template <class T, int dim, enum hipTextureReadMode readMode>
 hipError_t hipBindTexture(size_t* offset, struct texture<T, dim, readMode>& tex, const void* devPtr,
                           size_t size = UINT_MAX) {
@@ -3703,19 +3703,19 @@ hipError_t hipBindTexture(size_t* offset, struct texture<T, dim, readMode>& tex,
 #endif
 
 // C API
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 hipError_t hipBindTexture2D(size_t* offset, textureReference* tex, const void* devPtr,
                             const hipChannelFormatDesc* desc, size_t width, size_t height,
                             size_t pitch);
 #endif
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 hipError_t ihipBindTexture2DImpl(int dim, enum hipTextureReadMode readMode, size_t* offset,
                                  const void* devPtr, const struct hipChannelFormatDesc* desc,
                                  size_t width, size_t height, textureReference* tex, size_t pitch);
 #endif
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 template <class T, int dim, enum hipTextureReadMode readMode>
 hipError_t hipBindTexture2D(size_t* offset, struct texture<T, dim, readMode>& tex,
                             const void* devPtr, size_t width, size_t height, size_t pitch) {
@@ -3724,7 +3724,7 @@ hipError_t hipBindTexture2D(size_t* offset, struct texture<T, dim, readMode>& te
 }
 #endif
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 template <class T, int dim, enum hipTextureReadMode readMode>
 hipError_t hipBindTexture2D(size_t* offset, struct texture<T, dim, readMode>& tex,
                             const void* devPtr, const struct hipChannelFormatDesc& desc,
@@ -3734,26 +3734,26 @@ hipError_t hipBindTexture2D(size_t* offset, struct texture<T, dim, readMode>& te
 #endif
 
 // C API
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 hipError_t hipBindTextureToArray(textureReference* tex, hipArray_const_t array,
                                  const hipChannelFormatDesc* desc);
 #endif
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 hipError_t ihipBindTextureToArrayImpl(TlsData *tls, int dim, enum hipTextureReadMode readMode,
                                       hipArray_const_t array,
                                       const struct hipChannelFormatDesc& desc,
                                       textureReference* tex);
 #endif
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 template <class T, int dim, enum hipTextureReadMode readMode>
 hipError_t hipBindTextureToArray(struct texture<T, dim, readMode>& tex, hipArray_const_t array) {
     return ihipBindTextureToArrayImpl(nullptr, dim, readMode, array, tex.channelDesc, &tex);
 }
 #endif
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 template <class T, int dim, enum hipTextureReadMode readMode>
 hipError_t hipBindTextureToArray(struct texture<T, dim, readMode>& tex, hipArray_const_t array,
                                  const struct hipChannelFormatDesc& desc) {
@@ -3761,7 +3761,7 @@ hipError_t hipBindTextureToArray(struct texture<T, dim, readMode>& tex, hipArray
 }
 #endif
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 template <class T, int dim, enum hipTextureReadMode readMode>
 inline static hipError_t hipBindTextureToArray(struct texture<T, dim, readMode> *tex,
                                                hipArray_const_t array,
@@ -3771,13 +3771,13 @@ inline static hipError_t hipBindTextureToArray(struct texture<T, dim, readMode>
 #endif
 
 // C API
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 hipError_t hipBindTextureToMipmappedArray(const textureReference* tex,
                                           hipMipmappedArray_const_t mipmappedArray,
                                           const hipChannelFormatDesc* desc);
 #endif
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 template <class T, int dim, enum hipTextureReadMode readMode>
 hipError_t hipBindTextureToMipmappedArray(const texture<T, dim, readMode>& tex,
                                           hipMipmappedArray_const_t mipmappedArray) {
@@ -3785,7 +3785,7 @@ hipError_t hipBindTextureToMipmappedArray(const texture<T, dim, readMode>& tex,
 }
 #endif
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 template <class T, int dim, enum hipTextureReadMode readMode>
 hipError_t hipBindTextureToMipmappedArray(const texture<T, dim, readMode>& tex,
                                           hipMipmappedArray_const_t mipmappedArray,
@@ -3794,7 +3794,7 @@ hipError_t hipBindTextureToMipmappedArray(const texture<T, dim, readMode>& tex,
 }
 #endif
 
-#if __HIP_VDI__ && !defined(__HCC__)
+#if __HIP_ROCclr__ && !defined(__HCC__)
 
 template <typename F>
 inline hipError_t hipOccupancyMaxPotentialBlockSize(int* gridSize, int* blockSize,
@@ -3831,22 +3831,22 @@ inline hipError_t hipExtLaunchMultiKernelMultiDevice(hipLaunchParams* launchPara
  *
  *  @return #hipSuccess
  **/
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 hipError_t hipUnbindTexture(const textureReference* tex);
 #endif
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 extern hipError_t ihipUnbindTextureImpl(const hipTextureObject_t& textureObject);
 #endif
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 template <class T, int dim, enum hipTextureReadMode readMode>
 hipError_t hipUnbindTexture(struct texture<T, dim, readMode>& tex) {
     return ihipUnbindTextureImpl(tex.textureObject);
 }
 #endif
 
-#if !__HIP_VDI__
+#if !__HIP_ROCclr__
 hipError_t hipGetChannelDesc(hipChannelFormatDesc* desc, hipArray_const_t array);
 hipError_t hipGetTextureAlignmentOffset(size_t* offset, const textureReference* texref);
 hipError_t hipGetTextureReference(const textureReference** texref, const void* symbol);
@@ -3890,7 +3890,7 @@ hipError_t hipCreateSurfaceObject(hipSurfaceObject_t* pSurfObject, const hipReso
 
 hipError_t hipDestroySurfaceObject(hipSurfaceObject_t surfaceObject);
 
-#if __HIP_VDI__
+#if __HIP_ROCclr__
 template<class T, int dim, enum hipTextureReadMode readMode>
 static inline hipError_t hipBindTexture(
     size_t *offset,
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_prof.h b/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_prof.h
index 4d4eccb54d..ffd8b0ab8e 100644
--- a/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_prof.h
+++ b/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_prof.h
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef HIP_INCLUDE_HIP_HCC_DETAIL_HIP_RUNTIME_PROF_H
 #define HIP_INCLUDE_HIP_HCC_DETAIL_HIP_RUNTIME_PROF_H
 
-// HIP VDI Op IDs enumeration
+// HIP ROCclr Op IDs enumeration
 enum HipVdiOpId {
   kHipVdiOpIdDispatch = 0,
   kHipVdiOpIdCopy     = 1,
@@ -31,7 +31,7 @@ enum HipVdiOpId {
   kHipVdiOpIdNumber   = 3
 };
 
-// Types of VDI commands
+// Types of ROCclr commands
 enum HipVdiCommandKind {
   kHipVdiCommandKernel            = 0x11F0,
   kHipVdiMemcpyDeviceToHost       = 0x11F3,
diff --git a/projects/clr/hipamd/include/hip/hip_ext.h b/projects/clr/hipamd/include/hip/hip_ext.h
index 9b54f7fa57..90d1e34d2d 100644
--- a/projects/clr/hipamd/include/hip/hip_ext.h
+++ b/projects/clr/hipamd/include/hip/hip_ext.h
@@ -109,7 +109,7 @@ hipError_t hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX,
                                     hipEvent_t stopEvent = nullptr)
                                     __attribute__((deprecated("use hipExtModuleLaunchKernel instead")));
 
-//#if !__HIP_VDI__ && defined(__cplusplus)
+//#if !__HIP_ROCclr__ && defined(__cplusplus)
 #if defined(__HIP_PLATFORM_HCC__) && GENERIC_GRID_LAUNCH == 1 && defined(__HCC__)
 //kernel_descriptor and hip_impl::make_kernarg are in "grid_launch_GGL.hpp"
 
@@ -163,7 +163,7 @@ void hipExtLaunchKernelGGL(F kernel, const dim3& numBlocks,
                                         stream, startEvent, stopEvent, flags,
                                         &config[0]);
 }
-#endif // !__HIP_VDI__ && defined(__cplusplus)
+#endif // !__HIP_ROCclr__ && defined(__cplusplus)
 
 // doxygen end AMD-specific features
 /**
diff --git a/projects/clr/hipamd/vdi/CMakeLists.txt b/projects/clr/hipamd/rocclr/CMakeLists.txt
similarity index 79%
rename from projects/clr/hipamd/vdi/CMakeLists.txt
rename to projects/clr/hipamd/rocclr/CMakeLists.txt
index 5defe45ac1..ef30ddb8aa 100644
--- a/projects/clr/hipamd/vdi/CMakeLists.txt
+++ b/projects/clr/hipamd/rocclr/CMakeLists.txt
@@ -15,7 +15,7 @@ set(CONFIG_PACKAGE_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/hip)
 
 find_package(PythonInterp REQUIRED)
 
-add_definitions(-D__HIP_VDI__ -D__HIP_PLATFORM_HCC__ -DLINUX -D__x86_64__ -D__AMD64__ -DUNIX_OS -DqLittleEndian -DOPENCL_MAJOR=2 -DOPENCL_MINOR=0 -DCL_TARGET_OPENCL_VERSION=220 -DWITH_AQL -DWITH_ONLINE_COMPILER -DATI_OS_LINUX -DATI_ARCH_X86 -DLITTLEENDIAN_CPU -DATI_BITS_64 -DATI_COMP_GCC -DWITH_HSA_DEVICE -DWITH_TARGET_AMDGCN -DOPENCL_EXPORTS -DCL_USE_DEPRECATED_OPENCL_1_0_APIS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS -DCL_USE_DEPRECATED_OPENCL_1_2_APIS -DCL_USE_DEPRECATED_OPENCL_2_0_APIS -DVEGA10_ONLY=false -DWITH_LIGHTNING_COMPILER -DUSE_PROF_API)
+add_definitions(-D__HIP_ROCclr__ -D__HIP_PLATFORM_HCC__ -DLINUX -D__x86_64__ -D__AMD64__ -DUNIX_OS -DqLittleEndian -DOPENCL_MAJOR=2 -DOPENCL_MINOR=0 -DCL_TARGET_OPENCL_VERSION=220 -DWITH_AQL -DWITH_ONLINE_COMPILER -DATI_OS_LINUX -DATI_ARCH_X86 -DLITTLEENDIAN_CPU -DATI_BITS_64 -DATI_COMP_GCC -DWITH_HSA_DEVICE -DWITH_TARGET_AMDGCN -DOPENCL_EXPORTS -DCL_USE_DEPRECATED_OPENCL_1_0_APIS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS -DCL_USE_DEPRECATED_OPENCL_1_2_APIS -DCL_USE_DEPRECATED_OPENCL_2_0_APIS -DVEGA10_ONLY=false -DWITH_LIGHTNING_COMPILER -DUSE_PROF_API)
 
 if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
   add_definitions(-DDEBUG)
@@ -27,23 +27,23 @@ endif()
 
 set(USE_PROF_API "1")
 
-if(NOT DEFINED LIBVDI_STATIC_DIR)
-   find_path(LIBVDI_STATIC_DIR
-        NAMES libamdvdi_static.a
+if(NOT DEFINED LIBROCclr_STATIC_DIR)
+   find_path(LIBROCclr_STATIC_DIR
+        NAMES libamdrocclr_static.a
         PATHS /opt/rocm/rocclr
         PATH_SUFFIXES lib
    )
 endif()
 
-if(NOT DEFINED VDI_DIR)
-   find_path(VDI_DIR
+if(NOT DEFINED ROCclr_DIR)
+   find_path(ROCclr_DIR
         NAMES top.hpp
         PATH_SUFFIXES include
         PATHS /opt/rocm/rocclr
    )
 endif()
-message("Found Static rocclr lib:${LIBVDI_STATIC_DIR} and rocclr includes: ${VDI_DIR}")
-set(PROF_API_HEADER_PATH ${VDI_DIR}/platform)
+message("Found Static rocclr lib:${LIBROCclr_STATIC_DIR} and rocclr includes: ${ROCclr_DIR}")
+set(PROF_API_HEADER_PATH ${ROCclr_DIR}/platform)
 #############################
 # Profiling API support
 #############################
@@ -85,8 +85,8 @@ if(USE_PROF_API EQUAL 1)
 endif()
 
 
-if(NOT DEFINED VDI_DIR OR NOT DEFINED LIBOCL_STATIC_DIR OR NOT DEFINED LIBVDI_STATIC_DIR )
-	#	message(FATAL_ERROR "define VDI_DIR, LIBOCL_STATIC_DIR\n")
+if(NOT DEFINED ROCclr_DIR OR NOT DEFINED LIBOCL_STATIC_DIR OR NOT DEFINED LIBROCclr_STATIC_DIR )
+	#	message(FATAL_ERROR "define ROCclr_DIR, LIBOCL_STATIC_DIR\n")
 
 endif()
 list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" )
@@ -104,12 +104,12 @@ include_directories(${PROJECT_BINARY_DIR}/include)
 include_directories(${CMAKE_SOURCE_DIR}/elfio)
 include_directories(${CMAKE_SOURCE_DIR}/amdocl)
 include_directories(${CMAKE_SOURCE_DIR}/include/hip/hcc_detail/elfio)
-include_directories(${VDI_DIR})
-include_directories(${VDI_DIR}/include)
-include_directories(${VDI_DIR}/compiler/lib)
-include_directories(${VDI_DIR}/compiler/lib/include)
-include_directories(${VDI_DIR}/elf/utils/common)
-include_directories(${VDI_DIR}/elf/utils/libelf)
+include_directories(${ROCclr_DIR})
+include_directories(${ROCclr_DIR}/include)
+include_directories(${ROCclr_DIR}/compiler/lib)
+include_directories(${ROCclr_DIR}/compiler/lib/include)
+include_directories(${ROCclr_DIR}/elf/utils/common)
+include_directories(${ROCclr_DIR}/elf/utils/libelf)
 add_definitions(-DUSE_COMGR_LIBRARY -DCOMGR_DYN_DLL)
     find_package(amd_comgr REQUIRED CONFIG
             PATHS
@@ -157,7 +157,7 @@ add_dependencies(hip64 gen-prof-api-str-header)
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
-include(${LIBVDI_STATIC_DIR}/amdvdi_staticTargets.cmake)
+include(${LIBROCclr_STATIC_DIR}/amdrocclr_staticTargets.cmake)
 
 add_library(amdhip64 SHARED
     $<TARGET_OBJECTS:hip64>
@@ -195,19 +195,25 @@ target_link_libraries(device INTERFACE host)
 # TODO: we may create host_static and device_static to let app
 # link amdhip64_static
 
+<<<<<<< HEAD:vdi/CMakeLists.txt
 # FIXME: Linux convention is to create static library with same base
 # filename.
 target_link_libraries(amdhip64 PRIVATE amdvdi_static Threads::Threads dl)
 target_link_libraries(amdhip64_static PRIVATE Threads::Threads dl)
 target_link_libraries(amdhip64_static_temp PRIVATE Threads::Threads dl)
+=======
+target_link_libraries(amdhip64 PRIVATE amdrocclr_static pthread dl)
+target_link_libraries(amdhip64_static PRIVATE pthread dl)
+target_link_libraries(amdhip64_static_temp PRIVATE pthread dl)
+>>>>>>> bf7c645f... name change vdi to rocclr:rocclr/CMakeLists.txt
 
 # combine objects of vid and hip into amdhip64_static
 add_custom_target(
     amdhip64_static_combiner
     ALL
     COMMAND rm -f $<TARGET_FILE:amdhip64_static>  # Must remove old one, otherwise the new one will contain obsolete stuff
-    COMMAND ${CMAKE_AR} -rcsT $<TARGET_FILE:amdhip64_static> $<TARGET_FILE:amdhip64_static_temp> $<TARGET_FILE:amdvdi_static>
-    DEPENDS amdhip64_static amdhip64_static_temp amdvdi_static # To make sure this is the last step
+    COMMAND ${CMAKE_AR} -rcsT $<TARGET_FILE:amdhip64_static> $<TARGET_FILE:amdhip64_static_temp> $<TARGET_FILE:amdrocclr_static>
+    DEPENDS amdhip64_static amdhip64_static_temp amdrocclr_static # To make sure this is the last step
     COMMENT "Combining static libs into amdhip64_static"
 )
 
diff --git a/projects/clr/hipamd/vdi/cl_gl.cpp b/projects/clr/hipamd/rocclr/cl_gl.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/cl_gl.cpp
rename to projects/clr/hipamd/rocclr/cl_gl.cpp
diff --git a/projects/clr/hipamd/vdi/cl_gl_amd.hpp b/projects/clr/hipamd/rocclr/cl_gl_amd.hpp
similarity index 100%
rename from projects/clr/hipamd/vdi/cl_gl_amd.hpp
rename to projects/clr/hipamd/rocclr/cl_gl_amd.hpp
diff --git a/projects/clr/hipamd/vdi/cl_lqdflash_amd.cpp b/projects/clr/hipamd/rocclr/cl_lqdflash_amd.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/cl_lqdflash_amd.cpp
rename to projects/clr/hipamd/rocclr/cl_lqdflash_amd.cpp
diff --git a/projects/clr/hipamd/vdi/cl_lqdflash_amd.h b/projects/clr/hipamd/rocclr/cl_lqdflash_amd.h
similarity index 100%
rename from projects/clr/hipamd/vdi/cl_lqdflash_amd.h
rename to projects/clr/hipamd/rocclr/cl_lqdflash_amd.h
diff --git a/projects/clr/hipamd/vdi/fixme.cpp b/projects/clr/hipamd/rocclr/fixme.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/fixme.cpp
rename to projects/clr/hipamd/rocclr/fixme.cpp
diff --git a/projects/clr/hipamd/vdi/hip_activity.cpp b/projects/clr/hipamd/rocclr/hip_activity.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_activity.cpp
rename to projects/clr/hipamd/rocclr/hip_activity.cpp
diff --git a/projects/clr/hipamd/vdi/hip_context.cpp b/projects/clr/hipamd/rocclr/hip_context.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_context.cpp
rename to projects/clr/hipamd/rocclr/hip_context.cpp
diff --git a/projects/clr/hipamd/vdi/hip_conversions.hpp b/projects/clr/hipamd/rocclr/hip_conversions.hpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_conversions.hpp
rename to projects/clr/hipamd/rocclr/hip_conversions.hpp
diff --git a/projects/clr/hipamd/vdi/hip_device.cpp b/projects/clr/hipamd/rocclr/hip_device.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_device.cpp
rename to projects/clr/hipamd/rocclr/hip_device.cpp
diff --git a/projects/clr/hipamd/vdi/hip_device_runtime.cpp b/projects/clr/hipamd/rocclr/hip_device_runtime.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_device_runtime.cpp
rename to projects/clr/hipamd/rocclr/hip_device_runtime.cpp
diff --git a/projects/clr/hipamd/vdi/hip_error.cpp b/projects/clr/hipamd/rocclr/hip_error.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_error.cpp
rename to projects/clr/hipamd/rocclr/hip_error.cpp
diff --git a/projects/clr/hipamd/vdi/hip_event.cpp b/projects/clr/hipamd/rocclr/hip_event.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_event.cpp
rename to projects/clr/hipamd/rocclr/hip_event.cpp
diff --git a/projects/clr/hipamd/vdi/hip_event.hpp b/projects/clr/hipamd/rocclr/hip_event.hpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_event.hpp
rename to projects/clr/hipamd/rocclr/hip_event.hpp
diff --git a/projects/clr/hipamd/vdi/hip_formatting.hpp b/projects/clr/hipamd/rocclr/hip_formatting.hpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_formatting.hpp
rename to projects/clr/hipamd/rocclr/hip_formatting.hpp
diff --git a/projects/clr/hipamd/vdi/hip_hcc.def.in b/projects/clr/hipamd/rocclr/hip_hcc.def.in
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_hcc.def.in
rename to projects/clr/hipamd/rocclr/hip_hcc.def.in
diff --git a/projects/clr/hipamd/vdi/hip_hcc.map.in b/projects/clr/hipamd/rocclr/hip_hcc.map.in
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_hcc.map.in
rename to projects/clr/hipamd/rocclr/hip_hcc.map.in
diff --git a/projects/clr/hipamd/vdi/hip_hcc.rc b/projects/clr/hipamd/rocclr/hip_hcc.rc
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_hcc.rc
rename to projects/clr/hipamd/rocclr/hip_hcc.rc
diff --git a/projects/clr/hipamd/vdi/hip_intercept.cpp b/projects/clr/hipamd/rocclr/hip_intercept.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_intercept.cpp
rename to projects/clr/hipamd/rocclr/hip_intercept.cpp
diff --git a/projects/clr/hipamd/vdi/hip_internal.hpp b/projects/clr/hipamd/rocclr/hip_internal.hpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_internal.hpp
rename to projects/clr/hipamd/rocclr/hip_internal.hpp
diff --git a/projects/clr/hipamd/vdi/hip_memory.cpp b/projects/clr/hipamd/rocclr/hip_memory.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_memory.cpp
rename to projects/clr/hipamd/rocclr/hip_memory.cpp
diff --git a/projects/clr/hipamd/vdi/hip_module.cpp b/projects/clr/hipamd/rocclr/hip_module.cpp
similarity index 99%
rename from projects/clr/hipamd/vdi/hip_module.cpp
rename to projects/clr/hipamd/rocclr/hip_module.cpp
index ec8ae1c440..a09ac63c3c 100755
--- a/projects/clr/hipamd/vdi/hip_module.cpp
+++ b/projects/clr/hipamd/rocclr/hip_module.cpp
@@ -615,7 +615,7 @@ hipError_t ihipLaunchCooperativeKernelMultiDevice(hipLaunchParams* launchParamsL
       // Find the matching device and request the kernel function
       if (&queue->vdev()->device() == g_devices[dev]->devices()[0]) {
         func = PlatformState::instance().getFunc(launch.func, dev);
-        // Save VDI index of the first device in the launch
+        // Save ROCclr index of the first device in the launch
         if (i == 0) {
           firstDevice = queue->vdev()->device().index();
         }
diff --git a/projects/clr/hipamd/vdi/hip_peer.cpp b/projects/clr/hipamd/rocclr/hip_peer.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_peer.cpp
rename to projects/clr/hipamd/rocclr/hip_peer.cpp
diff --git a/projects/clr/hipamd/vdi/hip_platform.cpp b/projects/clr/hipamd/rocclr/hip_platform.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_platform.cpp
rename to projects/clr/hipamd/rocclr/hip_platform.cpp
diff --git a/projects/clr/hipamd/vdi/hip_platform.hpp b/projects/clr/hipamd/rocclr/hip_platform.hpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_platform.hpp
rename to projects/clr/hipamd/rocclr/hip_platform.hpp
diff --git a/projects/clr/hipamd/vdi/hip_prof_api.h b/projects/clr/hipamd/rocclr/hip_prof_api.h
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_prof_api.h
rename to projects/clr/hipamd/rocclr/hip_prof_api.h
diff --git a/projects/clr/hipamd/vdi/hip_prof_gen.py b/projects/clr/hipamd/rocclr/hip_prof_gen.py
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_prof_gen.py
rename to projects/clr/hipamd/rocclr/hip_prof_gen.py
diff --git a/projects/clr/hipamd/vdi/hip_profile.cpp b/projects/clr/hipamd/rocclr/hip_profile.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_profile.cpp
rename to projects/clr/hipamd/rocclr/hip_profile.cpp
diff --git a/projects/clr/hipamd/vdi/hip_rtc.cpp b/projects/clr/hipamd/rocclr/hip_rtc.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_rtc.cpp
rename to projects/clr/hipamd/rocclr/hip_rtc.cpp
diff --git a/projects/clr/hipamd/vdi/hip_stream.cpp b/projects/clr/hipamd/rocclr/hip_stream.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_stream.cpp
rename to projects/clr/hipamd/rocclr/hip_stream.cpp
diff --git a/projects/clr/hipamd/vdi/hip_surface.cpp b/projects/clr/hipamd/rocclr/hip_surface.cpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hip_surface.cpp
rename to projects/clr/hipamd/rocclr/hip_surface.cpp
diff --git a/projects/clr/hipamd/vdi/hip_texture.cpp b/projects/clr/hipamd/rocclr/hip_texture.cpp
similarity index 99%
rename from projects/clr/hipamd/vdi/hip_texture.cpp
rename to projects/clr/hipamd/rocclr/hip_texture.cpp
index de62adb402..a9121f183b 100755
--- a/projects/clr/hipamd/vdi/hip_texture.cpp
+++ b/projects/clr/hipamd/rocclr/hip_texture.cpp
@@ -148,7 +148,7 @@ hipError_t ihipCreateTextureObject(hipTextureObject_t* pTexObject,
     return hipErrorNotSupported;
   }
 
-  // TODO VDI assumes all dimensions have the same addressing mode.
+  // TODO ROCclr assumes all dimensions have the same addressing mode.
   cl_addressing_mode addressMode = CL_ADDRESS_NONE;
   // If hipTextureDesc::normalizedCoords is set to zero,
   // hipAddressModeWrap and hipAddressModeMirror won't be supported
@@ -220,7 +220,7 @@ hipError_t ihipCreateTextureObject(hipTextureObject_t* pTexObject,
     if ((pResViewDesc != nullptr) ||
         (readMode == hipReadModeNormalizedFloat) ||
         (pTexDesc->sRGB == 1)) {
-      // TODO VDI currently right now can only change the format of the image.
+      // TODO ROCclr currently right now can only change the format of the image.
       const cl_channel_order channelOrder = (pResViewDesc != nullptr) ? hip::getCLChannelOrder(hip::getNumChannels(pResViewDesc->format), pTexDesc->sRGB) :
                                                                         hip::getCLChannelOrder(pResDesc->res.array.array->NumChannels, pTexDesc->sRGB);
       const cl_channel_type channelType = (pResViewDesc != nullptr) ? hip::getCLChannelType(hip::getArrayFormat(pResViewDesc->format), readMode) :
diff --git a/projects/clr/hipamd/vdi/hiprtc_internal.hpp b/projects/clr/hipamd/rocclr/hiprtc_internal.hpp
similarity index 100%
rename from projects/clr/hipamd/vdi/hiprtc_internal.hpp
rename to projects/clr/hipamd/rocclr/hiprtc_internal.hpp
diff --git a/projects/clr/hipamd/vdi/trace_helper.h b/projects/clr/hipamd/rocclr/trace_helper.h
similarity index 100%
rename from projects/clr/hipamd/vdi/trace_helper.h
rename to projects/clr/hipamd/rocclr/trace_helper.h
diff --git a/projects/clr/hipamd/src/hip_clang.cpp b/projects/clr/hipamd/src/hip_clang.cpp
index 85aa0ad810..7a2e72a20e 100644
--- a/projects/clr/hipamd/src/hip_clang.cpp
+++ b/projects/clr/hipamd/src/hip_clang.cpp
@@ -199,7 +199,7 @@ struct DeviceVar {
 
 std::unordered_multimap<std::string, DeviceVar > g_vars;
 
-//The logic follows PlatformState::getGlobalVar in VDI RT
+//The logic follows PlatformState::getGlobalVar in ROCclr RT
 static DeviceVar* findVar(std::string hostVar, int deviceId, hipModule_t hmod) {
   DeviceVar* dvar = nullptr;
   if (hmod != nullptr) {
@@ -326,7 +326,7 @@ static bool createGlobalVarObj(const hsa_executable_t& hsaExecutable, const hsa_
 // global variable in host code. The shadow host variable is used to keep
 // track of the value of the device side global variable between kernel
 // executions.
-// The basic logic is taken from VDI RT, but there is much difference.
+// The basic logic is taken from ROCclr RT, but there is much difference.
 extern "C" void __hipRegisterVar(
   std::vector<hipModule_t>* modules,   // The device modules containing code object
   char*       var,       // The shadow variable in host code
diff --git a/projects/clr/hipamd/tests/README.md b/projects/clr/hipamd/tests/README.md
index a9401ed918..7e82f66cd6 100644
--- a/projects/clr/hipamd/tests/README.md
+++ b/projects/clr/hipamd/tests/README.md
@@ -46,8 +46,8 @@ In the above, BUILD commands provide instructions on how to build the test case
 #### BUILD command
 
 The supported syntax for the BUILD command is:
-```
-BUILD: %t %s HIPCC_OPTIONS <hipcc_specific_options> HCC_OPTIONS <hcc_specific_options> CLANG_OPTIONS <clang_specific_options> NVCC_OPTIONS <nvcc_specific_options> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all> EXCLUDE_HIP_RUNTIME <HCC|VDI> EXCLUDE_HIP_COMPILER <hcc|clang> DEPENDS <dependencies>
+<<<<<<< HEAD
+BUILD: %t %s HIPCC_OPTIONS <hipcc_specific_options> HCC_OPTIONS <hcc_specific_options> CLANG_OPTIONS <clang_specific_options> NVCC_OPTIONS <nvcc_specific_options> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all> EXCLUDE_HIP_RUNTIME <HCC|ROCclr> EXCLUDE_HIP_COMPILER <hcc|clang> DEPENDS <dependencies>
 ```
 %s: refers to current source file name. Additional source files needed for the test can be specified by name (including relative path).
 %t: refers to target executable named derived by removing the extension from the current source file. Alternatively a target executable name can be specified.
@@ -56,7 +56,7 @@ HCC_OPTIONS: All options specified after this delimiter are passed to hipcc on H
 CLANG_OPTIONS: All options specified after this delimiter are passed to hipcc on HIP-Clang compiler only.
 NVCC_OPTIONS: All options specified after this delimiter are passed to hipcc on NVCC platform only.
 EXCLUDE_HIP_PLATFORM: This can be used to exclude a test case from HCC, NVCC or both platforms.
-EXCLUDE_HIP_RUNTIME: This can be used to exclude a test case from HCC or VDI runtime.
+EXCLUDE_HIP_RUNTIME: This can be used to exclude a test case from HCC or ROCclr runtime.
 EXCLUDE_HIP_COMPILER: This can be used to exclude a test case from hcc or clang compiler.
 EXCLUDE_HIP_RUNTIME AND EXCLUDE_HIP_COMPILER: when both options are specified it excludes test case from particular runtime and compiler.
 DEPENDS: This can be used to specify dependencies that need to be built before building the current target.
@@ -66,7 +66,7 @@ DEPENDS: This can be used to specify dependencies that need to be built before b
 
 The supported syntax for the BUILD_CMD command is:
 ```
-BUILD_CMD: <targetname> <build_command> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all> EXCLUDE_HIP_RUNTIME <HCC|VDI> EXCLUDE_HIP_COMPILER <hcc|clang> DEPENDS <dependencies>
+BUILD_CMD: <targetname> <build_command> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all> EXCLUDE_HIP_RUNTIME <HCC|ROCclr> EXCLUDE_HIP_COMPILER <hcc|clang> DEPENDS <dependencies>
 ```
 %s: refers to current source file name. Additional source files needed for the test can be specified by name (including relative path).
 %t: refers to target executable named derived by removing the extension from the current source file. Alternatively a target executable name can be specified.
@@ -77,7 +77,7 @@ BUILD_CMD: <targetname> <build_command> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all> EXCL
 %S: refers to path to current source file.
 %T: refers to path to current build target.
 EXCLUDE_HIP_PLATFORM: This can be used to exclude a test case from HCC, NVCC or both platforms.
-EXCLUDE_HIP_RUNTIME: This can be used to exclude a test case from HCC or VDI runtime.
+EXCLUDE_HIP_RUNTIME: This can be used to exclude a test case from HCC or ROCclr runtime.
 EXCLUDE_HIP_COMPILER: This can be used to exclude a test case from hcc or clang compiler.
 EXCLUDE_HIP_RUNTIME AND EXCLUDE_HIP_COMPILER: when both options are specified it excludes test from particular runtime and compiler.
 DEPENDS: This can be used to specify dependencies that need to be built before building the current target.
@@ -87,11 +87,11 @@ DEPENDS: This can be used to specify dependencies that need to be built before b
 
 The supported syntax for the TEST command is:
 ```
-TEST: %t <arguments_to_test_executable> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all> EXCLUDE_HIP_RUNTIME <HCC|VDI> EXCLUDE_HIP_COMPILER <hcc|clang>
+TEST: %t <arguments_to_test_executable> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all> EXCLUDE_HIP_RUNTIME <HCC|ROCclr> EXCLUDE_HIP_COMPILER <hcc|clang>
 ```
 %t: refers to target executable named derived by removing the extension from the current source file. Alternatively a target executable name can be specified.
 EXCLUDE_HIP_PLATFORM: This can be used to exclude a test case from HCC, NVCC or both platforms. 
-EXCLUDE_HIP_RUNTIME: This can be used to exclude a test case from HCC or VDI runtime.
+EXCLUDE_HIP_RUNTIME: This can be used to exclude a test case from HCC or ROCclr runtime.
 EXCLUDE_HIP_COMPILER: This can be used to exclude a test case from hcc or clang compiler.
 EXCLUDE_HIP_RUNTIME AND EXCLUDE_HIP_COMPILER: when both options are specified it excludes test from particular runtime and compiler.
 Note that if the test has been excluded for a specific platform/runtime/compiler in the BUILD command, it is automatically excluded from the TEST command as well for the sameplatform.
@@ -100,7 +100,7 @@ Note that if the test has been excluded for a specific platform/runtime/compiler
 
 When using the TEST command, HIT will squash and append the arguments specified to the test executable name to generate the CMAKE test name. Sometimes we might want to specify a more descriptive name. The TEST_NAMED command is used for that. The supported syntax for the TEST_NAMED command is:
 ```
-TEST: %t CMAKE_TEST_NAME <arguments_to_test_executable> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all> EXCLUDE_HIP_RUNTIME <HCC|VDI> EXCLUDE_HIP_COMPILER <hcc|clang>
+TEST: %t CMAKE_TEST_NAME <arguments_to_test_executable> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all> EXCLUDE_HIP_RUNTIME <HCC|ROCclr> EXCLUDE_HIP_COMPILER <hcc|clang>
 ```
 
 
diff --git a/projects/clr/hipamd/tests/src/Negative/memory/hipMemory.cpp b/projects/clr/hipamd/tests/src/Negative/memory/hipMemory.cpp
index a71ee948f5..030df7e69c 100644
--- a/projects/clr/hipamd/tests/src/Negative/memory/hipMemory.cpp
+++ b/projects/clr/hipamd/tests/src/Negative/memory/hipMemory.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/Negative/stream/hipStreamCreateWithFlags.cpp b/projects/clr/hipamd/tests/src/Negative/stream/hipStreamCreateWithFlags.cpp
index 6f0662b82d..9ef13eec5a 100644
--- a/projects/clr/hipamd/tests/src/Negative/stream/hipStreamCreateWithFlags.cpp
+++ b/projects/clr/hipamd/tests/src/Negative/stream/hipStreamCreateWithFlags.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/dynamicLoading/complex_loading_behavior.cpp b/projects/clr/hipamd/tests/src/dynamicLoading/complex_loading_behavior.cpp
index 954fa7da35..8288e15723 100644
--- a/projects/clr/hipamd/tests/src/dynamicLoading/complex_loading_behavior.cpp
+++ b/projects/clr/hipamd/tests/src/dynamicLoading/complex_loading_behavior.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD_CMD: libfoo_amd %hc %S/%s -o libfoo.so -Xcompiler -fPIC -lpthread -shared -DTEST_SHARED_LIBRARY EXCLUDE_HIP_PLATFORM nvcc
- * BUILD_CMD: libfoo_nvidia %hc %S/%s -o libfoo.so -Xcompiler -fPIC -lpthread -shared -DTEST_SHARED_LIBRARY EXCLUDE_HIP_PLATFORM hcc vdi
+ * BUILD_CMD: libfoo_nvidia %hc %S/%s -o libfoo.so -Xcompiler -fPIC -lpthread -shared -DTEST_SHARED_LIBRARY EXCLUDE_HIP_PLATFORM hcc rocclr
  * BUILD_CMD: %t %hc %S/%s -o %T/%t -ldl
  * TEST: %t
  * HIT_END
diff --git a/projects/clr/hipamd/tests/src/gcc/LaunchKernel.c b/projects/clr/hipamd/tests/src/gcc/LaunchKernel.c
index d2fc854510..1791d52d25 100644
--- a/projects/clr/hipamd/tests/src/gcc/LaunchKernel.c
+++ b/projects/clr/hipamd/tests/src/gcc/LaunchKernel.c
@@ -19,10 +19,10 @@
 
 
 /* HIT_START
- * BUILD_CMD: gpu.o %hc -I%hip-path/include -g -c %S/gpu.cpp -o %T/gpu.o EXCLUDE_HIP_PLATFORM nvcc vdi
- * BUILD_CMD: launchkernel.o %hc -D__HIP_PLATFORM_HCC__ -g -I%hip-path/include -c %S/LaunchKernel.c -o %T/launchkernel.o EXCLUDE_HIP_PLATFORM nvcc vdi
- * BUILD_CMD: LaunchKernel %hc %T/launchkernel.o %T/gpu.o -g -Wl,--rpath=%hip-path/lib %hip-path/lib/libhip_hcc.so -o %T/%t DEPENDS gpu.o launchkernel.o EXCLUDE_HIP_PLATFORM nvcc vdi
- * TEST: %t EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD_CMD: gpu.o %hc -I%hip-path/include -g -c %S/gpu.cpp -o %T/gpu.o EXCLUDE_HIP_PLATFORM nvcc rocclr
+ * BUILD_CMD: launchkernel.o %hc -D__HIP_PLATFORM_HCC__ -g -I%hip-path/include -c %S/LaunchKernel.c -o %T/launchkernel.o EXCLUDE_HIP_PLATFORM nvcc rocclr
+ * BUILD_CMD: LaunchKernel %hc %T/launchkernel.o %T/gpu.o -g -Wl,--rpath=%hip-path/lib %hip-path/lib/libhip_hcc.so -o %T/%t DEPENDS gpu.o launchkernel.o EXCLUDE_HIP_PLATFORM nvcc rocclr
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvcc rocclr
  * HIT_END
  */
 
diff --git a/projects/clr/hipamd/tests/src/gcc/hipMalloc.c b/projects/clr/hipamd/tests/src/gcc/hipMalloc.c
index ebf163de28..f54071f907 100644
--- a/projects/clr/hipamd/tests/src/gcc/hipMalloc.c
+++ b/projects/clr/hipamd/tests/src/gcc/hipMalloc.c
@@ -18,10 +18,10 @@
  * */
 
 /* HIT_START
- * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_NVCC__ -I%hip-path/include -I/usr/local/cuda/include %S/%s -o %T/hipMalloc_nv -L/usr/local/cuda/lib64 -lcudart EXCLUDE_HIP_PLATFORM hcc vdi
- * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_HCC__ -I%hip-path/include %S/%s -Wl,--rpath=%hip-path/lib %hip-path/lib/libhip_hcc.so -o %T/hipMalloc_hcc EXCLUDE_HIP_PLATFORM nvcc vdi
- * TEST: hipMalloc_nv EXCLUDE_HIP_PLATFORM hcc vdi
- * TEST: hipMalloc_hcc EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_NVCC__ -I%hip-path/include -I/usr/local/cuda/include %S/%s -o %T/hipMalloc_nv -L/usr/local/cuda/lib64 -lcudart EXCLUDE_HIP_PLATFORM hcc rocclr
+ * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_HCC__ -I%hip-path/include %S/%s -Wl,--rpath=%hip-path/lib %hip-path/lib/libhip_hcc.so -o %T/hipMalloc_hcc EXCLUDE_HIP_PLATFORM nvcc rocclr
+ * TEST: hipMalloc_nv EXCLUDE_HIP_PLATFORM hcc rocclr
+ * TEST: hipMalloc_hcc EXCLUDE_HIP_PLATFORM nvcc rocclr
  * HIT_END
  */
 
diff --git a/projects/clr/hipamd/tests/src/hiprtc/hiprtcGetLoweredName.cpp b/projects/clr/hipamd/tests/src/hiprtc/hiprtcGetLoweredName.cpp
index a63e13af64..407533fd19 100644
--- a/projects/clr/hipamd/tests/src/hiprtc/hiprtcGetLoweredName.cpp
+++ b/projects/clr/hipamd/tests/src/hiprtc/hiprtcGetLoweredName.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp LINK_OPTIONS hiprtc EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD: %t %s ../test_common.cpp LINK_OPTIONS hiprtc EXCLUDE_HIP_PLATFORM nvcc rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/hiprtc/saxpy.cpp b/projects/clr/hipamd/tests/src/hiprtc/saxpy.cpp
index a08c1c2399..cb7e7cdb5f 100755
--- a/projects/clr/hipamd/tests/src/hiprtc/saxpy.cpp
+++ b/projects/clr/hipamd/tests/src/hiprtc/saxpy.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp LINK_OPTIONS hiprtc EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD: %t %s ../test_common.cpp LINK_OPTIONS hiprtc EXCLUDE_HIP_PLATFORM nvcc rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/p2p/hipPeerToPeer_simple.cpp b/projects/clr/hipamd/tests/src/p2p/hipPeerToPeer_simple.cpp
index 90e7112356..9f0982f353 100644
--- a/projects/clr/hipamd/tests/src/p2p/hipPeerToPeer_simple.cpp
+++ b/projects/clr/hipamd/tests/src/p2p/hipPeerToPeer_simple.cpp
@@ -24,9 +24,9 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * TEST: %t EXCLUDE_HIP_PLATFORM hcc vdi
- * TEST: %t --memcpyWithPeer EXCLUDE_HIP_PLATFORM hcc vdi
- * TEST: %t --mirrorPeers EXCLUDE_HIP_PLATFORM hcc vdi
+ * TEST: %t EXCLUDE_HIP_PLATFORM hcc rocclr
+ * TEST: %t --memcpyWithPeer EXCLUDE_HIP_PLATFORM hcc rocclr
+ * TEST: %t --mirrorPeers EXCLUDE_HIP_PLATFORM hcc rocclr
  * HIT_END
  */
 
diff --git a/projects/clr/hipamd/tests/src/runtimeApi/event/hipEventElapsedTime.cpp b/projects/clr/hipamd/tests/src/runtimeApi/event/hipEventElapsedTime.cpp
index 61afaa93d3..afb1802194 100644
--- a/projects/clr/hipamd/tests/src/runtimeApi/event/hipEventElapsedTime.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/event/hipEventElapsedTime.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/runtimeApi/event/hipEventIpc.cpp b/projects/clr/hipamd/tests/src/runtimeApi/event/hipEventIpc.cpp
index dd6c23e334..bec87ee725 100644
--- a/projects/clr/hipamd/tests/src/runtimeApi/event/hipEventIpc.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/event/hipEventIpc.cpp
@@ -24,7 +24,7 @@ THE SOFTWARE.
 // forces synchronization : set
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc rocclr
  * TEST: %t --iterations 10
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpyNegetiveTests.cpp b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpyNegetiveTests.cpp
index febc664f7d..ceaa8ed0d9 100644
--- a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpyNegetiveTests.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpyNegetiveTests.cpp
@@ -18,7 +18,7 @@
  * */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/runtimeApi/memory/p2p_copy_coherency.cpp b/projects/clr/hipamd/tests/src/runtimeApi/memory/p2p_copy_coherency.cpp
index adface243d..22bd683631 100644
--- a/projects/clr/hipamd/tests/src/runtimeApi/memory/p2p_copy_coherency.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/memory/p2p_copy_coherency.cpp
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
 #define USE_HCC_MEMTRACKER 0 /* Debug flag to show the memtracker periodically */
 
-#if defined(__HIP_PLATFORM_HCC__) && !defined(__HIP_VDI__)
+#if defined(__HIP_PLATFORM_HCC__) && !defined(__HIP_ROCclr__)
 #include <hc_am.hpp>
 #else
 #define USE_HCC_MEMTRACKER 0
diff --git a/projects/clr/hipamd/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp b/projects/clr/hipamd/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp
index a26c9be4a0..b9327a9c58 100755
--- a/projects/clr/hipamd/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp
@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD_CMD: matmul.code %hc --genco %S/matmul.cpp -o matmul.code EXCLUDE_HIP_PLATFORM nvcc
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/runtimeApi/module/hipModuleLoadDataMultThreaded.cpp b/projects/clr/hipamd/tests/src/runtimeApi/module/hipModuleLoadDataMultThreaded.cpp
index 11bd6e7d50..eef367ab70 100644
--- a/projects/clr/hipamd/tests/src/runtimeApi/module/hipModuleLoadDataMultThreaded.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/module/hipModuleLoadDataMultThreaded.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp b/projects/clr/hipamd/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp
index e7c254e9fd..9318d168a0 100644
--- a/projects/clr/hipamd/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/runtimeApi/module/tex2d_kernel.cpp b/projects/clr/hipamd/tests/src/runtimeApi/module/tex2d_kernel.cpp
index e744d88776..af5010a221 100644
--- a/projects/clr/hipamd/tests/src/runtimeApi/module/tex2d_kernel.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/module/tex2d_kernel.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD_CMD: tex2d_kernel.code %hc --genco %S/tex2d_kernel.cpp -o tex2d_kernel.code EXCLUDE_HIP_PLATFORM vdi
+ * BUILD_CMD: tex2d_kernel.code %hc --genco %S/tex2d_kernel.cpp -o tex2d_kernel.code EXCLUDE_HIP_PLATFORM rocclr
  * HIT_END
  */
 
diff --git a/projects/clr/hipamd/tests/src/runtimeApi/occupancy/hipOccupancyMaxActiveBlocksPerMultiprocessor.cpp b/projects/clr/hipamd/tests/src/runtimeApi/occupancy/hipOccupancyMaxActiveBlocksPerMultiprocessor.cpp
index d8385669ea..ad37dac8bc 100644
--- a/projects/clr/hipamd/tests/src/runtimeApi/occupancy/hipOccupancyMaxActiveBlocksPerMultiprocessor.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/occupancy/hipOccupancyMaxActiveBlocksPerMultiprocessor.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 // Test the Grid_Launch syntax.
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/runtimeApi/stream/hipStreamAddCallbackCatch.cpp b/projects/clr/hipamd/tests/src/runtimeApi/stream/hipStreamAddCallbackCatch.cpp
index c22b390ecc..47c2e9fe9c 100644
--- a/projects/clr/hipamd/tests/src/runtimeApi/stream/hipStreamAddCallbackCatch.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/stream/hipStreamAddCallbackCatch.cpp
@@ -11,7 +11,7 @@
 #include "test_common.h"
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/surface/hipSurfaceObj2D.cpp b/projects/clr/hipamd/tests/src/surface/hipSurfaceObj2D.cpp
index 2724604279..cc154fb65f 100644
--- a/projects/clr/hipamd/tests/src/surface/hipSurfaceObj2D.cpp
+++ b/projects/clr/hipamd/tests/src/surface/hipSurfaceObj2D.cpp
@@ -1,5 +1,5 @@
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/texture/hipBindTex2DPitch.cpp b/projects/clr/hipamd/tests/src/texture/hipBindTex2DPitch.cpp
index 6cee22a45d..2fd3f1228d 100644
--- a/projects/clr/hipamd/tests/src/texture/hipBindTex2DPitch.cpp
+++ b/projects/clr/hipamd/tests/src/texture/hipBindTex2DPitch.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /*HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/texture/hipBindTexRef1DFetch.cpp b/projects/clr/hipamd/tests/src/texture/hipBindTexRef1DFetch.cpp
index af79153fe0..eeaf42129f 100644
--- a/projects/clr/hipamd/tests/src/texture/hipBindTexRef1DFetch.cpp
+++ b/projects/clr/hipamd/tests/src/texture/hipBindTexRef1DFetch.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/texture/hipNormalizedFloatValueTex.cpp b/projects/clr/hipamd/tests/src/texture/hipNormalizedFloatValueTex.cpp
index b4aa3e9c05..95b7c1d879 100644
--- a/projects/clr/hipamd/tests/src/texture/hipNormalizedFloatValueTex.cpp
+++ b/projects/clr/hipamd/tests/src/texture/hipNormalizedFloatValueTex.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc hcc vdi
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc hcc rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/texture/hipTex1DFetchCheckModes.cpp b/projects/clr/hipamd/tests/src/texture/hipTex1DFetchCheckModes.cpp
index 381d07280c..5a8ff959fa 100644
--- a/projects/clr/hipamd/tests/src/texture/hipTex1DFetchCheckModes.cpp
+++ b/projects/clr/hipamd/tests/src/texture/hipTex1DFetchCheckModes.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/texture/hipTextureRef2D.cpp b/projects/clr/hipamd/tests/src/texture/hipTextureRef2D.cpp
index 5247f81fe0..4f00260998 100644
--- a/projects/clr/hipamd/tests/src/texture/hipTextureRef2D.cpp
+++ b/projects/clr/hipamd/tests/src/texture/hipTextureRef2D.cpp
@@ -1,5 +1,5 @@
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/texture/simpleTexture2DLayered.cpp b/projects/clr/hipamd/tests/src/texture/simpleTexture2DLayered.cpp
index 8b1bbb64a3..1424976716 100644
--- a/projects/clr/hipamd/tests/src/texture/simpleTexture2DLayered.cpp
+++ b/projects/clr/hipamd/tests/src/texture/simpleTexture2DLayered.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr
  * TEST: %t
  * HIT_END
  */
diff --git a/projects/clr/hipamd/tests/src/texture/simpleTexture3D.cpp b/projects/clr/hipamd/tests/src/texture/simpleTexture3D.cpp
index 82f6cf5e99..bd342df1c3 100644
--- a/projects/clr/hipamd/tests/src/texture/simpleTexture3D.cpp
+++ b/projects/clr/hipamd/tests/src/texture/simpleTexture3D.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc rocclr
  * TEST: %t
  * HIT_END
  */