diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S b/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S
new file mode 120000
index 0000000000..16c9600789
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S
@@ -0,0 +1 @@
+Arista-7050QX-32S-S4Q31
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32
deleted file mode 120000
index 6a90d8a3ac..0000000000
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32
+++ /dev/null
@@ -1 +0,0 @@
-Arista-7050-QX-32S
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers.json.j2
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers.json.j2
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers.json.j2
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers_defaults_t0.j2
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers_defaults_t1.j2
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/hwsku-init b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/hwsku-init
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/hwsku-init
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/hwsku-init
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/pg_profile_lookup.ini
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/port_config.ini b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/port_config.ini
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/port_config.ini
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/port_config.ini
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json.j2
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/sai.profile b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/sai.profile
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/sai.profile
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/sai.profile
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/td2-a7050-qx32s-32x40G.config.bcm b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G.config.bcm
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/td2-a7050-qx32s-32x40G.config.bcm
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G.config.bcm