diff --git a/bundles/org.eclipse.core.databinding.beans/pom.xml b/bundles/org.eclipse.core.databinding.beans/pom.xml
index 3c3d897..e650d6c 100644
--- a/bundles/org.eclipse.core.databinding.beans/pom.xml
+++ b/bundles/org.eclipse.core.databinding.beans/pom.xml
@@ -9,9 +9,7 @@
   Contributors:
      Igor Fedorenko - initial implementation
 -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.platform.ui</artifactId>
@@ -19,7 +17,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>eclipse.platform.ui</groupId>
+  <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.databinding.beans</artifactId>
   <version>1.2.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.core.databinding.observable/pom.xml b/bundles/org.eclipse.core.databinding.observable/pom.xml
index edebbb0..837ea18 100644
--- a/bundles/org.eclipse.core.databinding.observable/pom.xml
+++ b/bundles/org.eclipse.core.databinding.observable/pom.xml
@@ -9,9 +9,7 @@
   Contributors:
      Igor Fedorenko - initial implementation
 -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.platform.ui</artifactId>
@@ -19,7 +17,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>eclipse.platform.ui</groupId>
+  <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.databinding.observable</artifactId>
   <version>1.4.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.core.databinding.property/pom.xml b/bundles/org.eclipse.core.databinding.property/pom.xml
index 8d01eae..60f1ab3 100644
--- a/bundles/org.eclipse.core.databinding.property/pom.xml
+++ b/bundles/org.eclipse.core.databinding.property/pom.xml
@@ -9,9 +9,7 @@
   Contributors:
      Igor Fedorenko - initial implementation
 -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.platform.ui</artifactId>
@@ -19,7 +17,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>eclipse.platform.ui</groupId>
+  <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.databinding.property</artifactId>
   <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.core.databinding/pom.xml b/bundles/org.eclipse.core.databinding/pom.xml
index f6e4d74..d1862b4 100644
--- a/bundles/org.eclipse.core.databinding/pom.xml
+++ b/bundles/org.eclipse.core.databinding/pom.xml
@@ -9,9 +9,7 @@
   Contributors:
      Igor Fedorenko - initial implementation
 -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.platform.ui</artifactId>
@@ -19,7 +17,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>eclipse.platform.ui</groupId>
+  <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.databinding</artifactId>
   <version>1.4.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.jface.databinding/pom.xml b/bundles/org.eclipse.jface.databinding/pom.xml
index 0042880..0506d36 100644
--- a/bundles/org.eclipse.jface.databinding/pom.xml
+++ b/bundles/org.eclipse.jface.databinding/pom.xml
@@ -9,9 +9,7 @@
   Contributors:
      Igor Fedorenko - initial implementation
 -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.platform.ui</artifactId>
@@ -19,7 +17,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>eclipse.platform.ui</groupId>
+  <groupId>org.eclipse.jface</groupId>
   <artifactId>org.eclipse.jface.databinding</artifactId>
   <version>1.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/examples/org.eclipse.jface.examples.databinding/pom.xml b/examples/org.eclipse.jface.examples.databinding/pom.xml
index 9d7ffd6..af55642 100644
--- a/examples/org.eclipse.jface.examples.databinding/pom.xml
+++ b/examples/org.eclipse.jface.examples.databinding/pom.xml
@@ -9,9 +9,7 @@
   Contributors:
      Igor Fedorenko - initial implementation
 -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.platform.ui</artifactId>
@@ -19,7 +17,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>eclipse.platform.ui</groupId>
+  <groupId>org.eclipse.jface</groupId>
   <artifactId>org.eclipse.jface.examples.databinding</artifactId>
   <version>1.0.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/pom.xml b/tests/org.eclipse.jface.tests.databinding.conformance/pom.xml
index 6c951d8..0227db6 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/pom.xml
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/pom.xml
@@ -9,9 +9,7 @@
   Contributors:
      Igor Fedorenko - initial implementation
 -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.platform.ui</artifactId>
@@ -19,7 +17,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>eclipse.platform.ui</groupId>
+  <groupId>org.eclipse.jface</groupId>
   <artifactId>org.eclipse.jface.tests.databinding.conformance</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/tests/org.eclipse.jface.tests.databinding/pom.xml b/tests/org.eclipse.jface.tests.databinding/pom.xml
index 982eff6..9d57816 100644
--- a/tests/org.eclipse.jface.tests.databinding/pom.xml
+++ b/tests/org.eclipse.jface.tests.databinding/pom.xml
@@ -9,9 +9,7 @@
   Contributors:
      Igor Fedorenko - initial implementation
 -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.platform.ui</artifactId>
@@ -19,7 +17,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>eclipse.platform.ui</groupId>
+  <groupId>org.eclipse.jface</groupId>
   <artifactId>org.eclipse.jface.tests.databinding</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>