diff --git a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/addon/addon.xml
index b60f56335..18ba83fcc 100644
--- a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/addon/addon.xml
@@ -3,6 +3,6 @@
 	xmlns:addon="https://openhab.org/schemas/addon/v1.0.0"
 	xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
 	<type>binding</type>
-	<name>@text/icloud.binding.name</name>
-	<description>@text/icloud.binding.description</description>
+	<name>@text/icloud.addon.name</name>
+	<description>@text/icloud.addon.description</description>
 </addon:addon>
diff --git a/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/addon/addon.xml
new file mode 100644
index 000000000..141328cc9
--- /dev/null
+++ b/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/addon/addon.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon:addon id="nobohub" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:addon="https://openhab.org/schemas/addon/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
+
+	<type>binding</type>
+	<name>Glen Dimplex Nobø Hub Binding</name>
+	<description>This is the binding for Glen Dimplex Nobø Hub.</description>
+
+</addon:addon>
diff --git a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/addon/addon.xml
index 850e1af26..92076c4f4 100644
--- a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/addon/addon.xml
@@ -4,31 +4,30 @@
 	xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
 
 	<type>binding</type>
-	<name>@text/binding.shelly.name</name>
-	<description>@text/binding.shelly.description</description>
-	<author>Markus Michels</author>
+	<name>@text/addon.shelly.name</name>
+	<description>@text/addon.shelly.description</description>
 
 	<config-description>
 		<parameter name="defaultUserId" type="text">
 			<default>admin</default>
-			<label>@text/binding.shelly.config.defaultUserId.label</label>
-			<description>@text/binding.shelly.config.defaultUserId.description</description>
+			<label>@text/addon.shelly.config.defaultUserId.label</label>
+			<description>@text/addon.shelly.config.defaultUserId.description</description>
 		</parameter>
 		<parameter name="defaultPassword" type="text">
 			<default>admin</default>
-			<label>@text/binding.shelly.config.defaultPassword.label</label>
-			<description>@text/binding.shelly.config.defaultPassword.description</description>
+			<label>@text/addon.shelly.config.defaultPassword.label</label>
+			<description>@text/addon.shelly.config.defaultPassword.description</description>
 			<context>password</context>
 		</parameter>
 		<parameter name="localIP" type="text">
-			<label>@text/binding.shelly.config.localIP.label</label>
-			<description>@text/binding.shelly.config.localIP.description</description>
+			<label>@text/addon.shelly.config.localIP.label</label>
+			<description>@text/addon.shelly.config.localIP.description</description>
 			<default></default>
 		</parameter>
 		<parameter name="autoCoIoT" type="boolean">
 			<default>true</default>
-			<label>@text/binding.shelly.config.autoCoIoT.label</label>
-			<description>@text/binding.shelly.config.autoCoIoT.description</description>
+			<label>@text/addon.shelly.config.autoCoIoT.label</label>
+			<description>@text/addon.shelly.config.autoCoIoT.description</description>
 		</parameter>
 	</config-description>
 
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/actuator.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-actuator.xml
similarity index 100%
rename from bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/actuator.xml
rename to bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-actuator.xml
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-binding.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-binding.xml
new file mode 100644
index 000000000..8524d7f71
--- /dev/null
+++ b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-binding.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Velux Binding -->
+<thing:thing-descriptions bindingId="velux"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
+	<!-- -->
+	<!-- Velux binding Binding -->
+	<!-- -->
+	<thing-type id="binding">
+		<label>@text/thing-type.velux.binding.label</label>
+		<description>@text/thing-type.velux.binding.description</description>
+		<category>NetworkAppliance</category>
+		<channels>
+			<channel id="information" typeId="information"/>
+		</channels>
+		<properties>
+			<property name="bundleVersion">N/A</property>
+		</properties>
+		<representation-property>bundleVersion</representation-property>
+	</thing-type>
+</thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/rollershutter.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-rollershutter.xml
similarity index 100%
rename from bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/rollershutter.xml
rename to bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-rollershutter.xml
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/scene.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-scene.xml
similarity index 100%
rename from bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/scene.xml
rename to bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-scene.xml
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/vshutter.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-vshutter.xml
similarity index 100%
rename from bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/vshutter.xml
rename to bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-vshutter.xml
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/window.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-window.xml
similarity index 100%
rename from bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/window.xml
rename to bundles/org.openhab.binding.velux/src/main/resources/OH-INF/thing/thing-type-window.xml