diff --git a/device/mellanox/x86_64-mlnx_msn2010-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn2010-r0/platform_components.json
index 2ffab4b017..a5cd5b152c 100644
--- a/device/mellanox/x86_64-mlnx_msn2010-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn2010-r0/platform_components.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "x86_64-mlnx_msn2010-r0": {
+        "MSN2010": {
             "component": {
                 "ONIE": { },
                 "SSD": { },
diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn2100-r0/platform_components.json
index 7778adf6fc..b8936fa3ad 100644
--- a/device/mellanox/x86_64-mlnx_msn2100-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/platform_components.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "x86_64-mlnx_msn2100-r0": {
+        "MSN2100": {
             "component": {
                 "ONIE": { },
                 "SSD": { },
diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn2410-r0/platform_components.json
index b6a1555c71..52c09f4ea9 100644
--- a/device/mellanox/x86_64-mlnx_msn2410-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/platform_components.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "x86_64-mlnx_msn2410-r0": {
+        "MSN2410": {
             "component": {
                 "ONIE": { },
                 "SSD": { },
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn2700-r0/platform_components.json
index 00ef07c819..33a73547cc 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/platform_components.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "x86_64-mlnx_msn2700-r0": {
+        "MSN2700": {
             "component": {
                 "ONIE": { },
                 "SSD": { },
diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn2740-r0/platform_components.json
index 1765103d2f..da85f2b579 100644
--- a/device/mellanox/x86_64-mlnx_msn2740-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn2740-r0/platform_components.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "x86_64-mlnx_msn2740-r0": {
+        "MSN2740": {
             "component": {
                 "ONIE": { },
                 "SSD": { },
diff --git a/device/mellanox/x86_64-mlnx_msn3420-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn3420-r0/platform_components.json
index b243ca061a..9b5cceae9f 100644
--- a/device/mellanox/x86_64-mlnx_msn3420-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn3420-r0/platform_components.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "x86_64-mlnx_msn3420-r0": {
+        "MSN3420": {
             "component": {
                 "ONIE": { },
                 "SSD": { },
diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn3700-r0/platform_components.json
index c374fb0aba..6ca284d3f3 100644
--- a/device/mellanox/x86_64-mlnx_msn3700-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn3700-r0/platform_components.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "x86_64-mlnx_msn3700-r0": {
+        "MSN3700": {
             "component": {
                 "ONIE": { },
                 "SSD": { },
diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn3700c-r0/platform_components.json
index 437804c652..807503fced 100644
--- a/device/mellanox/x86_64-mlnx_msn3700c-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn3700c-r0/platform_components.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "x86_64-mlnx_msn3700c-r0": {
+        "MSN3700C": {
             "component": {
                 "ONIE": { },
                 "SSD": { },
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn3800-r0/platform_components.json
index 88d3afec16..deddbcc041 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/platform_components.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "x86_64-mlnx_msn3800-r0": {
+        "MSN3800": {
             "component": {
                 "ONIE": { },
                 "SSD": { },
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn4600c-r0/platform_components.json
index 09a7e924d1..22bcfcc297 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/platform_components.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "x86_64-mlnx_msn4600c-r0": {
+        "MSN4600C": {
             "component": {
                 "ONIE": { },
                 "SSD": { },
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn4700-r0/platform_components.json
index 4a64ae0cb2..c663b78218 100644
--- a/device/mellanox/x86_64-mlnx_msn4700-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/platform_components.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "x86_64-mlnx_msn4700-r0": {
+        "MSN4700": {
             "component": {
                 "ONIE": { },
                 "SSD": { },