diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings.h b/rocclr/compiler/lib/utils/v0_8/target_mappings.h
index 7f7b0bd946..537c400007 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings.h
@@ -192,7 +192,7 @@ static const char* calTargetMapping[] = {
       "Spectre", "Spooky", "Kalindi",
       "Hainan", "Hawaii",
       "Iceland", "Tonga", "Mullins", "", "",
-      "",
+      "Peacock",
     };
 
 #include "utils/v0_8/target_mappings_amdil.h"
diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
index 4cbfb03ed6..69b4386ebc 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
@@ -83,12 +83,12 @@ static const TargetMapping AMDILTargetMapping_0_8[] = {
   { "SI", "Oland",      "oland",   amd::GPU_Library_SI,        SI_OLAND_M_A0,           F_SI_BASE, true, true, FAMILY_SI },
   { "CI", "Bonaire",    "bonaire", amd::GPU_Library_CI,        CI_BONAIRE_M_A0,         F_SI_BASE, true, false, FAMILY_CI },
   { "SI", "Hainan",     "hainan",  amd::GPU_Library_SI,        SI_HAINAN_V_A0,          F_SI_BASE, true, true, FAMILY_SI },
-  { "CZ", "Carrizo",    "peacock", amd::GPU_Library_CI,        CARRIZO_A0,              F_SI_BASE, true,  true, FAMILY_CZ },
 
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
+  { "CZ", "Peacock",    "peacock", amd::GPU_Library_CI,        CARRIZO_A0,              F_SI_BASE, true,  true, FAMILY_CZ },
   { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_W_A0,       F_NI_EXT, true, false, FAMILY_TN },
   { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_W_A1,       F_NI_EXT, true, false, FAMILY_TN },
   { "TN", "Scrapper",   "trinity", amd::GPU_Library_Evergreen, TN_SCRAPPER_LV_A0,        F_NI_EXT, true, false, FAMILY_TN },
diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h
index a84ddf14b2..102de26778 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h
@@ -35,12 +35,12 @@ static const TargetMapping AMDIL64TargetMapping_0_8[] = {
   { "SI", "Oland",     "oland",     amd::GPU64_Library_SI, SI_OLAND_M_A0,      F_SI_64BIT_PTR, true,  true,  FAMILY_SI },
   { "CI", "Bonaire",   "bonaire",   amd::GPU64_Library_CI, CI_BONAIRE_M_A0,    F_SI_64BIT_PTR, true,  false, FAMILY_CI },
   { "SI", "Hainan",    "hainan",    amd::GPU64_Library_SI, SI_HAINAN_V_A0,     F_SI_64BIT_PTR, true,  true,  FAMILY_SI },
-  { "CZ", "Carrizo",   "peacock",   amd::GPU64_Library_CI, CARRIZO_A0,         F_SI_64BIT_PTR, true,  true,  FAMILY_CZ },
 
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
+  { "CZ", "Peacock",   "peacock",   amd::GPU64_Library_CI, CARRIZO_A0,         F_SI_64BIT_PTR, true,  true,  FAMILY_CZ },
 
   { "VI", "Iceland",    "iceland",  amd::GPU64_Library_CI, VI_ICELAND_M_A0,    F_SI_64BIT_PTR, true,  true,  FAMILY_VI },
   { "VI", "Tonga",      "tonga",    amd::GPU64_Library_CI, VI_TONGA_P_A0,      F_SI_64BIT_PTR, true,  true,  FAMILY_VI },
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 6e91be5d52..81165d8b46 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
@@ -21,12 +21,12 @@ static const TargetMapping HSAILTargetMapping_0_8[] = {
   { "CI", "Hawaii",  "generic", amd::GPU_Library_HSAIL, CI_HAWAII_P_A0,  0, true, true,  FAMILY_CI },
   { "VI", "Iceland", "generic", amd::GPU_Library_HSAIL, VI_ICELAND_M_A0, 0, true, true,  FAMILY_VI },
   { "VI", "Tonga",   "generic", amd::GPU_Library_HSAIL, VI_TONGA_P_A0,   0, true, true,  FAMILY_VI },
-  { "CZ", "Carrizo", "generic", amd::GPU_Library_HSAIL, CARRIZO_A0,      0, true, true,  FAMILY_CZ },
 
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
+  { "CZ", "Peacock", "generic", amd::GPU_Library_HSAIL, CARRIZO_A0,      0, true, true,  FAMILY_CZ },
   InvalidTarget
 };
 
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 dcbcb54c7a..a1fe403601 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
@@ -20,12 +20,12 @@ static const TargetMapping HSAIL64TargetMapping_0_8[] = {
   { "CI", "Hawaii",  "generic", amd::GPU_Library_HSAIL, CI_HAWAII_P_A0,  0, true, true,  FAMILY_CI },
   { "VI", "Iceland", "generic", amd::GPU_Library_HSAIL, VI_ICELAND_M_A0, 0, true, true,  FAMILY_VI },
   { "VI", "Tonga",   "generic", amd::GPU_Library_HSAIL, VI_TONGA_P_A0,   0, true, true,  FAMILY_VI },
-  { "CZ", "Carrizo", "generic", amd::GPU_Library_HSAIL, CARRIZO_A0,      0, true, true,  FAMILY_CZ },
 
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
+  { "CZ", "Peacock", "generic", amd::GPU_Library_HSAIL, CARRIZO_A0,      0, true, true,  FAMILY_CZ },
   InvalidTarget
 };