diff --git a/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/thing/channels.xml
index 393753736..63855284e 100644
--- a/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/thing/channels.xml
@@ -193,7 +193,7 @@
 		</config-description>
 	</channel-type>
 	<channel-type id="rollershutter">
-		<item-type>RollerShutter</item-type>
+		<item-type>Rollershutter</item-type>
 		<label>Generic Roller Shutter</label>
 		<description>Generic roller shutter channel</description>
 		<state readOnly="false"></state>
diff --git a/bundles/org.openhab.binding.ism8/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.ism8/src/main/resources/OH-INF/thing/thing-types.xml
index ab0200539..477cf168a 100644
--- a/bundles/org.openhab.binding.ism8/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.ism8/src/main/resources/OH-INF/thing/thing-types.xml
@@ -61,7 +61,7 @@
 	</channel-type>
 
 	<channel-type id="number-readonly">
-		<item-type>number</item-type>
+		<item-type>Number</item-type>
 		<label>Value Readonly DataPoint</label>
 		<state readOnly="true"/>
 		<config-description>
@@ -87,7 +87,7 @@
 	</channel-type>
 
 	<channel-type id="number">
-		<item-type>number</item-type>
+		<item-type>Number</item-type>
 		<label>Value DataPoint</label>
 		<config-description>
 			<parameter name="id" type="integer" required="true">
diff --git a/bundles/org.openhab.binding.paradoxalarm/src/main/resources/OH-INF/thing/partition.xml b/bundles/org.openhab.binding.paradoxalarm/src/main/resources/OH-INF/thing/partition.xml
index 5276bb6cb..f5d1771eb 100644
--- a/bundles/org.openhab.binding.paradoxalarm/src/main/resources/OH-INF/thing/partition.xml
+++ b/bundles/org.openhab.binding.paradoxalarm/src/main/resources/OH-INF/thing/partition.xml
@@ -66,91 +66,91 @@
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="readyToArm">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Partition Ready To Arm</label>
 		<description>Partition ready to arm</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="inExitDelay">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Partition In Exit Delay</label>
 		<description>Partition in Exit Delay</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="inEntryDelay">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Partition In Entry Delay</label>
 		<description>Partition in Entry Delay</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="inTrouble">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Partition In Trouble</label>
 		<description>Partition in Trouble</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="alarmInMemory">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Partition Has Alarm In Memory</label>
 		<description>Partition has Alarm in Memory</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="zoneBypass">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Partition Has Zone Bypass</label>
 		<description>Partition has Zone Bypass</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="zoneInTamperTrouble">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Partition Has Zone In Tamper Trouble</label>
 		<description>Partition has in Tamper Trouble</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="zoneInLowBatteryTrouble">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Partition Has Zone In Low Battery Trouble</label>
 		<description>Partition has in Low Battery Trouble</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="zoneInFireLoopTrouble">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Partition Has Zone In Fire Loop Trouble</label>
 		<description>Partition has in Fire Loop Trouble</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="zoneInSupervisionTrouble">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Partition Has Zone In Supervision Trouble</label>
 		<description>Partition has in Supervision Trouble</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="stayInstantReady">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Partition Is Stay Instant Ready</label>
 		<description>Partition is Stay Instant Ready</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="forceReady">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Partition Is Force Ready</label>
 		<description>Partition is Force Ready</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="bypassReady">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Partition Is Bypass Ready</label>
 		<description>Partition is Bypass Ready</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="inhibitReady">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Partition Is Inhibit Ready</label>
 		<description>Partition is Inhibit Ready</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="allZonesClosed">
-		<item-type>contact</item-type>
+		<item-type>Contact</item-type>
 		<label>Partition Has All Zones Closed</label>
 		<description>Partition has All Zones closed</description>
 		<state readOnly="true" pattern="%s"/>
diff --git a/bundles/org.openhab.binding.paradoxalarm/src/main/resources/OH-INF/thing/zone.xml b/bundles/org.openhab.binding.paradoxalarm/src/main/resources/OH-INF/thing/zone.xml
index e49683063..67c3b62fc 100644
--- a/bundles/org.openhab.binding.paradoxalarm/src/main/resources/OH-INF/thing/zone.xml
+++ b/bundles/org.openhab.binding.paradoxalarm/src/main/resources/OH-INF/thing/zone.xml
@@ -33,13 +33,13 @@
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="openedState">
-		<item-type>contact</item-type>
+		<item-type>Contact</item-type>
 		<label>Zone State</label>
 		<description>State of zone</description>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>
 	<channel-type id="tamperedState">
-		<item-type>switch</item-type>
+		<item-type>Switch</item-type>
 		<label>Tampered</label>
 		<description>State of zone</description>
 		<state readOnly="true" pattern="%s"/>
diff --git a/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/thing/thing-types.xml
index f7fabd700..151020d15 100644
--- a/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/thing/thing-types.xml
@@ -1097,7 +1097,7 @@
 	</channel-type>
 
 	<channel-type id="rollerShutter">
-		<item-type>RollerShutter</item-type>
+		<item-type>Rollershutter</item-type>
 		<label>Rollershutter</label>
 		<description>Rollershutter Up/Down</description>
 		<category>Blinds</category>
@@ -1274,7 +1274,7 @@
 	</channel-type>
 
 	<channel-type id="rollerBrightness">
-		<item-type>RollerShutter</item-type>
+		<item-type>Rollershutter</item-type>
 		<label>Roller Brightness</label>
 		<description>Brightness Up/Down</description>
 		<category>Light</category>