diff --git a/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/i18n/radiothermostat.properties b/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/i18n/radiothermostat.properties
index 4e059440db..51daaac631 100644
--- a/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/i18n/radiothermostat.properties
+++ b/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/i18n/radiothermostat.properties
@@ -259,10 +259,10 @@ thing-type.config.radiothermostat.thermostatconfig.wedNightHeatTime.description
 
 channel-type.radiothermostat.dt_stamp.label = Thermostat Date
 channel-type.radiothermostat.dt_stamp.description = The Current Day of the Week and Time Reported by the Thermostat
-channel-type.radiothermostat.fan_mode.label = Fan Mode
-channel-type.radiothermostat.fan_mode.description = The Current Operating Mode of the Fan
-channel-type.radiothermostat.fan_status.label = Fan Status
-channel-type.radiothermostat.fan_status.description = Indicates the Current Fan Status of the HVAC System
+channel-type.radiothermostat.fan-mode.label = Fan Mode
+channel-type.radiothermostat.fan-mode.description = The Current Operating Mode of the Fan
+channel-type.radiothermostat.fan-status.label = Fan Status
+channel-type.radiothermostat.fan-status.description = Indicates the Current Fan Status of the HVAC System
 channel-type.radiothermostat.hold.label = Hold
 channel-type.radiothermostat.hold.description = Indicates If the Current Set Point Temperature Is to Be Held Indefinitely
 channel-type.radiothermostat.humidity.label = Humidity
@@ -298,10 +298,10 @@ channel-type.radiothermostat.t_hour.label = Hour
 channel-type.radiothermostat.t_hour.description = The Current Hour of the Day Reported by the Thermostat
 channel-type.radiothermostat.t_minute.label = Minute
 channel-type.radiothermostat.t_minute.description = The Current Minute Past the Hour Reported by the Thermostat
-channel-type.radiothermostat.temp-sp.label = Setpoint
-channel-type.radiothermostat.temp-sp.description = The Current Temperature Set Point of the Thermostat
-channel-type.radiothermostat.temp-temperature.label = Temperature
-channel-type.radiothermostat.temp-temperature.description = The Current Temperature Reading of the Thermostat
+channel-type.radiothermostat.temperature-setpoint.label = Setpoint
+channel-type.radiothermostat.temperature-setpoint.description = The Current Temperature Set Point of the Thermostat
+channel-type.radiothermostat.temperature.label = Temperature
+channel-type.radiothermostat.temperature.description = The Current Temperature Reading of the Thermostat
 channel-type.radiothermostat.today_cool_runtime.label = Today's Cooling Runtime
 channel-type.radiothermostat.today_cool_runtime.description = The Number of Minutes of Cooling Run-time Today
 channel-type.radiothermostat.today_heat_runtime.label = Today's Heating Runtime
diff --git a/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/thing/thing-types.xml
index 4d65143473..c834d4631c 100644
--- a/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/thing/thing-types.xml
@@ -12,16 +12,16 @@
 		</description>
 
 		<channels>
-			<channel id="temperature" typeId="temp-temperature"/>
+			<channel id="temperature" typeId="temperature"/>
 			<channel id="humidity" typeId="humidity"/>
 			<channel id="mode" typeId="mode"/>
-			<channel id="fan_mode" typeId="fan_mode"/>
+			<channel id="fan_mode" typeId="fan-mode"/>
 			<channel id="program_mode" typeId="program_mode"/>
-			<channel id="set_point" typeId="temp-sp"/>
+			<channel id="set_point" typeId="temperature-setpoint"/>
 			<channel id="override" typeId="override"/>
 			<channel id="hold" typeId="hold"/>
 			<channel id="status" typeId="status"/>
-			<channel id="fan_status" typeId="fan_status"/>
+			<channel id="fan_status" typeId="fan-status"/>
 			<channel id="remote_temp" typeId="remote_temp"/>
 			<channel id="day" typeId="t_day"/>
 			<channel id="hour" typeId="t_hour"/>
@@ -37,17 +37,21 @@
 		</channels>
 
 		<properties>
-			<property name="thingTypeVersion">2</property>
+			<property name="thingTypeVersion">3</property>
 		</properties>
 
 		<config-description-ref uri="thing-type:radiothermostat:thermostatconfig"/>
 	</thing-type>
 
-	<channel-type id="temp-temperature">
+	<channel-type id="temperature">
 		<item-type>Number:Temperature</item-type>
 		<label>Temperature</label>
 		<description>The Current Temperature Reading of the Thermostat</description>
 		<category>Temperature</category>
+		<tags>
+			<tag>Measurement</tag>
+			<tag>Temperature</tag>
+		</tags>
 		<state readOnly="true" pattern="%.1f %unit%"/>
 	</channel-type>
 
@@ -56,6 +60,10 @@
 		<label>Humidity</label>
 		<description>The Current Humidity Reading of the Thermostat</description>
 		<category>Humidity</category>
+		<tags>
+			<tag>Measurement</tag>
+			<tag>Humidity</tag>
+		</tags>
 		<state readOnly="true" pattern="%d %unit%"/>
 	</channel-type>
 
@@ -63,6 +71,10 @@
 		<item-type>Number</item-type>
 		<label>Mode</label>
 		<description>The Current Operating Mode of the HVAC System</description>
+		<tags>
+			<tag>Control</tag>
+			<tag>Mode</tag>
+		</tags>
 		<state>
 			<options>
 				<option value="0">Off</option>
@@ -73,10 +85,14 @@
 		</state>
 	</channel-type>
 
-	<channel-type id="fan_mode">
+	<channel-type id="fan-mode">
 		<item-type>Number</item-type>
 		<label>Fan Mode</label>
 		<description>The Current Operating Mode of the Fan</description>
+		<tags>
+			<tag>Control</tag>
+			<tag>Airflow</tag>
+		</tags>
 	</channel-type>
 
 	<channel-type id="program_mode" advanced="true">
@@ -94,11 +110,15 @@
 		</state>
 	</channel-type>
 
-	<channel-type id="temp-sp">
+	<channel-type id="temperature-setpoint">
 		<item-type>Number</item-type>
 		<label>Setpoint</label>
 		<description>The Current Temperature Set Point of the Thermostat</description>
 		<category>Temperature</category>
+		<tags>
+			<tag>Setpoint</tag>
+			<tag>Temperature</tag>
+		</tags>
 		<state min="35" max="95" pattern="%d"/>
 	</channel-type>
 
@@ -119,13 +139,21 @@
 		<item-type>Number</item-type>
 		<label>Status</label>
 		<description>Indicates the Current Running Status of the HVAC System</description>
+		<tags>
+			<tag>Status</tag>
+			<tag>Mode</tag>
+		</tags>
 		<state min="0" max="2" pattern="%d"/>
 	</channel-type>
 
-	<channel-type id="fan_status">
+	<channel-type id="fan-status">
 		<item-type>Number</item-type>
 		<label>Fan Status</label>
 		<description>Indicates the Current Fan Status of the HVAC System</description>
+		<tags>
+			<tag>Status</tag>
+			<tag>Airflow</tag>
+		</tags>
 		<state min="0" max="2" pattern="%d"/>
 	</channel-type>
 
diff --git a/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/update/instructions.xml b/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/update/instructions.xml
index 7a679eb3ef..8c8ec6bd17 100644
--- a/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/update/instructions.xml
+++ b/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/update/instructions.xml
@@ -9,9 +9,7 @@
 				<type>radiothermostat:message</type>
 			</add-channel>
 		</instruction-set>
-	</thing-type>
 
-	<thing-type uid="radiothermostat:rtherm">
 		<instruction-set targetVersion="2">
 			<add-channel id="next_temp">
 				<type>radiothermostat:next_temp</type>
@@ -20,6 +18,30 @@
 				<type>radiothermostat:next_time</type>
 			</add-channel>
 		</instruction-set>
+
+		<instruction-set targetVersion="3">
+			<update-channel id="temperature">
+				<type>radiothermostat:temperature</type>
+			</update-channel>
+			<update-channel id="humidity">
+				<type>radiothermostat:humidity</type>
+			</update-channel>
+			<update-channel id="mode">
+				<type>radiothermostat:mode</type>
+			</update-channel>
+			<update-channel id="fan_mode">
+				<type>radiothermostat:fan-mode</type>
+			</update-channel>
+			<update-channel id="set_point">
+				<type>radiothermostat:temperature-setpoint</type>
+			</update-channel>
+			<update-channel id="status">
+				<type>radiothermostat:status</type>
+			</update-channel>
+			<update-channel id="fan_status">
+				<type>radiothermostat:fan-status</type>
+			</update-channel>
+		</instruction-set>
 	</thing-type>
 
 </update:update-descriptions>