diff --git a/opencl/source/dll/linux/devices/devices_base.inl b/opencl/source/dll/linux/devices/devices_base.inl
index 2ab4c7b1ac..f138dcaf18 100644
--- a/opencl/source/dll/linux/devices/devices_base.inl
+++ b/opencl/source/dll/linux/devices/devices_base.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,13 +9,13 @@
 #ifdef SUPPORT_GEN12LP
 #ifdef SUPPORT_TGLLP
 DEVICE( 0xFF20, TGLLP_1x6x16, GTTYPE_GT2 )
-DEVICE( 0x9A49, TGLLP_1x6x16, GTTYPE_GT2 )
-DEVICE( 0x9A40, TGLLP_1x6x16, GTTYPE_GT2 )
+NAMEDDEVICE( 0x9A49, TGLLP_1x6x16, GTTYPE_GT2, "Intel(R) Iris(R) Xe Graphics" )
+NAMEDDEVICE( 0x9A40, TGLLP_1x6x16, GTTYPE_GT2, "Intel(R) Iris(R) Xe Graphics" )
 DEVICE( 0x9A59, TGLLP_1x6x16, GTTYPE_GT2 )
 DEVICE( 0x9A60, TGLLP_1x2x16, GTTYPE_GT2 )
 DEVICE( 0x9A68, TGLLP_1x2x16, GTTYPE_GT2 )
 DEVICE( 0x9A70, TGLLP_1x2x16, GTTYPE_GT2 )
-DEVICE( 0x9A78, TGLLP_1x2x16, GTTYPE_GT2 )
+NAMEDDEVICE( 0x9A78, TGLLP_1x2x16, GTTYPE_GT2, "Intel(R) UHD Graphics"  )
 #endif
 #ifdef SUPPORT_DG1
 DEVICE( 0x4905, DG1_CONFIG, GTTYPE_GT2 )
@@ -42,19 +42,19 @@ DEVICE( 0x4600, ADLS_HW_CONFIG, GTTYPE_GT1 )
 #ifdef SUPPORT_ICLLP
 // GT1
 DEVICE( 0xFF05, ICLLP_1x4x8, GTTYPE_GT1 )
-DEVICE( 0x8A56, ICLLP_1x4x8, GTTYPE_GT1 )
-DEVICE( 0x8A58, ICLLP_1x4x8, GTTYPE_GT1 )
-DEVICE( 0x8A5C, ICLLP_1x6x8, GTTYPE_GT1 )
-DEVICE( 0x8A5A, ICLLP_1x6x8, GTTYPE_GT1 )
+NAMEDDEVICE( 0x8A56, ICLLP_1x4x8, GTTYPE_GT1, "Intel(R) UHD Graphics" )
+NAMEDDEVICE( 0x8A58, ICLLP_1x4x8, GTTYPE_GT1, "Intel(R) UHD Graphics" )
+NAMEDDEVICE( 0x8A5C, ICLLP_1x6x8, GTTYPE_GT1, "Intel(R) Iris(R) Plus Graphics" )
+NAMEDDEVICE( 0x8A5A, ICLLP_1x6x8, GTTYPE_GT1, "Intel(R) Iris(R) Plus Graphics" )
 // GT2
 DEVICE( 0x8A50, ICLLP_1x8x8, GTTYPE_GT2 )
-DEVICE( 0x8A52, ICLLP_1x8x8, GTTYPE_GT2 )
-DEVICE( 0x8A51, ICLLP_1x8x8, GTTYPE_GT2 )
+NAMEDDEVICE( 0x8A52, ICLLP_1x8x8, GTTYPE_GT2, "Intel(R) Iris(R) Plus Graphics" )
+NAMEDDEVICE( 0x8A51, ICLLP_1x8x8, GTTYPE_GT2, "Intel(R) Iris(R) Plus Graphics" )
 
 #endif
 
 #ifdef SUPPORT_LKF
-DEVICE( 0x9840, LKF_1x8x8, GTTYPE_GT1 )
+NAMEDDEVICE( 0x9840, LKF_1x8x8, GTTYPE_GT1, "Intel(R) UHD Graphics" )
 #endif
 
 #ifdef SUPPORT_EHL
@@ -75,10 +75,10 @@ DEVICE( 0x4E55, EHL_HW_CONFIG, GTTYPE_GT1 )
 #ifdef SUPPORT_SKL
 // GT1
 DEVICE( 0x0901, SKL_1x2x6,  GTTYPE_GT1 )
-DEVICE( 0x1902, SKL_1x2x6,  GTTYPE_GT1 )
-DEVICE( 0x190B, SKL_1x2x6,  GTTYPE_GT1 )
+NAMEDDEVICE( 0x1902, SKL_1x2x6,  GTTYPE_GT1, "Intel(R) HD Graphics 510" )
+NAMEDDEVICE( 0x190B, SKL_1x2x6,  GTTYPE_GT1, "Intel(R) HD Graphics 510" )
 DEVICE( 0x190A, SKL_1x2x6,  GTTYPE_GT1 )
-DEVICE( 0x1906, SKL_1x2x6,  GTTYPE_GT1 )
+NAMEDDEVICE( 0x1906, SKL_1x2x6,  GTTYPE_GT1, "Intel(R) HD Graphics 510" )
 DEVICE( 0x190E, SKL_1x2x6,  GTTYPE_GT1 )
 // GT1_5
 DEVICE( 0x1917, SKL_1x3x6,  GTTYPE_GT1_5 )
@@ -86,28 +86,28 @@ DEVICE( 0x1913, SKL_1x3x6,  GTTYPE_GT1_5 )
 DEVICE( 0X1915, SKL_1x3x6,  GTTYPE_GT1_5 )
 // GT2
 DEVICE( 0x0902, SKL_1x3x8,  GTTYPE_GT2 )
-DEVICE( 0x1912, SKL_1x3x8,  GTTYPE_GT2 )
-DEVICE( 0x191B, SKL_1x3x8,  GTTYPE_GT2 )
+NAMEDDEVICE( 0x1912, SKL_1x3x8,  GTTYPE_GT2, "Intel(R) HD Graphics 530" )
+NAMEDDEVICE( 0x191B, SKL_1x3x8,  GTTYPE_GT2, "Intel(R) HD Graphics 530" )
 DEVICE( 0x191A, SKL_1x3x8,  GTTYPE_GT2 )
-DEVICE( 0x1916, SKL_1x3x8,  GTTYPE_GT2 )
-DEVICE( 0x191E, SKL_1x3x8,  GTTYPE_GT2 )
-DEVICE( 0x191D, SKL_1x3x8,  GTTYPE_GT2 )
-DEVICE( 0x1921, SKL_1x3x8,  GTTYPE_GT2 )
+NAMEDDEVICE( 0x1916, SKL_1x3x8,  GTTYPE_GT2, "Intel(R) HD Graphics 520" )
+NAMEDDEVICE( 0x191E, SKL_1x3x8,  GTTYPE_GT2, "Intel(R) HD Graphics 515" )
+NAMEDDEVICE( 0x191D, SKL_1x3x8,  GTTYPE_GT2, "Intel(R) HD Graphics P530" )
+NAMEDDEVICE( 0x1921, SKL_1x3x8,  GTTYPE_GT2, "Intel(R) HD Graphics 520" )
 DEVICE( 0x9905, SKL_1x3x8,  GTTYPE_GT2 )
 // GT3
 DEVICE( 0x0903, SKL_2x3x8,  GTTYPE_GT3 )
 DEVICE( 0x192B, SKL_2x3x8,  GTTYPE_GT3 )
 DEVICE( 0x192D, SKL_2x3x8,  GTTYPE_GT3 )
 DEVICE( 0x192A, SKL_2x3x8,  GTTYPE_GT3 )
-DEVICE( 0x1923, SKL_2x3x8,  GTTYPE_GT3 )
-DEVICE( 0x1926, SKL_2x3x8,  GTTYPE_GT3 )
-DEVICE( 0x1927, SKL_2x3x8,  GTTYPE_GT3 )
+NAMEDDEVICE( 0x1923, SKL_2x3x8,  GTTYPE_GT3, "Intel(R) HD Graphics 535" )
+NAMEDDEVICE( 0x1926, SKL_2x3x8,  GTTYPE_GT3, "Intel(R) Iris(R) Graphics 540" )
+NAMEDDEVICE( 0x1927, SKL_2x3x8,  GTTYPE_GT3, "Intel(R) Iris(R) Graphics 550" )
 // GT4
 DEVICE( 0x0904, SKL_3x3x8,  GTTYPE_GT4 )
 DEVICE( 0x1932, SKL_3x3x8,  GTTYPE_GT4 )
-DEVICE( 0x193B, SKL_3x3x8,  GTTYPE_GT4 )
-DEVICE( 0x193A, SKL_3x3x8,  GTTYPE_GT4 )
-DEVICE( 0x193D, SKL_3x3x8,  GTTYPE_GT4 )
+NAMEDDEVICE( 0x193B, SKL_3x3x8,  GTTYPE_GT4, "Intel(R) Iris(R) Pro Graphics 580" )
+NAMEDDEVICE( 0x193A, SKL_3x3x8,  GTTYPE_GT4, "Intel(R) Iris(R) Pro Graphics P580" )
+NAMEDDEVICE( 0x193D, SKL_3x3x8,  GTTYPE_GT4, "Intel(R) Iris(R) Pro Graphics P580" )
 #endif
 
 #ifdef SUPPORT_KBL