diff --git a/qcom/blair-rhodep-common-overlay.dtsi b/qcom/blair-rhodep-common-overlay.dtsi
index a5835e1d5d25..b96c22364681 100644
--- a/qcom/blair-rhodep-common-overlay.dtsi
+++ b/qcom/blair-rhodep-common-overlay.dtsi
@@ -220,44 +220,6 @@
 		status = "ok";
 };
 
-&pmk8350_vadc {
-	pmk8350_qtm_n_therm {
-		reg = <PMK8350_ADC7_AMUX_THM2_100K_PU>;
-		label = "pmk8350_qtm_n_therm";
-		qcom,ratiometric;
-		qcom,hw-settle-time = <200>;
-		qcom,pre-scaling = <1 1>;
-	};
-	pmk8350_qtm_e_therm {
-		reg = <PMK8350_ADC7_AMUX_THM4_100K_PU>;
-		label = "pmk8350_qtm_e_therm";
-		qcom,ratiometric;
-		qcom,hw-settle-time = <200>;
-		qcom,pre-scaling = <1 1>;
-	};
-};
-
-&pmk8350_adc_tm {
-	io-channels = <&pmk8350_vadc PMK8350_ADC7_AMUX_THM1_100K_PU>,
-			<&pmk8350_vadc PMK8350_ADC7_AMUX_THM2_100K_PU>,
-			<&pmk8350_vadc PMK8350_ADC7_AMUX_THM4_100K_PU>;
-
-	qtm_n__therm {
-		reg = <PMK8350_ADC7_AMUX_THM2_100K_PU>;
-		qcom,ratiometric;
-		qcom,hw-settle-time = <200>;
-	};
-	qtm_e_therm {
-		reg = <PMK8350_ADC7_AMUX_THM4_100K_PU>;
-		qcom,ratiometric;
-		qcom,hw-settle-time = <200>;
-	};
-};
-
-&sx937x {
-	status = "disabled";
-};
-
 &qupv3_se7_i2c {
 	status = "ok";
 	#address-cells = <1>;
@@ -381,34 +343,93 @@
 	};
 };
 
+&pmk8350_vadc {
+	pmk8350_chg_therm {
+		reg = <PMK8350_ADC7_AMUX_THM2_100K_PU>;
+		label = "pmk8350_chg_therm";
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+		qcom,pre-scaling = <1 1>;
+	};
+
+	pmk8350_usb_conn_therm {
+		reg = <PMK8350_ADC7_AMUX_THM4_100K_PU>;
+		label = "pmk8350_ufs_therm";
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+		qcom,pre-scaling = <1 1>;
+	};
+};
+
+&pmk8350_adc_tm {
+	io-channels = <&pmk8350_vadc PMK8350_ADC7_AMUX_THM1_100K_PU>,
+			<&pmk8350_vadc PMK8350_ADC7_AMUX_THM2_100K_PU>,
+			<&pmk8350_vadc PMK8350_ADC7_AMUX_THM4_100K_PU>;
+
+	chg_therm {
+		reg = <PMK8350_ADC7_AMUX_THM2_100K_PU>;
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+	};
+	usb_conn_therm {
+		reg = <PMK8350_ADC7_AMUX_THM4_100K_PU>;
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+	};
+};
+
 &thermal_zones {
 	sdm-skin-therm-usr {
 		status = "disabled";
 	};
-
 	rear-cam-therm-usr {
 		status = "disabled";
 	};
-
 	camera-therm-usr {
 		status = "disabled";
 	};
-
 	quiet-therm-usr {
 		status = "disabled";
 	};
-
 	pa-therm0-usr {
 		status = "disabled";
 	};
-
 	pa-therm1-usr {
 		status = "disabled";
 	};
-
 	xo-therm-usr {
 		status = "disabled";
 	};
+	chg_therm {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM2_100K_PU>;
+		wake-capable-sensor;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	usb_conn_therm {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM4_100K_PU>;
+		wake-capable-sensor;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
 	msm_therm {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
@@ -424,7 +445,8 @@
 		};
 	};
 
-	chg_therm {
+
+	rfc_camera_therm {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "user_space";
@@ -439,7 +461,7 @@
 		};
 	};
 
-	cam_flash_therm {
+	camera_flash_therm {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "user_space";
@@ -454,7 +476,7 @@
 		};
 	};
 
-	pa_therm2 {
+	pa_therm1 {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "user_space";
@@ -469,7 +491,7 @@
 		};
 	};
 
-	pa_therm1 {
+	pa_therm2 {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "user_space";
@@ -490,56 +512,6 @@
 		thermal-governor = "user_space";
 		thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM2_100K_PU>;
 		wake-capable-sensor;
-		trips {
-			active-config0 {
-				temperature = <125000>;
-				hysteresis = <1000>;
-				type = "passive";
-			};
-
-			active-config1 {
-				temperature = <125000>;
-				hysteresis = <1000>;
-				type = "passive";
-			};
-		};
-	};
-
-	xo_therm {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
-		thermal-governor = "user_space";
-		thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM1_100K_PU>;
-		wake-capable-sensor;
-		trips {
-			active-config0 {
-				temperature = <125000>;
-				hysteresis = <1000>;
-				type = "passive";
-			};
-		};
-	};
-	qtm_n_therm {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
-		thermal-governor = "user_space";
-		thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM2_100K_PU>;
-		wake-capable-sensor;
-		trips {
-			active-config0 {
-				temperature = <125000>;
-				hysteresis = <1000>;
-				type = "passive";
-			};
-		};
-	};
-
-	qtm_e_therm {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
-		thermal-governor = "user_space";
-		thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM4_100K_PU>;
-		wake-capable-sensor;
 		trips {
 			active-config0 {
 				temperature = <125000>;