diff --git a/projects/clr/rocclr/device/gpu/gpudefs.hpp b/projects/clr/rocclr/device/gpu/gpudefs.hpp
index 06055adc34..6f8d8b4534 100644
--- a/projects/clr/rocclr/device/gpu/gpudefs.hpp
+++ b/projects/clr/rocclr/device/gpu/gpudefs.hpp
@@ -201,15 +201,15 @@ enum gfx_handle {
 
 static constexpr const char* Gfx700 = "amdgcn-amd-amdhsa--gfx700";
 static constexpr const char* Gfx701 = "amdgcn-amd-amdhsa--gfx701";
-static constexpr const char* Gfx800 = "amdgcn-amd-amdhsa--gfx800";
-static constexpr const char* Gfx801 = "amdgcn-amd-amdhsa--gfx801+xnack";
-static constexpr const char* Gfx804 = "amdgcn-amd-amdhsa--gfx804";
-static constexpr const char* Gfx810 = "amdgcn-amd-amdhsa--gfx810+xnack";
-static constexpr const char* Gfx900 = "amdgcn-amd-amdhsa--gfx900";
-static constexpr const char* Gfx902 = "amdgcn-amd-amdhsa--gfx902+xnack";
-static constexpr const char* Gfx903 = "amdgcn-amd-amdhsa--gfx902";  // NOTE: gfx903 is gfx902 with xnack
-static constexpr const char* Gfx904 = "amdgcn-amd-amdhsa--gfx904";
-static constexpr const char* Gfx906 = "amdgcn-amd-amdhsa--gfx906";
+static constexpr const char* Gfx800 = "amdgcn-amd-amdhsa--gfx801:xnack-";
+static constexpr const char* Gfx801 = "amdgcn-amd-amdhsa--gfx801:xnack+";
+static constexpr const char* Gfx804 = "amdgcn-amd-amdhsa--gfx803";
+static constexpr const char* Gfx810 = "amdgcn-amd-amdhsa--gfx810:xnack+";
+static constexpr const char* Gfx900 = "amdgcn-amd-amdhsa--gfx900:xnack-";
+static constexpr const char* Gfx902 = "amdgcn-amd-amdhsa--gfx902:xnack-";
+static constexpr const char* Gfx903 = "amdgcn-amd-amdhsa--gfx903:xnack+";  // NOTE: gfx903 is gfx902 with xnack
+static constexpr const char* Gfx904 = "amdgcn-amd-amdhsa--gfx904:xnack-";
+static constexpr const char* Gfx906 = "amdgcn-amd-amdhsa--gfx906:xnack-";
 
 // Supported OpenCL versions
 enum OclVersion { OpenCL10, OpenCL11, OpenCL12, OpenCL20, OpenCL21 };
diff --git a/projects/clr/rocclr/device/gpu/gpuprogram.cpp b/projects/clr/rocclr/device/gpu/gpuprogram.cpp
index f42553ff57..2a0ae55bfc 100644
--- a/projects/clr/rocclr/device/gpu/gpuprogram.cpp
+++ b/projects/clr/rocclr/device/gpu/gpuprogram.cpp
@@ -1838,6 +1838,7 @@ hsa_isa_t ORCAHSALoaderContext::IsaFromName(const char* name) {
       return isa;
   }
 
+  LogPrintfError("Couldn't find: %s!", name);
   return isa;
 }
 
@@ -1847,10 +1848,11 @@ bool ORCAHSALoaderContext::IsaSupportedByAgent(hsa_agent_t agent, hsa_isa_t isa)
       LogError("Unsupported gfxip version");
       return false;
     case gfx700:
+      return isa.handle == gfx700;
     case gfx701:
     case gfx702:
-      // gfx701 only differs from gfx700 by faster fp operations and can be loaded on either device.
-      return isa.handle == gfx700 || isa.handle == gfx701;
+      // gfx701 only differs from gfx702 by faster fp operations and can be loaded on either device.
+      return isa.handle == gfx701 || isa.handle == gfx702;
     case gfx800:
       switch (program_->dev().hwInfo()->machine_) {
         case ED_ATI_CAL_MACHINE_ICELAND_ISA: