diff --git a/configs/thermal/thermal-engine-battery.conf b/configs/thermal/thermal-engine-battery.conf
index f8973ef3..3e0e0c8c 100644
--- a/configs/thermal/thermal-engine-battery.conf
+++ b/configs/thermal/thermal-engine-battery.conf
@@ -1,30 +1,30 @@
 # SENSOR : ALIAS
-# tsens_tz_sensor8 : gpu
-# tsens_tz_sensor6 : cpu7
-# tsens_tz_sensor5 : cpu6
-# tsens_tz_sensor4 : cpu5
-# tsens_tz_sensor3 : cpu4
-# tsens_tz_sensor1 : cpu0-cpu1-cpu2-cpu3
+# gpu-usr : gpu
+# cpu-1-3-step : cpu7
+# cpu-1-2-step : cpu6
+# cpu-1-1-step : cpu5
+# cpu-1-0-step : cpu4
+# cpuss-0-step : cpu0-cpu1-cpu2-cpu3
 
 #debug
 #Conf file: vendor/etc/thermal-engine-normal.conf
 
 [VIRTUAL-CLUSTER1]
 algo_type virtual
-trip_sensor tsens_tz_sensor3
+trip_sensor cpu-1-0-step
 set_point 68000
 set_point_clr 65000
-sensors tsens_tz_sensor3 tsens_tz_sensor4 tsens_tz_sensor5 tsens_tz_sensor6 tsens_tz_sensor7 tsens_tz_sensor12
+sensors cpu-1-0-step cpu-1-1-step cpu-1-2-step cpu-1-3-step cpuss-2-usr cpuss-0-step2
 weights
 sampling 10
 math 2
 
 [VIRTUAL-CLUSTER0]
 algo_type virtual
-trip_sensor tsens_tz_sensor1
+trip_sensor cpuss-0-step
 set_point 66000
 set_point_clr 64000
-sensors tsens_tz_sensor1 tsens_tz_sensor2
+sensors cpuss-0-step cpuss-1-usr
 weights
 sampling 10
 math 2
@@ -32,7 +32,7 @@ math 2
 [SS-XO-THERM-GOLD]
 algo_type ss
 sampling 2000
-sensor xo_therm
+sensor xo-therm-adc
 device cluster1
 set_point 57000
 set_point_clr 53000
@@ -42,7 +42,7 @@ device_max_limit 14016000
 [SS-XO-THERM-SILVER]
 algo_type ss
 sampling 2000
-sensor xo_therm
+sensor xo-therm-adc
 device cluster0
 set_point 57000
 set_point_clr 53000
@@ -52,7 +52,7 @@ device_max_limit 902400
 [SS-QUIET-THERM-GOLD2]
 algo_type ss
 sampling 2000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 device cluster1
 set_point 68000
 set_point_clr 65000
@@ -62,7 +62,7 @@ device_max_limit 1401600
 [SS-QUIET-THERM-SILVER2]
 algo_type ss
 sampling 2000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 device cluster0
 set_point 66000
 set_point_clr 64000
@@ -72,7 +72,7 @@ device_max_limit 902400
 [SS-QUIET-THERM-SILVER]
 algo_type ss
 sampling 2000
-sensor quiet_therm
+sensor quiet-therm-adc
 device cluster0
 set_point 60000
 set_point_clr 57000
@@ -82,7 +82,7 @@ device_max_limit 1536000
 [SS-QUIET-THERM-GOLD]
 algo_type ss
 sampling 2000
-sensor quiet_therm
+sensor quiet-therm-adc
 device cluster1
 set_point 55000
 set_point_clr 53000
@@ -92,7 +92,7 @@ device_max_limit 1747200
 [SS-GPU]
 algo_type ss
 sampling 10
-sensor gpu
+sensor gpu-usr
 device gpu
 set_point 75000
 set_point_clr 65000
@@ -101,7 +101,7 @@ time_constant 0
 [BATTERY_CHARGING_CTL]
 algo_type monitor
 sampling 10000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 40000 42000 44000 46000
 thresholds_clr 39000 41000 43000 45000
 actions battery battery battery battery
@@ -110,7 +110,7 @@ action_info 1 2 4 5
 [CPU7_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 thresholds 72000
 thresholds_clr 68000
 actions hotplug_7
@@ -119,7 +119,7 @@ action_info 1
 [CPU3_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 thresholds 72000
 thresholds_clr 68000
 actions hotplug_3
@@ -128,7 +128,7 @@ action_info 1
 [CPU5_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 60000
 thresholds_clr 57000
 actions hotplug_5
@@ -137,7 +137,7 @@ action_info 1
 [CPU2_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 62000
 thresholds_clr 58000
 actions hotplug_2
diff --git a/configs/thermal/thermal-engine-battery2.conf b/configs/thermal/thermal-engine-battery2.conf
index a4c42abb..f7d0ba65 100644
--- a/configs/thermal/thermal-engine-battery2.conf
+++ b/configs/thermal/thermal-engine-battery2.conf
@@ -1,30 +1,30 @@
 # SENSOR : ALIAS
-# tsens_tz_sensor8 : gpu
-# tsens_tz_sensor6 : cpu7
-# tsens_tz_sensor5 : cpu6
-# tsens_tz_sensor4 : cpu5
-# tsens_tz_sensor3 : cpu4
-# tsens_tz_sensor1 : cpu0-cpu1-cpu2-cpu3
+# gpu-usr : gpu
+# cpu-1-3-step : cpu7
+# cpu-1-2-step : cpu6
+# cpu-1-1-step : cpu5
+# cpu-1-0-step : cpu4
+# cpuss-0-step : cpu0-cpu1-cpu2-cpu3
 
 #debug
 #Conf file: vendor/etc/thermal-engine-video.conf
 
 [VIRTUAL-CLUSTER1]
 algo_type virtual
-trip_sensor tsens_tz_sensor3
+trip_sensor cpu-1-0-step
 set_point 60000
 set_point_clr 50000
-sensors tsens_tz_sensor3 tsens_tz_sensor4 tsens_tz_sensor5 tsens_tz_sensor6 tsens_tz_sensor7 tsens_tz_sensor12
+sensors cpu-1-0-step cpu-1-1-step cpu-1-2-step cpu-1-3-step cpuss-2-usr cpuss-0-step2
 weights
 sampling 10
 math 2
 
 [VIRTUAL-CLUSTER0]
 algo_type virtual
-trip_sensor tsens_tz_sensor1
+trip_sensor cpuss-0-step
 set_point 60000
 set_point_clr 50000
-sensors tsens_tz_sensor1 tsens_tz_sensor2
+sensors cpuss-0-step cpuss-1-usr
 weights
 sampling 10
 math 2
@@ -32,7 +32,7 @@ math 2
 [SS-XO-THERM-GOLD]
 algo_type ss
 sampling 2000
-sensor xo_therm
+sensor xo-therm-adc
 device cluster1
 set_point 47000
 set_point_clr 43000
@@ -42,7 +42,7 @@ device_max_limit 14016000
 [SS-XO-THERM-SILVER]
 algo_type ss
 sampling 2000
-sensor xo_therm
+sensor xo-therm-adc
 device cluster0
 set_point 45000
 set_point_clr 41000
@@ -52,7 +52,7 @@ device_max_limit 902400
 [SS-QUIET-THERM-GOLD2]
 algo_type ss
 sampling 2000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 device cluster1
 set_point 62000
 set_point_clr 57000
@@ -62,7 +62,7 @@ device_max_limit 1401600
 [SS-QUIET-THERM-SILVER2]
 algo_type ss
 sampling 2000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 device cluster0
 set_point 60000
 set_point_clr 55000
@@ -72,7 +72,7 @@ device_max_limit 902400
 [SS-QUIET-THERM-SILVER]
 algo_type ss
 sampling 2000
-sensor quiet_therm
+sensor quiet-therm-adc
 device cluster0
 set_point 41000
 set_point_clr 38000
@@ -82,7 +82,7 @@ device_max_limit 1536000
 [SS-QUIET-THERM-GOLD]
 algo_type ss
 sampling 2000
-sensor quiet_therm
+sensor quiet-therm-adc
 device cluster1
 set_point 40000
 set_point_clr 37000
@@ -92,7 +92,7 @@ device_max_limit 1747200
 [SS-GPU]
 algo_type ss
 sampling 10
-sensor gpu
+sensor gpu-usr
 device gpu
 set_point 95000
 set_point_clr 65000
@@ -101,7 +101,7 @@ time_constant 0
 [BATTERY_CHARGING_CTL]
 algo_type monitor
 sampling 10000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 37000 38000 41000 42000
 thresholds_clr 36000 37000 39000 40000
 actions battery battery battery battery
@@ -110,7 +110,7 @@ action_info 1 2 4 5
 [CPU_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 47000
 thresholds_clr 45000
 actions hotplug_1+hotplug_2+hotplug_3+hotplug_4+hotplug_5+hotplug_6+hotplug_7
@@ -119,7 +119,7 @@ action_info 1+1+1+1+1+1+1
 [CPU7_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 thresholds 62000
 thresholds_clr 57000
 actions hotplug_7
@@ -128,7 +128,7 @@ action_info 1
 [CPU3_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 thresholds 60000
 thresholds_clr 55000
 actions hotplug_3
@@ -137,7 +137,7 @@ action_info 1
 [CPU5_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 40000
 thresholds_clr 37000
 actions hotplug_5
@@ -146,7 +146,7 @@ action_info 1
 [CPU2_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 41000
 thresholds_clr 38000
 actions hotplug_2
@@ -155,7 +155,7 @@ action_info 1
 [VDD_RSTR_MONITOR-TSENS13]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor13
+sensor cdsp-usr
 thresholds 5000
 thresholds_clr 10000
 actions vdd_restriction
@@ -165,7 +165,7 @@ descending
 [VDD_RSTR_MONITOR-TSENS12]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor12
+sensor cpuss-0-step2
 thresholds 5000
 thresholds_clr 10000
 actions vdd_restriction
@@ -175,7 +175,7 @@ descending
 [VDD_RSTR_MONITOR-TSENS11]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor11
+sensor cpuss-0-step1
 thresholds 5000
 thresholds_clr 10000
 actions vdd_restriction
@@ -185,7 +185,7 @@ descending
 [VDD_RSTR_MONITOR-TSENS10]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor10
+sensor cpuss-0-step0
 thresholds 5000
 thresholds_clr 10000
 actions vdd_restriction
@@ -195,7 +195,7 @@ descending
 [VDD_RSTR_MONITOR-TSENS9]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor9
+sensor video-usr
 thresholds 5000
 thresholds_clr 10000
 actions vdd_restriction
@@ -205,7 +205,7 @@ descending
 [VDD_RSTR_MONITOR-TSENS8]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor8
+sensor gpu-usr
 thresholds 5000
 thresholds_clr 10000
 actions vdd_restriction
@@ -215,7 +215,7 @@ descending
 [VDD_RSTR_MONITOR-TSENS7]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor7
+sensor cpuss-2-usr
 thresholds 5000
 thresholds_clr 10000
 actions vdd_restriction
@@ -225,7 +225,7 @@ descending
 [VDD_RSTR_MONITOR-TSENS6]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor6
+sensor cpu-1-3-step
 thresholds 5000
 thresholds_clr 10000
 actions vdd_restriction
@@ -235,7 +235,7 @@ descending
 [VDD_RSTR_MONITOR-TSENS5]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 thresholds 5000
 thresholds_clr 10000
 actions vdd_restriction
@@ -245,7 +245,7 @@ descending
 [VDD_RSTR_MONITOR-TSENS4]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor4
+sensor cpu-1-1-step
 thresholds 5000
 thresholds_clr 10000
 actions vdd_restriction
@@ -255,7 +255,7 @@ descending
 [VDD_RSTR_MONITOR-TSENS3]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor3
+sensor cpu-1-0-step
 thresholds 5000
 thresholds_clr 10000
 actions vdd_restriction
@@ -265,7 +265,7 @@ descending
 [VDD_RSTR_MONITOR-TSENS2]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor2
+sensor cpuss-1-usr
 thresholds 5000
 thresholds_clr 10000
 actions vdd_restriction
@@ -275,7 +275,7 @@ descending
 [VDD_RSTR_MONITOR-TSENS1]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor1
+sensor cpuss-0-step
 thresholds 5000
 thresholds_clr 10000
 actions vdd_restriction
@@ -285,7 +285,7 @@ descending
 [VDD_RSTR_MONITOR-TSENS0]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor0
+sensor mpm-usr
 thresholds 5000
 thresholds_clr 10000
 actions vdd_restriction
diff --git a/configs/thermal/thermal-engine-default.conf b/configs/thermal/thermal-engine-default.conf
index 960f8c80..13889256 100644
--- a/configs/thermal/thermal-engine-default.conf
+++ b/configs/thermal/thermal-engine-default.conf
@@ -1,30 +1,30 @@
 # SENSOR : ALIAS
-# tsens_tz_sensor8 : gpu
-# tsens_tz_sensor6 : cpu7
-# tsens_tz_sensor5 : cpu6
-# tsens_tz_sensor4 : cpu5
-# tsens_tz_sensor3 : cpu4
-# tsens_tz_sensor1 : cpu0-cpu1-cpu2-cpu3
+# gpu-usr : gpu
+# cpu-1-3-step : cpu7
+# cpu-1-2-step : cpu6
+# cpu-1-1-step : cpu5
+# cpu-1-0-step : cpu4
+# cpuss-0-step : cpu0-cpu1-cpu2-cpu3
 
 #debug
 #Conf file: vendor/etc/thermal-engine-normal.conf
 
 [VIRTUAL-CLUSTER1]
 algo_type virtual
-trip_sensor tsens_tz_sensor3
+trip_sensor cpu-1-0-step
 set_point 75000
 set_point_clr 72000
-sensors tsens_tz_sensor3 tsens_tz_sensor4 tsens_tz_sensor5 tsens_tz_sensor6 tsens_tz_sensor7 tsens_tz_sensor12
+sensors cpu-1-0-step cpu-1-1-step cpu-1-2-step cpu-1-3-step cpuss-2-usr cpuss-0-step2
 weights
 sampling 10
 math 2
 
 [VIRTUAL-CLUSTER0]
 algo_type virtual
-trip_sensor tsens_tz_sensor1
+trip_sensor cpuss-0-step
 set_point 72000
 set_point_clr 70000
-sensors tsens_tz_sensor1 tsens_tz_sensor2
+sensors cpuss-0-step cpuss-1-usr
 weights
 sampling 10
 math 2
@@ -32,7 +32,7 @@ math 2
 [SS-XO-THERM-GOLD]
 algo_type ss
 sampling 2000
-sensor xo_therm
+sensor xo-therm-adc
 device cluster1
 set_point 60000
 set_point_clr 55000
@@ -42,7 +42,7 @@ device_max_limit 14016000
 [SS-XO-THERM-SILVER]
 algo_type ss
 sampling 2000
-sensor xo_therm
+sensor xo-therm-adc
 device cluster0
 set_point 60000
 set_point_clr 55000
@@ -52,7 +52,7 @@ device_max_limit 902400
 [SS-QUIET-THERM-GOLD2]
 algo_type ss
 sampling 2000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 device cluster1
 set_point 75000
 set_point_clr 72000
@@ -62,7 +62,7 @@ device_max_limit 1401600
 [SS-QUIET-THERM-SILVER2]
 algo_type ss
 sampling 2000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 device cluster0
 set_point 72000
 set_point_clr 70000
@@ -72,7 +72,7 @@ device_max_limit 902400
 [SS-QUIET-THERM-SILVER]
 algo_type ss
 sampling 2000
-sensor quiet_therm
+sensor quiet-therm-adc
 device cluster0
 set_point 65000
 set_point_clr 63000
@@ -82,7 +82,7 @@ device_max_limit 1536000
 [SS-QUIET-THERM-GOLD]
 algo_type ss
 sampling 2000
-sensor quiet_therm
+sensor quiet-therm-adc
 device cluster1
 set_point 60000
 set_point_clr 55000
@@ -92,7 +92,7 @@ device_max_limit 1747200
 [SS-GPU]
 algo_type ss
 sampling 10
-sensor gpu
+sensor gpu-usr
 device gpu
 set_point 95000
 set_point_clr 65000
@@ -101,7 +101,7 @@ time_constant 0
 [BATTERY_CHARGING_CTL]
 algo_type monitor
 sampling 10000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 40000 42000 44000 46000
 thresholds_clr 39000 41000 43000 45000
 actions battery battery battery battery
@@ -110,7 +110,7 @@ action_info 1 2 4 5
 [CPU7_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 thresholds 80000
 thresholds_clr 75000
 actions hotplug_7
@@ -119,7 +119,7 @@ action_info 1
 [CPU3_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 thresholds 80000
 thresholds_clr 75000
 actions hotplug_3
@@ -128,7 +128,7 @@ action_info 1
 [CPU5_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 65000
 thresholds_clr 60000
 actions hotplug_5
@@ -137,7 +137,7 @@ action_info 1
 [CPU2_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 65000
 thresholds_clr 60000
 actions hotplug_2
diff --git a/configs/thermal/thermal-engine-gameing.conf b/configs/thermal/thermal-engine-gameing.conf
index 9335c238..98f690ea 100644
--- a/configs/thermal/thermal-engine-gameing.conf
+++ b/configs/thermal/thermal-engine-gameing.conf
@@ -1,30 +1,30 @@
 # SENSOR : ALIAS
-# tsens_tz_sensor8 : gpu
-# tsens_tz_sensor6 : cpu7
-# tsens_tz_sensor5 : cpu6
-# tsens_tz_sensor4 : cpu5
-# tsens_tz_sensor3 : cpu4
-# tsens_tz_sensor1 : cpu0-cpu1-cpu2-cpu3
+# gpu-usr : gpu
+# cpu-1-3-step : cpu7
+# cpu-1-2-step : cpu6
+# cpu-1-1-step : cpu5
+# cpu-1-0-step : cpu4
+# cpuss-0-step : cpu0-cpu1-cpu2-cpu3
 
 #debug
 #Conf file: vendor/etc/thermal-engine-normal.conf
 
 [VIRTUAL-CLUSTER1]
 algo_type virtual
-trip_sensor tsens_tz_sensor3
+trip_sensor cpu-1-0-step
 set_point 95000
 set_point_clr 92000
-sensors tsens_tz_sensor3 tsens_tz_sensor4 tsens_tz_sensor5 tsens_tz_sensor6 tsens_tz_sensor7 tsens_tz_sensor12
+sensors cpu-1-0-step cpu-1-1-step cpu-1-2-step cpu-1-3-step cpuss-2-usr cpuss-0-step2
 weights
 sampling 10
 math 2
 
 [VIRTUAL-CLUSTER0]
 algo_type virtual
-trip_sensor tsens_tz_sensor1
+trip_sensor cpuss-0-step
 set_point 92000
 set_point_clr 90000
-sensors tsens_tz_sensor1 tsens_tz_sensor2
+sensors cpuss-0-step cpuss-1-usr
 weights
 sampling 10
 math 2
@@ -32,7 +32,7 @@ math 2
 [SS-XO-THERM-GOLD]
 algo_type ss
 sampling 2000
-sensor xo_therm
+sensor xo-therm-adc
 device cluster1
 set_point 70000
 set_point_clr 65000
@@ -42,7 +42,7 @@ device_max_limit 1747200
 [SS-XO-THERM-SILVER]
 algo_type ss
 sampling 2000
-sensor xo_therm
+sensor xo-therm-adc
 device cluster0
 set_point 70000
 set_point_clr 65000
@@ -52,7 +52,7 @@ device_max_limit 1401600
 [SS-QUIET-THERM-GOLD2]
 algo_type ss
 sampling 2000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 device cluster1
 set_point 95000
 set_point_clr 92000
@@ -62,7 +62,7 @@ device_max_limit 1401600
 [SS-QUIET-THERM-SILVER2]
 algo_type ss
 sampling 2000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 device cluster0
 set_point 92000
 set_point_clr 90000
@@ -72,7 +72,7 @@ device_max_limit 1113600
 [SS-QUIET-THERM-SILVER]
 algo_type ss
 sampling 2000
-sensor quiet_therm
+sensor quiet-therm-adc
 device cluster0
 set_point 72000
 set_point_clr 70000
@@ -82,7 +82,7 @@ device_max_limit 1536000
 [SS-QUIET-THERM-GOLD]
 algo_type ss
 sampling 2000
-sensor quiet_therm
+sensor quiet-therm-adc
 device cluster1
 set_point 72000
 set_point_clr 67000
@@ -92,7 +92,7 @@ device_max_limit 1958400
 [SS-GPU]
 algo_type ss
 sampling 10
-sensor gpu
+sensor gpu-usr
 device gpu
 set_point 95000
 set_point_clr 85000
@@ -101,7 +101,7 @@ time_constant 0
 [BATTERY_CHARGING_CTL]
 algo_type monitor
 sampling 10000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 50000 52000 54000 56000
 thresholds_clr 49000 52000 53000 55000
 actions battery battery battery battery
@@ -110,7 +110,7 @@ action_info 1 2 4 5
 [CPU7_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 thresholds 97000
 thresholds_clr 95000
 actions hotplug_7
@@ -119,7 +119,7 @@ action_info 1
 [CPU3_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 thresholds 97000
 thresholds_clr 95000
 actions hotplug_3
@@ -128,7 +128,7 @@ action_info 1
 [CPU5_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 75000
 thresholds_clr 70000
 actions hotplug_5
@@ -137,7 +137,7 @@ action_info 1
 [CPU2_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 75000
 thresholds_clr 70000
 actions hotplug_2
diff --git a/configs/thermal/thermal-engine-performance.conf b/configs/thermal/thermal-engine-performance.conf
index 59be17e3..b86cdc33 100644
--- a/configs/thermal/thermal-engine-performance.conf
+++ b/configs/thermal/thermal-engine-performance.conf
@@ -1,30 +1,30 @@
 # SENSOR : ALIAS
-# tsens_tz_sensor8 : gpu
-# tsens_tz_sensor6 : cpu7
-# tsens_tz_sensor5 : cpu6
-# tsens_tz_sensor4 : cpu5
-# tsens_tz_sensor3 : cpu4
-# tsens_tz_sensor1 : cpu0-cpu1-cpu2-cpu3
+# gpu-usr : gpu
+# cpu-1-3-step : cpu7
+# cpu-1-2-step : cpu6
+# cpu-1-1-step : cpu5
+# cpu-1-0-step : cpu4
+# cpuss-0-step : cpu0-cpu1-cpu2-cpu3
 
 #debug
 #Conf file: vendor/etc/thermal-engine-normal.conf
 
 [VIRTUAL-CLUSTER1]
 algo_type virtual
-trip_sensor tsens_tz_sensor3
+trip_sensor cpu-1-0-step
 set_point 85000
 set_point_clr 82000
-sensors tsens_tz_sensor3 tsens_tz_sensor4 tsens_tz_sensor5 tsens_tz_sensor6 tsens_tz_sensor7 tsens_tz_sensor12
+sensors cpu-1-0-step cpu-1-1-step cpu-1-2-step cpu-1-3-step cpuss-2-usr cpuss-0-step2
 weights
 sampling 10
 math 2
 
 [VIRTUAL-CLUSTER0]
 algo_type virtual
-trip_sensor tsens_tz_sensor1
+trip_sensor cpuss-0-step
 set_point 82000
 set_point_clr 80000
-sensors tsens_tz_sensor1 tsens_tz_sensor2
+sensors cpuss-0-step cpuss-1-usr
 weights
 sampling 10
 math 2
@@ -32,7 +32,7 @@ math 2
 [SS-XO-THERM-GOLD]
 algo_type ss
 sampling 2000
-sensor xo_therm
+sensor xo-therm-adc
 device cluster1
 set_point 63000
 set_point_clr 58000
@@ -42,7 +42,7 @@ device_max_limit 1747200
 [SS-XO-THERM-SILVER]
 algo_type ss
 sampling 2000
-sensor xo_therm
+sensor xo-therm-adc
 device cluster0
 set_point 63000
 set_point_clr 58000
@@ -52,7 +52,7 @@ device_max_limit 1401600
 [SS-QUIET-THERM-GOLD2]
 algo_type ss
 sampling 2000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 device cluster1
 set_point 85000
 set_point_clr 82000
@@ -62,7 +62,7 @@ device_max_limit 1401600
 [SS-QUIET-THERM-SILVER2]
 algo_type ss
 sampling 2000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 device cluster0
 set_point 82000
 set_point_clr 80000
@@ -72,7 +72,7 @@ device_max_limit 1113600
 [SS-QUIET-THERM-SILVER]
 algo_type ss
 sampling 2000
-sensor quiet_therm
+sensor quiet-therm-adc
 device cluster0
 set_point 65000
 set_point_clr 63000
@@ -82,7 +82,7 @@ device_max_limit 1536000
 [SS-QUIET-THERM-GOLD]
 algo_type ss
 sampling 2000
-sensor quiet_therm
+sensor quiet-therm-adc
 device cluster1
 set_point 65000
 set_point_clr 60000
@@ -92,7 +92,7 @@ device_max_limit 1958400
 [SS-GPU]
 algo_type ss
 sampling 10
-sensor gpu
+sensor gpu-usr
 device gpu
 set_point 95000
 set_point_clr 75000
@@ -101,7 +101,7 @@ time_constant 0
 [BATTERY_CHARGING_CTL]
 algo_type monitor
 sampling 10000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 46000 48000 50000 52000
 thresholds_clr 45000 47000 49000 51000
 actions battery battery battery battery
@@ -110,7 +110,7 @@ action_info 1 2 4 5
 [CPU7_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 thresholds 90000
 thresholds_clr 85000
 actions hotplug_7
@@ -119,7 +119,7 @@ action_info 1
 [CPU3_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor tsens_tz_sensor5
+sensor cpu-1-2-step
 thresholds 90000
 thresholds_clr 85000
 actions hotplug_3
@@ -128,7 +128,7 @@ action_info 1
 [CPU5_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 68000
 thresholds_clr 63000
 actions hotplug_5
@@ -137,7 +137,7 @@ action_info 1
 [CPU2_HOTPLUG_MONITOR]
 algo_type monitor
 sampling 1000
-sensor quiet_therm
+sensor quiet-therm-adc
 thresholds 68000
 thresholds_clr 63000
 actions hotplug_2