diff --git a/projects/hip/include/hip/hcc_detail/hip_runtime.h b/projects/hip/include/hip/hcc_detail/hip_runtime.h
index 2201f8aae0..58f741188d 100644
--- a/projects/hip/include/hip/hcc_detail/hip_runtime.h
+++ b/projects/hip/include/hip/hcc_detail/hip_runtime.h
@@ -525,7 +525,7 @@ do {\
  */
 
 
-#elif defined(__clang__) && defined(__HIPCC__)
+#elif defined(__clang__) && defined(__HIP__)
 
 #define hipConfigureCall cudaConfigureCall
 #define hipSetupArgument cudaSetupArgument
diff --git a/projects/hip/include/hip/hcc_detail/host_defines.h b/projects/hip/include/hip/hcc_detail/host_defines.h
index 30ce36afb1..479ce07264 100644
--- a/projects/hip/include/hip/hcc_detail/host_defines.h
+++ b/projects/hip/include/hip/hcc_detail/host_defines.h
@@ -64,7 +64,7 @@ THE SOFTWARE.
 #define __shared__     tile_static
 #define __constant__   __attribute__((hc))
 
-#elif defined(__clang__) && defined(__HIPCC__)
+#elif defined(__clang__) && defined(__HIP__)
 
 #define __host__      __attribute__((host))
 #define __device__    __attribute__((device))
diff --git a/projects/hip/include/hip/hip_common.h b/projects/hip/include/hip/hip_common.h
index 58c10cd83e..fafac1d9ba 100644
--- a/projects/hip/include/hip/hip_common.h
+++ b/projects/hip/include/hip/hip_common.h
@@ -26,12 +26,12 @@ THE SOFTWARE.
 // Common code included at start of every hip file.
 // Auto enable __HIP_PLATFORM_HCC__ if compiling with HCC
 // Other compiler (GCC,ICC,etc) need to set one of these macros explicitly
-#if defined(__HCC__) || (defined(__clang__) && defined(__HIPCC__))
+#if defined(__HCC__) || (defined(__clang__) && defined(__HIP__))
 #define __HIP_PLATFORM_HCC__
 #endif //__HCC__
 
 // Auto enable __HIP_PLATFORM_NVCC__ if compiling with NVCC
-#if defined(__NVCC__) || (defined(__clang__) && defined(__CUDACC__))
+#if defined(__NVCC__) || (defined(__clang__) && defined(__CUDA__))
 #define __HIP_PLATFORM_NVCC__
 #ifdef __CUDACC__
 #define __HIPCC__