diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/default_sku b/device/mellanox/x86_64-mlnx_msn4800-r0/default_sku
deleted file mode 100644
index f50c8b52baa3..000000000000
--- a/device/mellanox/x86_64-mlnx_msn4800-r0/default_sku
+++ /dev/null
@@ -1 +0,0 @@
-ACS-MSN4800 t1
diff --git a/device/mellanox/x86_64-mlnx_msn4800_simx-r0/ACS-MSN4800 b/device/mellanox/x86_64-mlnx_msn4800_simx-r0/ACS-MSN4800
deleted file mode 120000
index c91b607a31cc..000000000000
--- a/device/mellanox/x86_64-mlnx_msn4800_simx-r0/ACS-MSN4800
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64-mlnx_msn4800-r0/ACS-MSN4800/
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4800_simx-r0/default_sku b/device/mellanox/x86_64-mlnx_msn4800_simx-r0/default_sku
deleted file mode 120000
index a81dbe5c2475..000000000000
--- a/device/mellanox/x86_64-mlnx_msn4800_simx-r0/default_sku
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64-mlnx_msn4800-r0/default_sku
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4800_simx-r0/plugins b/device/mellanox/x86_64-mlnx_msn4800_simx-r0/plugins
deleted file mode 120000
index 92912a201dd1..000000000000
--- a/device/mellanox/x86_64-mlnx_msn4800_simx-r0/plugins
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64-mlnx_msn4800-r0/plugins/
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/buffers.json.j2 b/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/buffers.json.j2
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/buffers.json.j2
rename to device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/buffers.json.j2
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/buffers_defaults_objects.j2 b/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/buffers_defaults_objects.j2
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/buffers_defaults_objects.j2
rename to device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/buffers_defaults_objects.j2
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/buffers_defaults_t0.j2 b/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/buffers_defaults_t0.j2
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/buffers_defaults_t0.j2
rename to device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/buffers_defaults_t0.j2
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/buffers_defaults_t1.j2 b/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/buffers_defaults_t1.j2
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/buffers_defaults_t1.j2
rename to device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/buffers_defaults_t1.j2
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/buffers_dynamic.json.j2 b/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/buffers_dynamic.json.j2
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/buffers_dynamic.json.j2
rename to device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/buffers_dynamic.json.j2
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/hwsku.json b/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/hwsku.json
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/hwsku.json
rename to device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/hwsku.json
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/pg_profile_lookup.ini b/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/pg_profile_lookup.ini
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/pg_profile_lookup.ini
rename to device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/pg_profile_lookup.ini
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/port_config.ini b/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/port_config.ini
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/port_config.ini
rename to device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/port_config.ini
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/qos.json.j2 b/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/qos.json.j2
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/qos.json.j2
rename to device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/qos.json.j2
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/sai.profile b/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/sai.profile
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/sai.profile
rename to device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/sai.profile
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/sai_4800.xml b/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/sai_4800.xml
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/sai_4800.xml
rename to device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/sai_4800.xml
diff --git a/device/mellanox/x86_64-nvidia_sn4800-r0/default_sku b/device/mellanox/x86_64-nvidia_sn4800-r0/default_sku
new file mode 100644
index 000000000000..50dfa0dc6ddf
--- /dev/null
+++ b/device/mellanox/x86_64-nvidia_sn4800-r0/default_sku
@@ -0,0 +1 @@
+ACS-SN4800 t1
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/pcie.yaml b/device/mellanox/x86_64-nvidia_sn4800-r0/pcie.yaml
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/pcie.yaml
rename to device/mellanox/x86_64-nvidia_sn4800-r0/pcie.yaml
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/platform.json b/device/mellanox/x86_64-nvidia_sn4800-r0/platform.json
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/platform.json
rename to device/mellanox/x86_64-nvidia_sn4800-r0/platform.json
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/platform_asic b/device/mellanox/x86_64-nvidia_sn4800-r0/platform_asic
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/platform_asic
rename to device/mellanox/x86_64-nvidia_sn4800-r0/platform_asic
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/platform_components.json b/device/mellanox/x86_64-nvidia_sn4800-r0/platform_components.json
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/platform_components.json
rename to device/mellanox/x86_64-nvidia_sn4800-r0/platform_components.json
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/platform_reboot b/device/mellanox/x86_64-nvidia_sn4800-r0/platform_reboot
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/platform_reboot
rename to device/mellanox/x86_64-nvidia_sn4800-r0/platform_reboot
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/platform_wait b/device/mellanox/x86_64-nvidia_sn4800-r0/platform_wait
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/platform_wait
rename to device/mellanox/x86_64-nvidia_sn4800-r0/platform_wait
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/plugins/eeprom.py b/device/mellanox/x86_64-nvidia_sn4800-r0/plugins/eeprom.py
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/plugins/eeprom.py
rename to device/mellanox/x86_64-nvidia_sn4800-r0/plugins/eeprom.py
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/plugins/psuutil.py b/device/mellanox/x86_64-nvidia_sn4800-r0/plugins/psuutil.py
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/plugins/psuutil.py
rename to device/mellanox/x86_64-nvidia_sn4800-r0/plugins/psuutil.py
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/plugins/sfplpmget.py b/device/mellanox/x86_64-nvidia_sn4800-r0/plugins/sfplpmget.py
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/plugins/sfplpmget.py
rename to device/mellanox/x86_64-nvidia_sn4800-r0/plugins/sfplpmget.py
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/plugins/sfplpmset.py b/device/mellanox/x86_64-nvidia_sn4800-r0/plugins/sfplpmset.py
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/plugins/sfplpmset.py
rename to device/mellanox/x86_64-nvidia_sn4800-r0/plugins/sfplpmset.py
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/plugins/sfpreset.py b/device/mellanox/x86_64-nvidia_sn4800-r0/plugins/sfpreset.py
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/plugins/sfpreset.py
rename to device/mellanox/x86_64-nvidia_sn4800-r0/plugins/sfpreset.py
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/plugins/sfputil.py b/device/mellanox/x86_64-nvidia_sn4800-r0/plugins/sfputil.py
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/plugins/sfputil.py
rename to device/mellanox/x86_64-nvidia_sn4800-r0/plugins/sfputil.py
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/pmon_daemon_control.json b/device/mellanox/x86_64-nvidia_sn4800-r0/pmon_daemon_control.json
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/pmon_daemon_control.json
rename to device/mellanox/x86_64-nvidia_sn4800-r0/pmon_daemon_control.json
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/sensors.conf b/device/mellanox/x86_64-nvidia_sn4800-r0/sensors.conf
similarity index 94%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/sensors.conf
rename to device/mellanox/x86_64-nvidia_sn4800-r0/sensors.conf
index f4c981f5ecac..3cf718641a81 100644
--- a/device/mellanox/x86_64-mlnx_msn4800-r0/sensors.conf
+++ b/device/mellanox/x86_64-nvidia_sn4800-r0/sensors.conf
@@ -141,16 +141,17 @@ bus "i2c-5" "i2c-1-mux (chan_id 3)"
         ignore curr4
 bus "i2c-56" "i2c-1-mux (chan_id 6)"
     chip "mp2975-i2c-*-6b"
-        label in1 "PMIC-6 PSU 12V Rail (in1)"
-        label in2 "PMIC-6 PSU 12V Rail (in2)"
-        label in3 "PMIC-6 COMEX 1.8V Rail (out1)"
-        label in4 "PMIC-6 COMEX 1.05V Rail (out2)"
-        label temp1 "PMIC-6 Temp 1"
-        label temp2 "PMIC-6 Temp 2"
-        label power1 "PMIC-6 COMEX 1.8V Rail Pwr (out1)"
-        label power2 "PMIC-6 COMEX 1.05V Rail Pwr (out2)"
-        label curr1 "PMIC-6 COMEX 1.8V Rail Curr (out1)"
-        label curr2 "PMIC-6 COMEX 1.05V Rail Curr (out2)"
+        label in1 "PMIC-6 PSU 12V Rail (vin)"
+        ignore in2
+        label in3 "PMIC-6 COMEX VCORE (out1)"
+        label in4 "PMIC-6 COMEX VCCSA (out2)"
+        label temp1 "PMIC-6 Temp"
+        label power1 "PMIC-6 COMEX Pwr (pin)"
+        label power2 "PMIC-6 COMEX VCORE Pwr (pout1)"
+        label power3 "PMIC-6 COMEX VCCSA Pwr (pout2)"
+        label curr1 "PMIC-6 COMEX Curr (iin)"
+        label curr2 "PMIC-6 COMEX VCORE Rail Curr (out1)"
+        label curr3 "PMIC-6 COMEX VCCSA Rail Curr (out2)"
 
 # Power supplies
 bus "i2c-4" "i2c-1-mux (chan_id 3)"
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/system_health_monitoring_config.json b/device/mellanox/x86_64-nvidia_sn4800-r0/system_health_monitoring_config.json
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/system_health_monitoring_config.json
rename to device/mellanox/x86_64-nvidia_sn4800-r0/system_health_monitoring_config.json
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/thermal_policy.json b/device/mellanox/x86_64-nvidia_sn4800-r0/thermal_policy.json
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800-r0/thermal_policy.json
rename to device/mellanox/x86_64-nvidia_sn4800-r0/thermal_policy.json
diff --git a/device/mellanox/x86_64-nvidia_sn4800_simx-r0/ACS-SN4800 b/device/mellanox/x86_64-nvidia_sn4800_simx-r0/ACS-SN4800
new file mode 120000
index 000000000000..9a7b8fc17cc8
--- /dev/null
+++ b/device/mellanox/x86_64-nvidia_sn4800_simx-r0/ACS-SN4800
@@ -0,0 +1 @@
+../x86_64-nvidia_sn4800-r0/ACS-SN4800
\ No newline at end of file
diff --git a/device/mellanox/x86_64-nvidia_sn4800_simx-r0/default_sku b/device/mellanox/x86_64-nvidia_sn4800_simx-r0/default_sku
new file mode 120000
index 000000000000..2aee4b06cc35
--- /dev/null
+++ b/device/mellanox/x86_64-nvidia_sn4800_simx-r0/default_sku
@@ -0,0 +1 @@
+../x86_64-nvidia_sn4800-r0/default_sku
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4800_simx-r0/platform_asic b/device/mellanox/x86_64-nvidia_sn4800_simx-r0/platform_asic
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800_simx-r0/platform_asic
rename to device/mellanox/x86_64-nvidia_sn4800_simx-r0/platform_asic
diff --git a/device/mellanox/x86_64-mlnx_msn4800_simx-r0/platform_reboot b/device/mellanox/x86_64-nvidia_sn4800_simx-r0/platform_reboot
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800_simx-r0/platform_reboot
rename to device/mellanox/x86_64-nvidia_sn4800_simx-r0/platform_reboot
diff --git a/device/mellanox/x86_64-nvidia_sn4800_simx-r0/plugins b/device/mellanox/x86_64-nvidia_sn4800_simx-r0/plugins
new file mode 120000
index 000000000000..568d16ab2902
--- /dev/null
+++ b/device/mellanox/x86_64-nvidia_sn4800_simx-r0/plugins
@@ -0,0 +1 @@
+../x86_64-nvidia_sn4800-r0/plugins
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4800_simx-r0/pmon_daemon_control.json b/device/mellanox/x86_64-nvidia_sn4800_simx-r0/pmon_daemon_control.json
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800_simx-r0/pmon_daemon_control.json
rename to device/mellanox/x86_64-nvidia_sn4800_simx-r0/pmon_daemon_control.json
diff --git a/device/mellanox/x86_64-mlnx_msn4800_simx-r0/syseeprom.hex b/device/mellanox/x86_64-nvidia_sn4800_simx-r0/syseeprom.hex
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800_simx-r0/syseeprom.hex
rename to device/mellanox/x86_64-nvidia_sn4800_simx-r0/syseeprom.hex
diff --git a/device/mellanox/x86_64-mlnx_msn4800_simx-r0/system_health_monitoring_config.json b/device/mellanox/x86_64-nvidia_sn4800_simx-r0/system_health_monitoring_config.json
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn4800_simx-r0/system_health_monitoring_config.json
rename to device/mellanox/x86_64-nvidia_sn4800_simx-r0/system_health_monitoring_config.json
diff --git a/platform/mellanox/asic_table.j2 b/platform/mellanox/asic_table.j2
index 53be34854364..9779884d38a6 100644
--- a/platform/mellanox/asic_table.j2
+++ b/platform/mellanox/asic_table.j2
@@ -40,6 +40,8 @@
         'x86_64-mlnx_msn4700-r0':'MELLANOX-SPECTRUM-3',
         'x86_64-mlnx_msn4600c-r0':'MELLANOX-SPECTRUM-3',
         'x86_64-mlnx_msn4600-r0':'MELLANOX-SPECTRUM-3',
+	'x86_64-nvidia_sn4800-r0':'MELLANOX-SPECTRUM-3',
+	'x86_64-nvidia_sn4800_simx-r0':'MELLANOX-SPECTRUM-3',
         'x86_64-nvidia_sn2201-r0':'MELLANOX-SPECTRUM',
         'x86_64-nvidia_sn5600-r0':'MELLANOX-SPECTRUM-4',
         'vs-platform':'vs'
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py b/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py
index 69849893f635..f3796059399b 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py
@@ -144,7 +144,7 @@
             }
         }
     },
-    'x86_64-mlnx_msn4800-r0': {
+    'x86_64-nvidia_sn4800-r0': {
         'thermal': {
             "capability": {
                 "comex_amb": False