diff --git a/kera-audio-atp.dtsi b/kera-audio-atp.dtsi
index 3d2cee82..4f193ac6 100644
--- a/kera-audio-atp.dtsi
+++ b/kera-audio-atp.dtsi
@@ -21,7 +21,7 @@
 	qcom,wsa-max-devs = <0>;
 };
 
-&wsa_swr {
+&swr0 {
 	qcom,swr-num-dev = <0>;
 };
 
diff --git a/kera-audio-cdp.dtsi b/kera-audio-cdp.dtsi
index b14dcf5d..3bba2f68 100644
--- a/kera-audio-cdp.dtsi
+++ b/kera-audio-cdp.dtsi
@@ -58,7 +58,7 @@
 	status = "okay";
 };
 
-&wsa_swr {
+&swr0 {
 	wsa884x_0220: wsa884x@02170220 {
 		status = "okay";
 	};
diff --git a/kera-audio-lpass-reg.dtsi b/kera-audio-lpass-reg.dtsi
index d42a3289..4485f758 100644
--- a/kera-audio-lpass-reg.dtsi
+++ b/kera-audio-lpass-reg.dtsi
@@ -6,7 +6,7 @@
 	reg = <0x6AC0000 0x0>;
 };
 
-&rx_swr {
+&swr1 {
 	swrm-io-base = <0x6AD0000 0x0>;
 	interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
 };
@@ -19,12 +19,12 @@
 	reg = <0x6B00000 0x0>;
 };
 
-&wsa_swr {
+&swr0 {
 	swrm-io-base = <0x6B10000 0x0>;
 	interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
 };
 
-&tx_swr {
+&swr2 {
 	reg = <0x7630000 0x0>;
 };
 
diff --git a/kera-audio-mtp-qmp1000.dtsi b/kera-audio-mtp-qmp1000.dtsi
index 4d803fc7..902b1f00 100644
--- a/kera-audio-mtp-qmp1000.dtsi
+++ b/kera-audio-mtp-qmp1000.dtsi
@@ -5,7 +5,7 @@
 
 #include "kera-audio-mtp.dtsi"
 
-&rx_swr {
+&swr1 {
 	qcom,swr-num-dev = <2>;
 };
 
@@ -33,7 +33,7 @@
 	status = "disabled";
 };
 
-&tx_swr {
+&swr2 {
 	qmp01: qmp@04170232 {
 		/*
 		 * reg = <Class_partID[7:0]
diff --git a/kera-audio-mtp.dtsi b/kera-audio-mtp.dtsi
index 0c0647b0..067fe728 100644
--- a/kera-audio-mtp.dtsi
+++ b/kera-audio-mtp.dtsi
@@ -30,11 +30,11 @@
 	};
 };
 
-&rx_swr {
+&swr1 {
 	qcom,swr-num-dev = <2>;
 };
 
-&wsa_swr {
+&swr0 {
 	qcom,swr-num-dev = <2>;
 };
 
diff --git a/kera-audio-overlay.dtsi b/kera-audio-overlay.dtsi
index e71a94f5..8a88bbbc 100644
--- a/kera-audio-overlay.dtsi
+++ b/kera-audio-overlay.dtsi
@@ -37,7 +37,7 @@
 		qcom,use-clk-id = <VA_CORE_CLK>;
 		qcom,is-used-swr-gpio = <1>;
 		qcom,va-swr-gpios = <&va_swr_gpios>;
-		tx_swr: va_swr_master {
+		swr2: va_swr_master {
 			compatible = "qcom,swr-mstr";
 			#address-cells = <2>;
 			#size-cells = <0>;
@@ -93,7 +93,7 @@
 		qcom,default-clk-id = <RX_TX_CORE_CLK>;
 		clock-names = "rx_mclk2_2x_clk";
 		clocks = <&clock_audio_rx_mclk2_2x_clk 0>;
-		rx_swr: rx_swr_master {
+		swr1: rx_swr_master {
 			compatible = "qcom,swr-mstr";
 			#address-cells = <2>;
 			#size-cells = <0>;
@@ -152,7 +152,7 @@
 		qcom,thermal-max-state = <11>;
 		qcom,noise-gate-mode = <2>;
 		#cooling-cells = <2>;
-		wsa_swr: wsa_swr_master {
+		swr0: wsa_swr_master {
 			compatible = "qcom,swr-mstr";
 			#address-cells = <2>;
 			#size-cells = <0>;
diff --git a/kera-audio-qrd.dtsi b/kera-audio-qrd.dtsi
index 9768b064..0afe6dc6 100644
--- a/kera-audio-qrd.dtsi
+++ b/kera-audio-qrd.dtsi
@@ -29,7 +29,7 @@
 	};
 };
 
-&wsa_swr {
+&swr0 {
 	wsa884x_0220: wsa884x@02170220 {
 		status = "disabled";
 	};
diff --git a/kera-audio.dtsi b/kera-audio.dtsi
index 16d1110e..59d02973 100644
--- a/kera-audio.dtsi
+++ b/kera-audio.dtsi
@@ -135,7 +135,7 @@
 		};
 
 		va_macro: va-macro@7660000 {
-			tx_swr: va_swr_master {
+			swr2: va_swr_master {
 			};
 		};
 
@@ -143,12 +143,12 @@
 		};
 
 		rx_macro: rx-macro@6AC0000 {
-			rx_swr: rx_swr_master {
+			swr1: rx_swr_master {
 			};
 		};
 
 		wsa_macro: wsa-macro@6B00000 {
-			wsa_swr: wsa_swr_master {
+			swr0: wsa_swr_master {
 			};
 		};
 
@@ -175,9 +175,9 @@
 };
 
 &aliases {
-	wsa_swr = "/soc/spf_core_platform/lpass-cdc/wsa-macro@6B00000/wsa_swr_master";
-	rx_swr = "/soc/spf_core_platform/lpass-cdc/rx-macro@6AC0000/rx_swr_master";
-	tx_swr = "/soc/spf_core_platform/lpass-cdc/va-macro@7660000/va_swr_master";
+	swr0 = "/soc/spf_core_platform/lpass-cdc/wsa-macro@6B00000/wsa_swr_master";
+	swr1 = "/soc/spf_core_platform/lpass-cdc/rx-macro@6AC0000/rx_swr_master";
+	swr2 = "/soc/spf_core_platform/lpass-cdc/va-macro@7660000/va_swr_master";
 	swr4 = "/soc/spf_core_platform/lpass_bt_swr@6CA0000/bt_swr_mstr";
 };