diff --git a/rocclr/device/rocm/rocblit.cpp b/rocclr/device/rocm/rocblit.cpp
index 314f4732d1..4be93dd4ad 100644
--- a/rocclr/device/rocm/rocblit.cpp
+++ b/rocclr/device/rocm/rocblit.cpp
@@ -679,7 +679,7 @@ bool DmaBlitManager::hsaCopy(const Memory& srcMemory, const Memory& dstMemory,
 
   uint32_t copyMask = 0;
   uint32_t freeEngineMask = 0;
-  bool useRegularCopyApi = !HIP_USE_SDMA_QUERY;
+  bool useRegularCopyApi = !DEBUG_CLR_USE_SDMA_QUERY;
 
   HwQueueEngine engine = HwQueueEngine::Unknown;
   if ((srcAgent.handle == dev().getCpuAgent().handle) &&
diff --git a/rocclr/device/rocm/rocdevice.cpp b/rocclr/device/rocm/rocdevice.cpp
index 8e0bd8f6ee..70fd81f92e 100644
--- a/rocclr/device/rocm/rocdevice.cpp
+++ b/rocclr/device/rocm/rocdevice.cpp
@@ -1240,7 +1240,7 @@ bool Device::populateOCLDeviceConstants() {
   }
   assert(group_segment_size > 0);
 
-  if (HIP_USE_SDMA_QUERY) {
+  if (DEBUG_CLR_USE_SDMA_QUERY) {
     // Find SDMA read mask
     if (HSA_STATUS_SUCCESS != hsa_amd_memory_copy_engine_status(getCpuAgent(), getBackendDevice(),
                                                                 &maxSdmaReadMask_)) {
diff --git a/rocclr/utils/flags.hpp b/rocclr/utils/flags.hpp
index 9b346da502..54fd585460 100644
--- a/rocclr/utils/flags.hpp
+++ b/rocclr/utils/flags.hpp
@@ -285,9 +285,9 @@ release(bool, HIPRTC_USE_RUNTIME_UNBUNDLER, false,                            \
 release(size_t, HIP_INITIAL_DM_SIZE, 8 * Mi,                                  \
         "Set initial heap size for device malloc.")                           \
 release(bool, HIP_FORCE_DEV_KERNARG, 0,                                       \
-         "Force device mem for kernel args")                                  \
-release(bool, HIP_USE_SDMA_QUERY, 0,                                          \
-         "Use SDMA query API to make copy decisions")
+         "Force device mem for kernel args.")                                 \
+release(bool, DEBUG_CLR_USE_SDMA_QUERY, 0,                                    \
+         "Use SDMA query API to make copy decisions.")
 
 namespace amd {