diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDDBGTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDDBGTest.cpp
index 16b0775aed..e43a253daf 100644
--- a/projects/rocr-runtime/tests/kfdtest/src/KFDDBGTest.cpp
+++ b/projects/rocr-runtime/tests/kfdtest/src/KFDDBGTest.cpp
@@ -266,8 +266,8 @@ TEST_F(KFDDBGTest, HitTrapEvent) {
                                             0x1000));
 
         // compile and dispatch shader
-        ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(jump_to_trap_gfx, isaBuf.As<char*>()));
-        ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(trap_handler_gfx, trap.As<char*>()));
+        ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(JumpToTrapIsa, isaBuf.As<char*>()));
+        ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(TrapHandlerIsa, trap.As<char*>()));
 
         uint32_t rDebug;
         ASSERT_SUCCESS(hsaKmtRuntimeEnable(&rDebug, true));
@@ -341,7 +341,7 @@ TEST_F(KFDDBGTest, HitTrapOnWaveStartEndEvent) {
 
         // compile and dispatch shader
         ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(NoopIsa, isaBuf.As<char*>()));
-        ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(trap_handler_gfx, trap.As<char*>()));
+        ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(TrapHandlerIsa, trap.As<char*>()));
 
         uint32_t rDebug;
         ASSERT_SUCCESS(hsaKmtRuntimeEnable(&rDebug, true));
@@ -422,7 +422,7 @@ TEST_F(KFDDBGTest, SuspendQueues) {
         HsaMemoryBuffer isaBuf(PAGE_SIZE, defaultGPUNode, true, false, true);
 
         // compile and dispatch shader
-        ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(jump_to_trap_gfx, isaBuf.As<char*>()));
+        ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(JumpToTrapIsa, isaBuf.As<char*>()));
 
         uint32_t rDebug;
         ASSERT_SUCCESS(hsaKmtRuntimeEnable(&rDebug, true));
@@ -635,9 +635,9 @@ TEST_F(KFDDBGTest, HitAddressWatch) {
         HsaMemoryBuffer trap(PAGE_SIZE*2, defaultGPUNode, true, false, true);
         HsaMemoryBuffer tmaBuf(PAGE_SIZE, defaultGPUNode, false, false, false);
 
-        ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(watch_read_isa, readerBuf.As<char*>()));
-        ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(watch_write_isa, writerBuf.As<char*>()));
-        ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(trap_handler_gfx, trap.As<char*>()));
+        ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(WatchReadIsa, readerBuf.As<char*>()));
+        ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(WatchWriteIsa, writerBuf.As<char*>()));
+        ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(TrapHandlerIsa, trap.As<char*>()));
         ASSERT_SUCCESS(hsaKmtSetTrapHandler(defaultGPUNode,
                                             trap.As<void *>(),
                                             0x1000,
diff --git a/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.cpp b/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.cpp
index 08d82612ee..298abc118b 100644
--- a/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.cpp
+++ b/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.cpp
@@ -901,7 +901,7 @@ const char *GwsAtomicIncreaseIsa =
         s_endpgm
 )";
 
-const char *jump_to_trap_gfx =
+const char *JumpToTrapIsa =
     SHADER_START
     SHADER_MACROS_U32
     R"(
@@ -918,7 +918,7 @@ const char *jump_to_trap_gfx =
         s_endpgm
 )";
 
-const char *trap_handler_gfx =
+const char *TrapHandlerIsa =
     SHADER_START
     R"(
         CHECK_VMFAULT:
@@ -998,12 +998,12 @@ const char *trap_handler_gfx =
     "s_waitcnt vmcnt(0) & lgkmcnt(0)\n"\
     "s_endpgm\n"
 
-const char *watch_read_isa =
+const char *WatchReadIsa =
     WATCH_START
     "flat_load_dword v7, v[0:1]"
     WATCH_END;
 
-const char *watch_write_isa =
+const char *WatchWriteIsa =
     WATCH_START
     "flat_store_dword v[0:1], v4"
     WATCH_END;
diff --git a/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.hpp b/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.hpp
index cfcfb2761c..60c021d047 100644
--- a/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.hpp
+++ b/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.hpp
@@ -63,12 +63,12 @@ extern const char *GwsInitIsa;
 extern const char *GwsAtomicIncreaseIsa;
 
 /* HitTrapEvent */
-extern const char *jump_to_trap_gfx;
-extern const char *trap_handler_gfx;
+extern const char *JumpToTrapIsa;
+extern const char *TrapHandlerIsa;
 
 /* HitWatchPointEvent */
-extern const char *watch_read_isa;
-extern const char *watch_write_isa;
-extern const char *watch_atomic_isa;
+extern const char *WatchReadIsa;
+extern const char *WatchWriteIsa;
+extern const char *WatchAtomicIsa;
 
 #endif  // _SHADERSTORE_H_