diff --git a/rocclr/compiler/lib/backends/common/linker.cpp b/rocclr/compiler/lib/backends/common/linker.cpp
index 1988f0fc3c..e3ce0982fa 100644
--- a/rocclr/compiler/lib/backends/common/linker.cpp
+++ b/rocclr/compiler/lib/backends/common/linker.cpp
@@ -591,7 +591,7 @@ amdcl::OCLLinker::link(llvm::Module* input, std::vector<std::unique_ptr<llvm::Mo
                 || chip == "gfx906"
                 || chip == "gfx907"
                 || chip == "gfx1000"
-                || chip == "gfx1001");
+                || chip == "gfx1010");
   setISAVersion(getIsaType(aclutGetTargetInfo(Elf())));
   LLVMBinary()->getContext().setAMDLLVMContextHook(&hookup_);
 
diff --git a/rocclr/compiler/lib/utils/v0_8/libUtils.cpp b/rocclr/compiler/lib/utils/v0_8/libUtils.cpp
index 5cf95878aa..fca1eea4e5 100644
--- a/rocclr/compiler/lib/utils/v0_8/libUtils.cpp
+++ b/rocclr/compiler/lib/utils/v0_8/libUtils.cpp
@@ -30,7 +30,7 @@ static const std::string sgfx905 = "AMD:AMDGPU:9:0:5";
 static const std::string sgfx906 = "AMD:AMDGPU:9:0:6";
 static const std::string sgfx907 = "AMD:AMDGPU:9:0:7";
 static const std::string sgfx1000 = "AMD:AMDGPU:10:0:0";
-static const std::string sgfx1001 = "AMD:AMDGPU:10:0:1";
+static const std::string sgfx1010 = "AMD:AMDGPU:10:1:0";
 
 static const std::string legacyLibName = LINUX_ONLY("lib") "amdocl12cl" LP64_SWITCH(LINUX_SWITCH("32", ""), "64") LINUX_SWITCH(".so", ".dll");
 
@@ -511,7 +511,7 @@ const std::string &getIsaTypeName(const aclTargetInfo *target)
   case 906: return sgfx906;
   case 907: return sgfx907;
   case 1000: return sgfx1000;
-  case 1001: return sgfx1001;
+  case 1010: return sgfx1010;
   }
 }
 
@@ -586,7 +586,8 @@ int getIsaType(const aclTargetInfo *target)
     case FAMILY_NV:
       switch (Mapping.chip_enum) {
         default: return 1000;
-        case NV_NAVI10_P_A0:    return Mapping.xnack_supported ? 1001 : 1000;
+        case NV_NAVI10_LITE_P_A0:    return 1000;
+        case NV_NAVI10_P_A0:         return 1010;
       }
     }
 }
diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings.h b/rocclr/compiler/lib/utils/v0_8/target_mappings.h
index e6a30d977c..b5a4278170 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings.h
@@ -218,8 +218,8 @@ static const char* calTargetMapping[] = {
       IF(IS_BRAHMA,"","gfx906"),
       IF(IS_BRAHMA,"","gfx907"),
       IF(IS_BRAHMA,"","gfx1000"),
-      IF(IS_BRAHMA,"","gfx1001"),
-    };
+      IF(IS_BRAHMA,"","gfx1010"),
+};
 
 #include "utils/v0_8/target_mappings_amdil.h"
 #include "utils/v0_8/target_mappings_hsail.h"
diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
index 3307c31448..853148c539 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
@@ -51,8 +51,9 @@ static const TargetMapping HSAILTargetMapping_0_8[] = {
   { "AI", "gfx905",    "GFX9",  amd::GPU_Library_HSAIL, AI_VEGA12_P_A0,     F_AI_BASE, true, true,  FAMILY_AI, true },
   { "AI", "gfx906",    "GFX9",  amd::GPU_Library_HSAIL, AI_VEGA20_P_A0,     F_AI_BASE, true, true,  FAMILY_AI, false },
   { "AI", "gfx907",    "GFX9",  amd::GPU_Library_HSAIL, AI_VEGA20_P_A0,     F_AI_BASE, true, true,  FAMILY_AI, true },
-  { "NV", "gfx1000",   "GFX10", amd::GPU_Library_HSAIL, NV_NAVI10_P_A0,     F_AI_BASE, true, true,  FAMILY_NV, false },
-  { "NV", "gfx1001",   "GFX10", amd::GPU_Library_HSAIL, NV_NAVI10_P_A0,     F_AI_BASE, true, true,  FAMILY_NV, true },
+  { "NV", "gfx1000",   "GFX10", amd::GPU_Library_HSAIL, NV_NAVI10_LITE_P_A0,     F_AI_BASE, true, true,  FAMILY_NV, false },
+  { "NV", "gfx1010",   "GFX10", amd::GPU_Library_HSAIL, NV_NAVI10_P_A0,     F_AI_BASE, true, true,  FAMILY_NV, false },
+
 #else
   UnknownTarget,
   UnknownTarget,
diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
index a28ec5e2aa..97abdc30ed 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
@@ -50,8 +50,8 @@ static const TargetMapping HSAIL64TargetMapping_0_8[] = {
   { "AI", "gfx905",    "GFX9",  amd::GPU_Library_HSAIL, AI_VEGA12_P_A0,     F_AI_BASE, true, true,  FAMILY_AI, true },
   { "AI", "gfx906",    "GFX9",  amd::GPU_Library_HSAIL, AI_VEGA20_P_A0,     F_AI_BASE, true, true,  FAMILY_AI, false },
   { "AI", "gfx907",    "GFX9",  amd::GPU_Library_HSAIL, AI_VEGA20_P_A0,     F_AI_BASE, true, true,  FAMILY_AI, true },
-  { "NV", "gfx1000",   "GFX10", amd::GPU_Library_HSAIL, NV_NAVI10_P_A0,     F_AI_BASE, true, true,  FAMILY_NV, false },
-  { "NV", "gfx1001",   "GFX10", amd::GPU_Library_HSAIL, NV_NAVI10_P_A0,     F_AI_BASE, true, true,  FAMILY_NV, true },
+  { "NV", "gfx1000",   "GFX10", amd::GPU_Library_HSAIL, NV_NAVI10_LITE_P_A0,     F_AI_BASE, true, true,  FAMILY_NV, false },
+  { "NV", "gfx1010",   "GFX10", amd::GPU_Library_HSAIL, NV_NAVI10_P_A0,     F_AI_BASE, true, true,  FAMILY_NV, false },
 #else
   UnknownTarget,
   UnknownTarget,