diff --git a/boards/arrow,apq8096-db820c b/boards/arrow,apq8096-db820c
index 1d64904..4a7b4cc 100755
--- a/boards/arrow,apq8096-db820c
+++ b/boards/arrow,apq8096-db820c
@@ -141,8 +141,8 @@ assert_driver_present ufs-phy-driver-present ufs_qcom_phy_qmp_14nm
 assert_device_present ufs-phy-phy1-probed ufs_qcom_phy_qmp_14nm 627000.*
 
 # TSENS
-assert_driver_present qcom-tsens-driver-present qcom-tsens
-assert_device_present qcom-tsens0-device-probed qcom-tsens 4a8000.*
+assert_driver_present thermal-driver-tsens-present qcom-tsens
+assert_device_present thermal-device-tsens0-probed qcom-tsens 4a8000.*
 # 4 thermal zones: cpu x 4
 for num in `seq 0 4`
 do
diff --git a/boards/qcom,apq8016-sbc b/boards/qcom,apq8016-sbc
index 1cba4fd..8f70f3f 100755
--- a/boards/qcom,apq8016-sbc
+++ b/boards/qcom,apq8016-sbc
@@ -149,8 +149,8 @@ assert_driver_present wcnss-rproc-driver-present qcom-wcnss-pil
 assert_device_present wcnss-rproc-device-probed qcom-wcnss-pil a204000.*
 
 # TSENS
-assert_driver_present qcom-tsens-driver-present qcom-tsens
-assert_device_present qcom-tsens0-device-probed qcom-tsens 4a8000.*
+assert_driver_present thermal-driver-tsens-present qcom-tsens
+assert_device_present thermal-device-tsens0-probed qcom-tsens 4a8000.*
 # 4 thermal zones: cpu x 2, gpu, camera
 for num in `seq 0 3`
 do
diff --git a/boards/qcom,msm8998-mtp b/boards/qcom,msm8998-mtp
index 423e950..8e17ea3 100755
--- a/boards/qcom,msm8998-mtp
+++ b/boards/qcom,msm8998-mtp
@@ -182,9 +182,9 @@ assert_device_present pmic-temp-alarm-pm8005-probed spmi-temp-alarm *pmic@4:*@24
 # SPM
 
 # Tsens
-assert_driver_present tsens-driver-present qcom-tsens
-assert_device_present tsens0-device-probed qcom-tsens 10aa000.*
-assert_device_present tsens1-device-probed qcom-tsens 10ad000.*
+assert_driver_present thermal-driver-tsens-present qcom-tsens
+assert_device_present thermal-device-tsens0-probed qcom-tsens 10aa000.*
+assert_device_present thermal-device-tsens1-probed qcom-tsens 10ad000.*
 
 # ADSP PIL
 
diff --git a/boards/qcom,sdm845-mtp b/boards/qcom,sdm845-mtp
index 70d35ab..8050c89 100755
--- a/boards/qcom,sdm845-mtp
+++ b/boards/qcom,sdm845-mtp
@@ -132,9 +132,9 @@ assert_device_present spmi-pmic-arb-device-probed spmi_pmic_arb c440000.*
 # SPM
 
 # Tsens
-assert_driver_present tsens-driver-present qcom-tsens
-assert_device_present tsens0-device-probed qcom-tsens c263000.*
-assert_device_present tsens1-device-probed qcom-tsens c265000.*
+assert_driver_present thermal-driver-tsens-present qcom-tsens
+assert_device_present thermal-device-tsens0-probed qcom-tsens c263000.*
+assert_device_present thermal-device-tsens1-probed qcom-tsens c265000.*
 # 8 thermal zones: cpu x 8
 for num in `seq 0 7`
 do
diff --git a/boards/sony,xperia-castor b/boards/sony,xperia-castor
index 167f6e3..d76e2b2 100755
--- a/boards/sony,xperia-castor
+++ b/boards/sony,xperia-castor
@@ -188,8 +188,8 @@ echo   Current-limit:
 echo   MPM:
 echo   SPM:
 echo   Tsens:
-assert_driver_present tsens-driver-present qcom-tsens
-assert_device_present tsens-device-probed qcom-tsens fc4a8000.*
+assert_driver_present thermal-driver-tsens-present qcom-tsens
+assert_device_present thermal-device-tsens0-probed qcom-tsens fc4a8000.*
 
 echo Remoteproc:
 echo   ADSP PIL: