diff --git a/bundles/org.openhab.binding.bluetooth.blukii/src/main/feature/feature.xml b/bundles/org.openhab.binding.bluetooth.blukii/src/main/feature/feature.xml
index 5b9fba476..ece7a31b9 100644
--- a/bundles/org.openhab.binding.bluetooth.blukii/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.bluetooth.blukii/src/main/feature/feature.xml
@@ -2,7 +2,7 @@
 <features name="org.openhab.binding.bluetooth.blukii-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
 	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
 
-	<feature name="openhab-binding-bluetooth-bluuki" description="Bluetooth Binding Blukii" version="${project.version}">
+	<feature name="openhab-binding-bluetooth-blukii" description="Bluetooth Binding Blukii" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
 		<feature>openhab-transport-serial</feature>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.bluetooth/${project.version}</bundle>
diff --git a/bundles/org.openhab.binding.linky/src/main/feature/feature.xml b/bundles/org.openhab.binding.linky/src/main/feature/feature.xml
index 3a1dd6537..6da7cc237 100644
--- a/bundles/org.openhab.binding.linky/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.linky/src/main/feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<features name="org.openhab.binding.telegram-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features name="org.openhab.binding.linky-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
 	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
 
 	<feature name="openhab-binding-linky" description="Linky Binding" version="${project.version}">
diff --git a/bundles/org.openhab.binding.melcloud/src/main/feature/feature.xml b/bundles/org.openhab.binding.melcloud/src/main/feature/feature.xml
index 7794523ae..330acf2fe 100644
--- a/bundles/org.openhab.binding.melcloud/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.melcloud/src/main/feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<features name="org.openhab.binding.ihc-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features name="org.openhab.binding.melcloud-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
 	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
 
 	<feature name="openhab-binding-melcloud" description="MELCloud Binding" version="${project.version}">
diff --git a/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/feature/feature.xml b/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/feature/feature.xml
index f022e61b0..9988a5acf 100644
--- a/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/feature/feature.xml
@@ -2,7 +2,7 @@
 <features name="org.openhab.binding.modbus.helioseasycontrols-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
 	<repository>file:${basedirRoot}/bundles/org.openhab.io.transport.modbus/target/feature/feature.xml</repository>
 
-	<feature name="openhab-binding-modbus.helioseasycontrols" description="Modbus.HeliosEasyControls Binding" version="${project.version}">
+	<feature name="openhab-binding-modbus-helioseasycontrols" description="Modbus.HeliosEasyControls Binding" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
 		<feature>openhab-transport-modbus</feature>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.modbus/${project.version}</bundle>
diff --git a/bundles/org.openhab.binding.modbus.studer/src/main/feature/feature.xml b/bundles/org.openhab.binding.modbus.studer/src/main/feature/feature.xml
index c46afeefc..0d462e355 100644
--- a/bundles/org.openhab.binding.modbus.studer/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.modbus.studer/src/main/feature/feature.xml
@@ -3,7 +3,7 @@
 	<repository>file:${basedirRoot}/bundles/org.openhab.io.transport.modbus/target/feature/feature.xml</repository>
 	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
 
-	<feature name="openhab-bindings-modbus-studer" description="Studer Binding" version="${project.version}">
+	<feature name="openhab-binding-modbus-studer" description="Studer Binding" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
 		<feature>openhab-transport-modbus</feature>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.modbus/${project.version}</bundle>
diff --git a/bundles/org.openhab.binding.nzwateralerts/src/main/feature/feature.xml b/bundles/org.openhab.binding.nzwateralerts/src/main/feature/feature.xml
index 1c2807ad2..27cfbbf1e 100644
--- a/bundles/org.openhab.binding.nzwateralerts/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.nzwateralerts/src/main/feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<features name="org.openhab.binding. nzwateralerts-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features name="org.openhab.binding.nzwateralerts-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
 	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
 
 	<feature name="openhab-binding-nzwateralerts" description="NZ Water Alerts Binding" version="${project.version}">
diff --git a/bundles/org.openhab.binding.rotel/src/main/feature/feature.xml b/bundles/org.openhab.binding.rotel/src/main/feature/feature.xml
index 8be940442..48634eb01 100644
--- a/bundles/org.openhab.binding.rotel/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.rotel/src/main/feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<features name="org.openhab.binding.freebox-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features name="org.openhab.binding.rotel-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
 	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
 
 	<feature name="openhab-binding-rotel" description="Rotel Binding" version="${project.version}">
diff --git a/bundles/org.openhab.binding.siemensrds/src/main/feature/feature.xml b/bundles/org.openhab.binding.siemensrds/src/main/feature/feature.xml
index 8f1f64a72..58357048c 100644
--- a/bundles/org.openhab.binding.siemensrds/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.siemensrds/src/main/feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<features name="org.openhab.binding.neohub-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features name="org.openhab.binding.siemensrds-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
 	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
 
 	<feature name="openhab-binding-siemensrds" description="Siemens RDS Binding" version="${project.version}">
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/feature/feature.xml b/bundles/org.openhab.binding.sonyprojector/src/main/feature/feature.xml
index 6c2bd249d..e4b84c94f 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<features name="org.openhab.binding.powermax-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features name="org.openhab.binding.sonyprojector-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
 	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
 
 	<feature name="openhab-binding-sonyprojector" description="Sony Projector Binding" version="${project.version}">
diff --git a/bundles/org.openhab.binding.volvooncall/src/main/feature/feature.xml b/bundles/org.openhab.binding.volvooncall/src/main/feature/feature.xml
index 99a43beaa..8c5231fde 100644
--- a/bundles/org.openhab.binding.volvooncall/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.volvooncall/src/main/feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<features name="org.openhab.binding.astro-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features name="org.openhab.binding.volvooncall-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
 	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
 
 	<feature name="openhab-binding-volvooncall" description="Volvo On Call Binding" version="${project.version}">
diff --git a/bundles/org.openhab.persistence.influxdb/src/main/feature/feature.xml b/bundles/org.openhab.persistence.influxdb/src/main/feature/feature.xml
index 4bc97a87e..06382fc2d 100644
--- a/bundles/org.openhab.persistence.influxdb/src/main/feature/feature.xml
+++ b/bundles/org.openhab.persistence.influxdb/src/main/feature/feature.xml
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features name="org.openhab.persistence.influxdb-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
-	<repository>
-		mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features
-	</repository>
+	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
 
 	<feature name="openhab-persistence-influxdb" description="InfluxDB Persistence" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
-		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.influxdb/${project.version}
-		</bundle>
-		<configfile finalname="${openhab.conf}/services/influxdb.cfg" override="false">
-			mvn:${project.groupId}/openhab-addons-external3/${project.version}/cfg/influxdb
-		</configfile>
+		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.influxdb/${project.version}</bundle>
+		<configfile finalname="${openhab.conf}/services/influxdb.cfg" override="false">mvn:${project.groupId}/openhab-addons-external3/${project.version}/cfg/influxdb</configfile>
 	</feature>
 
 </features>