diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/config/SecondGeneration.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/config/SecondGeneration.xml
index f60c39f1c31..35650205149 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/config/SecondGeneration.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/config/SecondGeneration.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:config-description="https://openhab.org/schemas/config-description/v1.0.0"
 	xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd">
-	<config-description uri="thing-type:kostalpiko1020_config">
+	<config-description uri="thing-type:kostalinverter:kostalpiko1020">
 		<parameter name="url" type="text" required="true">
 			<label>IP Address</label>
 			<description>IP address of the inverter.</description>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/config/ThirdGeneration.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/config/ThirdGeneration.xml
index 1e773f4233d..778ca74df29 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/config/ThirdGeneration.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/config/ThirdGeneration.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:config-description="https://openhab.org/schemas/config-description/v1.0.0"
 	xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd">
-	<config-description uri="thing-type:kostalplenticorepikoiq_config">
+	<config-description uri="thing-type:kostalinverter:plenticorepikoiq">
 		<parameter name="url" type="text" required="true">
 			<context>network-address</context>
 			<label>IP Address / Hostname</label>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKO1020.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKO1020.xml
index 662dfe65537..3e5ebf2e863 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKO1020.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKO1020.xml
@@ -74,6 +74,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalpiko1020_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:kostalpiko1020"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ100.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ100.xml
index 789fc821c97..811e7ea0f59 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ100.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ100.xml
@@ -68,6 +68,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ42.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ42.xml
index 17f83d2663a..884f8e4adb8 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ42.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ42.xml
@@ -68,6 +68,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ55.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ55.xml
index 6fdebca021e..ed21d618b19 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ55.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ55.xml
@@ -68,6 +68,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ70.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ70.xml
index 484dbcbb56e..83c4e28c1dd 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ70.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ70.xml
@@ -68,6 +68,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ85.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ85.xml
index 1b970830d58..b7c51ba69d4 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ85.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PIKOIQ85.xml
@@ -68,6 +68,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHBATTERY.xml
index c5c3e7c2cab..bfd4fbf109d 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHBATTERY.xml
@@ -81,6 +81,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHOUTBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHOUTBATTERY.xml
index 0a322e48ce6..64f65a96462 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHOUTBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHOUTBATTERY.xml
@@ -73,6 +73,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHBATTERY.xml
index 0f1cea8ad73..b2c3c85e4ee 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHBATTERY.xml
@@ -81,6 +81,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHOUTBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHOUTBATTERY.xml
index 728d51974a7..6969ad43f06 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHOUTBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHOUTBATTERY.xml
@@ -73,6 +73,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHBATTERY.xml
index 964caeb673b..5403169dac5 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHBATTERY.xml
@@ -81,6 +81,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHOUTBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHOUTBATTERY.xml
index fe52d83a542..176ecbd18d8 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHOUTBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHOUTBATTERY.xml
@@ -73,6 +73,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHBATTERY.xml
index 0772a5741b7..53aaf08e517 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHBATTERY.xml
@@ -81,6 +81,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHOUTBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHOUTBATTERY.xml
index 5b72df29520..ad5fcbc9e8f 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHOUTBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHOUTBATTERY.xml
@@ -73,6 +73,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHBATTERY.xml
index 66945893b24..16e5c050be2 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHBATTERY.xml
@@ -81,6 +81,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHOUTBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHOUTBATTERY.xml
index 1139334ac29..c060098248f 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHOUTBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHOUTBATTERY.xml
@@ -73,6 +73,6 @@
 		<properties>
 			<property name="vendor">KOSTAL Solar Electric GmbH</property>
 		</properties>
-		<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/>
+		<config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
 	</thing-type>
 </thing:thing-descriptions>