[529070] Add missing Automatic-Module-Name header for Java 9

https://bugs.eclipse.org/bugs/show_bug.cgi?id=529070
diff --git a/features/org.eclipse.oomph.gitbash-feature/feature.xml b/features/org.eclipse.oomph.gitbash-feature/feature.xml
index 1a781ea..0a8397f 100644
--- a/features/org.eclipse.oomph.gitbash-feature/feature.xml
+++ b/features/org.eclipse.oomph.gitbash-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.gitbash"
       label="%featureName"
-      version="1.8.0.qualifier"
+      version="1.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.gitbash-feature/pom.xml b/features/org.eclipse.oomph.gitbash-feature/pom.xml
index a369714..ae9d5bf 100644
--- a/features/org.eclipse.oomph.gitbash-feature/pom.xml
+++ b/features/org.eclipse.oomph.gitbash-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.gitbash</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.launches-feature/feature.xml b/features/org.eclipse.oomph.launches-feature/feature.xml
index d24b1eb..19006bc 100644
--- a/features/org.eclipse.oomph.launches-feature/feature.xml
+++ b/features/org.eclipse.oomph.launches-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.launches"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.7.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.launches-feature/pom.xml b/features/org.eclipse.oomph.launches-feature/pom.xml
index 97f1873..4948eb4 100644
--- a/features/org.eclipse.oomph.launches-feature/pom.xml
+++ b/features/org.eclipse.oomph.launches-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.launches</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
+  <version>1.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.ostools-feature/feature.xml b/features/org.eclipse.oomph.ostools-feature/feature.xml
index bc6f4b4..85e2db0 100644
--- a/features/org.eclipse.oomph.ostools-feature/feature.xml
+++ b/features/org.eclipse.oomph.ostools-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.ostools"
       label="%featureName"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.ostools-feature/pom.xml b/features/org.eclipse.oomph.ostools-feature/pom.xml
index 240e8db..fb4e1ae 100644
--- a/features/org.eclipse.oomph.ostools-feature/pom.xml
+++ b/features/org.eclipse.oomph.ostools-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.ostools</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.projectcopy-feature/feature.xml b/features/org.eclipse.oomph.projectcopy-feature/feature.xml
index 41cb7fe..eed7f21 100644
--- a/features/org.eclipse.oomph.projectcopy-feature/feature.xml
+++ b/features/org.eclipse.oomph.projectcopy-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.projectcopy"
       label="%featureName"
-      version="1.8.0.qualifier"
+      version="1.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.projectcopy-feature/pom.xml b/features/org.eclipse.oomph.projectcopy-feature/pom.xml
index b1e5553..5d3f8f4 100644
--- a/features/org.eclipse.oomph.projectcopy-feature/pom.xml
+++ b/features/org.eclipse.oomph.projectcopy-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.projectcopy</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.version.headless-feature/feature.xml b/features/org.eclipse.oomph.version.headless-feature/feature.xml
index 1edcd58..15b3689 100644
--- a/features/org.eclipse.oomph.version.headless-feature/feature.xml
+++ b/features/org.eclipse.oomph.version.headless-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.version.headless"
       label="%featureName"
-      version="1.8.0.qualifier"
+      version="1.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.version.headless-feature/pom.xml b/features/org.eclipse.oomph.version.headless-feature/pom.xml
index 2f986b4..4eb6115 100644
--- a/features/org.eclipse.oomph.version.headless-feature/pom.xml
+++ b/features/org.eclipse.oomph.version.headless-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.version.headless</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/plugins/org.eclipse.oomph.base.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.base.edit/META-INF/MANIFEST.MF
index c9362a9..fec511a 100644
--- a/plugins/org.eclipse.oomph.base.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.base.edit/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.oomph.base;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.base.edit
diff --git a/plugins/org.eclipse.oomph.base/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.base/META-INF/MANIFEST.MF
index bdc4da8..91aeecb 100644
--- a/plugins/org.eclipse.oomph.base/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.base/META-INF/MANIFEST.MF
@@ -15,5 +15,6 @@
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.8.0,2.0.0)";visibility:=reexport
+ org.eclipse.oomph.util;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.base
diff --git a/plugins/org.eclipse.oomph.extractor.lib.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.extractor.lib.tests/META-INF/MANIFEST.MF
index 747d4c8..3d81efc 100644
--- a/plugins/org.eclipse.oomph.extractor.lib.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.extractor.lib.tests/META-INF/MANIFEST.MF
@@ -1,12 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.extractor.lib.tests
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.5.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
-Export-Package: org.eclipse.oomph.extractor.lib.tests;version="1.4.0"
-Require-Bundle: org.eclipse.oomph.extractor.lib;bundle-version="[1.3.0,2.0.0)",
+Export-Package: org.eclipse.oomph.extractor.lib.tests;version="1.5.0"
+Require-Bundle: org.eclipse.oomph.extractor.lib;bundle-version="[1.4.0,2.0.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)"
+Automatic-Module-Name: org.eclipse.oomph.extractor.lib.tests
diff --git a/plugins/org.eclipse.oomph.extractor.lib.tests/pom.xml b/plugins/org.eclipse.oomph.extractor.lib.tests/pom.xml
index fd91312..adffea9 100644
--- a/plugins/org.eclipse.oomph.extractor.lib.tests/pom.xml
+++ b/plugins/org.eclipse.oomph.extractor.lib.tests/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.extractor.lib.tests</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.extractor.lib/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.extractor.lib/META-INF/MANIFEST.MF
index 395cccc..c734a2f 100644
--- a/plugins/org.eclipse.oomph.extractor.lib/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.extractor.lib/META-INF/MANIFEST.MF
@@ -1,10 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.extractor.lib
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JRE-1.1
 Bundle-ClassPath: .
-Export-Package: org.eclipse.oomph.extractor.lib;version="1.3.0"
+Export-Package: org.eclipse.oomph.extractor.lib;version="1.4.0"
+Automatic-Module-Name: org.eclipse.oomph.extractor.lib
diff --git a/plugins/org.eclipse.oomph.extractor.lib/pom.xml b/plugins/org.eclipse.oomph.extractor.lib/pom.xml
index 1e048c2..bd0cd58 100644
--- a/plugins/org.eclipse.oomph.extractor.lib/pom.xml
+++ b/plugins/org.eclipse.oomph.extractor.lib/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.extractor.lib</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.oomph.gitbash/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.gitbash/META-INF/MANIFEST.MF
index 6da77e6..9e0e94d 100644
--- a/plugins/org.eclipse.oomph.gitbash/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.gitbash/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.gitbash;singleton:=true
-Bundle-Version: 1.8.0.qualifier
+Bundle-Version: 1.9.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -17,10 +17,11 @@
  org.eclipse.egit.ui;bundle-version="[2.0.0,5.0.0)",
  org.eclipse.mylyn.tasks.core;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
  org.eclipse.mylyn.tasks.ui;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
- org.eclipse.oomph.util;bundle-version="[1.8.0,2.0.0)"
+ org.eclipse.oomph.util;bundle-version="[1.9.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.oomph.gitbash;version="1.8.0";x-internal:=true,
- org.eclipse.oomph.gitbash.decorators;version="1.8.0";x-internal:=true,
- org.eclipse.oomph.gitbash.repository;version="1.8.0";x-internal:=true,
- org.eclipse.oomph.gitbash.revision;version="1.8.0";x-internal:=true
+Export-Package: org.eclipse.oomph.gitbash;version="1.9.0";x-internal:=true,
+ org.eclipse.oomph.gitbash.decorators;version="1.9.0";x-internal:=true,
+ org.eclipse.oomph.gitbash.repository;version="1.9.0";x-internal:=true,
+ org.eclipse.oomph.gitbash.revision;version="1.9.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.gitbash
diff --git a/plugins/org.eclipse.oomph.gitbash/pom.xml b/plugins/org.eclipse.oomph.gitbash/pom.xml
index 98ce2ec..d87d30a 100644
--- a/plugins/org.eclipse.oomph.gitbash/pom.xml
+++ b/plugins/org.eclipse.oomph.gitbash/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.gitbash</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.jreinfo.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.jreinfo.ui/META-INF/MANIFEST.MF
index b14dda9..e445d66 100644
--- a/plugins/org.eclipse.oomph.jreinfo.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.jreinfo.ui/META-INF/MANIFEST.MF
@@ -10,5 +10,6 @@
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.ui;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.oomph.jreinfo;bundle-version="[1.8.0,2.0.0)";visibility:=reexport
+ org.eclipse.oomph.jreinfo;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Export-Package: org.eclipse.oomph.jreinfo.ui;version="1.9.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.jreinfo.ui
diff --git a/plugins/org.eclipse.oomph.jreinfo/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.jreinfo/META-INF/MANIFEST.MF
index b12dd12..6602078 100644
--- a/plugins/org.eclipse.oomph.jreinfo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.jreinfo/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.jreinfo
-Bundle-Version: 1.8.0.qualifier
+Bundle-Version: 1.9.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
@@ -10,7 +10,8 @@
 Bundle-Activator: org.eclipse.oomph.internal.jreinfo.JREInfoPlugin$Implementation
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.extractor.lib;bundle-version="[1.3.0,2.0.0)"
-Export-Package: org.eclipse.oomph.internal.jreinfo;version="1.8.0";x-internal:=true,
- org.eclipse.oomph.jreinfo;version="1.8.0";x-internal:=true
+ org.eclipse.oomph.util;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.oomph.extractor.lib;bundle-version="[1.4.0,2.0.0)"
+Export-Package: org.eclipse.oomph.internal.jreinfo;version="1.9.0";x-internal:=true,
+ org.eclipse.oomph.jreinfo;version="1.9.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.jreinfo
diff --git a/plugins/org.eclipse.oomph.jreinfo/pom.xml b/plugins/org.eclipse.oomph.jreinfo/pom.xml
index ff4cf48..1396e77 100644
--- a/plugins/org.eclipse.oomph.jreinfo/pom.xml
+++ b/plugins/org.eclipse.oomph.jreinfo/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.jreinfo</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.launches/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.launches/META-INF/MANIFEST.MF
index 2e7c8e9..576eab1 100644
--- a/plugins/org.eclipse.oomph.launches/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.launches/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.launches;singleton:=true
-Bundle-Version: 1.6.0.qualifier
+Bundle-Version: 1.7.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,7 +11,8 @@
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.jdt.junit.core;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
- org.eclipse.oomph.util;bundle-version="[1.8.0,2.0.0)"
+ org.eclipse.oomph.util;bundle-version="[1.9.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.launches;version="1.6.0";x-internal:=true
+Export-Package: org.eclipse.oomph.launches;version="1.7.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.launches
diff --git a/plugins/org.eclipse.oomph.launches/pom.xml b/plugins/org.eclipse.oomph.launches/pom.xml
index 8759844..a7b5eae 100644
--- a/plugins/org.eclipse.oomph.launches/pom.xml
+++ b/plugins/org.eclipse.oomph.launches/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.launches</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
+  <version>1.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.manifests/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.manifests/META-INF/MANIFEST.MF
index 4da86c9..0a056f8 100644
--- a/plugins/org.eclipse.oomph.manifests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.manifests/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@
  org.eclipse.oomph.ui;bundle-version="[1.9.0,2.0.0)"
 Export-Package: org.eclipse.oomph.manifests;version="1.8.0";x-internal:=true,
  org.eclipse.oomph.manifests.handlers;version="1.8.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.manifests
diff --git a/plugins/org.eclipse.oomph.ostools/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.ostools/META-INF/MANIFEST.MF
index 0d84da2..9b8d39b 100644
--- a/plugins/org.eclipse.oomph.ostools/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.ostools/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.ostools;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,9 +10,10 @@
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.oomph.util;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.egit.ui;bundle-version="[2.0.0,5.0.0)";resolution:=optional,
  org.eclipse.jgit;bundle-version="[2.0.0,5.0.0)";resolution:=optional
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.oomph.ostools;version="1.7.0";x-internal:=true
+Export-Package: org.eclipse.oomph.ostools;version="1.8.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.ostools
diff --git a/plugins/org.eclipse.oomph.ostools/pom.xml b/plugins/org.eclipse.oomph.ostools/pom.xml
index 30eef15..08fa74f 100644
--- a/plugins/org.eclipse.oomph.ostools/pom.xml
+++ b/plugins/org.eclipse.oomph.ostools/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.ostools</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.p2.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.p2.core/META-INF/MANIFEST.MF
index 4f8634f..40daa8c 100644
--- a/plugins/org.eclipse.oomph.p2.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.p2.core/META-INF/MANIFEST.MF
@@ -31,3 +31,4 @@
  org.eclipse.ecf.filetransfer;bundle-version="[5.0.0,6.0.0)"
 Bundle-ActivationPolicy: lazy
 Service-Component: META-INF/lazyProfileRegistry.xml, META-INF/provisioningAgentProvider.xml
+Automatic-Module-Name: org.eclipse.oomph.p2.core
diff --git a/plugins/org.eclipse.oomph.p2.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.p2.doc/META-INF/MANIFEST.MF
index 5ef2fa2..8166426 100644
--- a/plugins/org.eclipse.oomph.p2.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.p2.doc/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@
  org.eclipse.oomph.p2.doc.reference;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.p2.doc.reference.api;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.p2.doc.reference.schema;version="1.9.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.p2.doc
diff --git a/plugins/org.eclipse.oomph.p2.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.p2.edit/META-INF/MANIFEST.MF
index dd2aee8..c615e5a 100644
--- a/plugins/org.eclipse.oomph.p2.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.p2.edit/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.p2.edit
diff --git a/plugins/org.eclipse.oomph.p2.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.p2.tests/META-INF/MANIFEST.MF
index b95cec0..f775d7a 100644
--- a/plugins/org.eclipse.oomph.p2.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.p2.tests/META-INF/MANIFEST.MF
@@ -21,5 +21,6 @@
  org.eclipse.oomph.p2.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.equinox.p2.operations;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.equinox.p2.transport.ecf;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.tests;bundle-version="[1.8.0,2.0.0)";visibility:=reexport
+ org.eclipse.oomph.tests;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.p2.tests
diff --git a/plugins/org.eclipse.oomph.p2.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.p2.ui/META-INF/MANIFEST.MF
index 4d9ea03..5082c25 100644
--- a/plugins/org.eclipse.oomph.p2.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.p2.ui/META-INF/MANIFEST.MF
@@ -24,3 +24,4 @@
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ui.forms;bundle-version="[3.5.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.p2.ui
diff --git a/plugins/org.eclipse.oomph.p2/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.p2/META-INF/MANIFEST.MF
index cfb9024..9c6cc1f 100644
--- a/plugins/org.eclipse.oomph.p2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.p2/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@
 Export-Package: org.eclipse.oomph.p2;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.p2.impl;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.p2.util;version="1.9.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.p2
diff --git a/plugins/org.eclipse.oomph.predicates.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.predicates.edit/META-INF/MANIFEST.MF
index 9607c7a..754212d 100644
--- a/plugins/org.eclipse.oomph.predicates.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.predicates.edit/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.predicates.edit
diff --git a/plugins/org.eclipse.oomph.predicates/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.predicates/META-INF/MANIFEST.MF
index 2c0f6dc..d75c49f 100644
--- a/plugins/org.eclipse.oomph.predicates/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.predicates/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@
  org.eclipse.oomph.predicates;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.predicates.impl;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.predicates.util;version="1.9.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.predicates
diff --git a/plugins/org.eclipse.oomph.preferences.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.preferences.edit/META-INF/MANIFEST.MF
index 2623bc5..0bf720b 100644
--- a/plugins/org.eclipse.oomph.preferences.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.preferences.edit/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.preferences.edit
diff --git a/plugins/org.eclipse.oomph.preferences.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.preferences.editor/META-INF/MANIFEST.MF
index 3b3050e..22c9518 100644
--- a/plugins/org.eclipse.oomph.preferences.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.preferences.editor/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@
  org.eclipse.oomph.ui;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.preferences.editor
diff --git a/plugins/org.eclipse.oomph.preferences/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.preferences/META-INF/MANIFEST.MF
index f95925c..8ff3921 100644
--- a/plugins/org.eclipse.oomph.preferences/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.preferences/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
 Export-Package: org.eclipse.oomph.preferences;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.preferences.impl;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.preferences.util;version="1.9.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.preferences
diff --git a/plugins/org.eclipse.oomph.projectconfig.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.projectconfig.edit/META-INF/MANIFEST.MF
index 9c995c4..e4c227a 100644
--- a/plugins/org.eclipse.oomph.projectconfig.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.projectconfig.edit/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.projectconfig.edit
diff --git a/plugins/org.eclipse.oomph.projectconfig.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.projectconfig.editor/META-INF/MANIFEST.MF
index 12b176b..fd4c6c2 100644
--- a/plugins/org.eclipse.oomph.projectconfig.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.projectconfig.editor/META-INF/MANIFEST.MF
@@ -25,3 +25,4 @@
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.oomph.ui;bundle-version="[1.9.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.projectconfig.editor
diff --git a/plugins/org.eclipse.oomph.projectconfig/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.projectconfig/META-INF/MANIFEST.MF
index ae38fde..8668959 100644
--- a/plugins/org.eclipse.oomph.projectconfig/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.projectconfig/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@
 Export-Package: org.eclipse.oomph.projectconfig;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.projectconfig.impl;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.projectconfig.util;version="1.9.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.projectconfig
diff --git a/plugins/org.eclipse.oomph.projectcopy/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.projectcopy/META-INF/MANIFEST.MF
index eb1ea70..f64b8a1 100644
--- a/plugins/org.eclipse.oomph.projectcopy/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.projectcopy/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.projectcopy;singleton:=true
-Bundle-Version: 1.8.0.qualifier
+Bundle-Version: 1.9.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,7 +10,8 @@
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.8.0,2.0.0)"
+ org.eclipse.oomph.util;bundle-version="[1.9.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.projectcopy;version="1.8.0";x-internal:=true
+Export-Package: org.eclipse.oomph.projectcopy;version="1.9.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.projectcopy
diff --git a/plugins/org.eclipse.oomph.projectcopy/pom.xml b/plugins/org.eclipse.oomph.projectcopy/pom.xml
index 7af9ec3..97b1bec 100644
--- a/plugins/org.eclipse.oomph.projectcopy/pom.xml
+++ b/plugins/org.eclipse.oomph.projectcopy/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.projectcopy</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.resources.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.resources.edit/META-INF/MANIFEST.MF
index 525d3c8..840301c 100644
--- a/plugins/org.eclipse.oomph.resources.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.resources.edit/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.predicates.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.resources.edit
diff --git a/plugins/org.eclipse.oomph.resources/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.resources/META-INF/MANIFEST.MF
index 959a56c..20d38f5 100644
--- a/plugins/org.eclipse.oomph.resources/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.resources/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@
  org.eclipse.oomph.resources.backend;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.resources.impl;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.resources.util;version="1.9.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.resources
diff --git a/plugins/org.eclipse.oomph.setup.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.core/META-INF/MANIFEST.MF
index cbd531a..e2cedeb 100644
--- a/plugins/org.eclipse.oomph.setup.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.core/META-INF/MANIFEST.MF
@@ -42,3 +42,4 @@
 Export-Package: org.eclipse.oomph.setup.internal.core;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.setup.internal.core.util;version="1.9.0";x-internal:=true
 Bundle-Activator: org.eclipse.oomph.setup.internal.core.SetupCorePlugin$Implementation
+Automatic-Module-Name: org.eclipse.oomph.setup.core
diff --git a/plugins/org.eclipse.oomph.setup.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.doc/META-INF/MANIFEST.MF
index 55ef94d..cfba9aa 100644
--- a/plugins/org.eclipse.oomph.setup.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.doc/META-INF/MANIFEST.MF
@@ -48,3 +48,4 @@
  org.eclipse.oomph.setup.doc.reference.schema;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.setup.doc.user;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.setup.doc.user.wizard;version="1.9.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.setup.doc
diff --git a/plugins/org.eclipse.oomph.setup.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.edit/META-INF/MANIFEST.MF
index 6d8b48f..45d5505 100644
--- a/plugins/org.eclipse.oomph.setup.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.edit/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.edit
diff --git a/plugins/org.eclipse.oomph.setup.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.editor/META-INF/MANIFEST.MF
index 2a1d4e1..9c85b34 100644
--- a/plugins/org.eclipse.oomph.setup.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.editor/META-INF/MANIFEST.MF
@@ -33,3 +33,4 @@
  org.eclipse.oomph.p2.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.p2.edit;bundle-version="[1.9.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.editor
diff --git a/plugins/org.eclipse.oomph.setup.git.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.git.edit/META-INF/MANIFEST.MF
index cc72950..07c8811 100644
--- a/plugins/org.eclipse.oomph.setup.git.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.git.edit/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.git.edit
diff --git a/plugins/org.eclipse.oomph.setup.git/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.git/META-INF/MANIFEST.MF
index cd61a93..75340b1 100644
--- a/plugins/org.eclipse.oomph.setup.git/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.git/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@
  org.eclipse.egit.core;bundle-version="[2.0.0,5.0.0)",
  org.eclipse.jgit;bundle-version="[2.0.0,5.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.git
diff --git a/plugins/org.eclipse.oomph.setup.installer.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.installer.tests/META-INF/MANIFEST.MF
index 5eb6d74..6988764 100644
--- a/plugins/org.eclipse.oomph.setup.installer.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.installer.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.oomph.setup.installer.tests;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.oomph.ui.tests;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.oomph.ui.tests;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.installer;bundle-version="[1.9.0,2.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Service-Component: META-INF/testableObject.xml
+Automatic-Module-Name: org.eclipse.oomph.setup.installer.tests
diff --git a/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
index 3b0b86c..2f96501 100644
--- a/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
@@ -35,3 +35,4 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.oomph.setup.internal.installer;version="1.9.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.setup.installer
diff --git a/plugins/org.eclipse.oomph.setup.jdt.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.jdt.edit/META-INF/MANIFEST.MF
index d0db042..75db189 100644
--- a/plugins/org.eclipse.oomph.setup.jdt.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.jdt.edit/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@
  org.eclipse.oomph.setup.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.jdt.launching;bundle-version="[3.6.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.jdt.edit
diff --git a/plugins/org.eclipse.oomph.setup.jdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.jdt/META-INF/MANIFEST.MF
index d739559..f95d491 100644
--- a/plugins/org.eclipse.oomph.setup.jdt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.jdt/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
  org.eclipse.oomph.setup;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.jdt.launching;bundle-version="[3.6.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.jdt
diff --git a/plugins/org.eclipse.oomph.setup.launching.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.launching.edit/META-INF/MANIFEST.MF
index 966a7db..f2c5e6d 100644
--- a/plugins/org.eclipse.oomph.setup.launching.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.launching.edit/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.launching.edit
diff --git a/plugins/org.eclipse.oomph.setup.launching/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.launching/META-INF/MANIFEST.MF
index aef9ac3..9a456e3 100644
--- a/plugins/org.eclipse.oomph.setup.launching/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.launching/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@
  org.eclipse.oomph.preferences;bundle-version="[1.9.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.oomph.setup.launching.LaunchingPlugin$Implementation
+Automatic-Module-Name: org.eclipse.oomph.setup.launching
diff --git a/plugins/org.eclipse.oomph.setup.maven.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.maven.edit/META-INF/MANIFEST.MF
index cb3b564..2dbab62 100644
--- a/plugins/org.eclipse.oomph.setup.maven.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.maven.edit/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@
  org.eclipse.oomph.resources.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.maven.edit
diff --git a/plugins/org.eclipse.oomph.setup.maven/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.maven/META-INF/MANIFEST.MF
index 01ee174..30a0258 100644
--- a/plugins/org.eclipse.oomph.setup.maven/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.maven/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@
  org.eclipse.oomph.setup;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.m2e.core;bundle-version="[1.3.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.maven
diff --git a/plugins/org.eclipse.oomph.setup.mylyn.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.mylyn.edit/META-INF/MANIFEST.MF
index 030ddb5..c1f2f3e 100644
--- a/plugins/org.eclipse.oomph.setup.mylyn.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.mylyn.edit/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.mylyn.edit
diff --git a/plugins/org.eclipse.oomph.setup.mylyn/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.mylyn/META-INF/MANIFEST.MF
index ff13111..6451a57 100644
--- a/plugins/org.eclipse.oomph.setup.mylyn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.mylyn/META-INF/MANIFEST.MF
@@ -23,3 +23,4 @@
  org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.mylyn
diff --git a/plugins/org.eclipse.oomph.setup.p2.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.p2.edit/META-INF/MANIFEST.MF
index 7ed76f6..c5827af 100644
--- a/plugins/org.eclipse.oomph.setup.p2.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.p2.edit/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@
  org.eclipse.oomph.p2.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.p2.edit
diff --git a/plugins/org.eclipse.oomph.setup.p2/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.p2/META-INF/MANIFEST.MF
index ecf8188..a31fddf 100644
--- a/plugins/org.eclipse.oomph.setup.p2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.p2/META-INF/MANIFEST.MF
@@ -32,3 +32,4 @@
  org.eclipse.equinox.p2.updatesite;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.p2
diff --git a/plugins/org.eclipse.oomph.setup.pde.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.pde.edit/META-INF/MANIFEST.MF
index 9c17b41..ddae90b 100644
--- a/plugins/org.eclipse.oomph.setup.pde.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.pde.edit/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.pde.edit
diff --git a/plugins/org.eclipse.oomph.setup.pde/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.pde/META-INF/MANIFEST.MF
index 01c83bb..7452d7f 100644
--- a/plugins/org.eclipse.oomph.setup.pde/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.pde/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util.pde;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.oomph.util.pde;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.pde.api.tools;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.pde
diff --git a/plugins/org.eclipse.oomph.setup.projects.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.projects.edit/META-INF/MANIFEST.MF
index 2e9024f..73ebc00 100644
--- a/plugins/org.eclipse.oomph.setup.projects.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.projects.edit/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@
  org.eclipse.oomph.resources.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.projects.edit
diff --git a/plugins/org.eclipse.oomph.setup.projects/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.projects/META-INF/MANIFEST.MF
index 41ef2b5..ee3193c 100644
--- a/plugins/org.eclipse.oomph.setup.projects/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.projects/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@
  org.eclipse.oomph.setup.core;bundle-version="[1.9.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.oomph.setup.projects.ProjectsPlugin$Implementation
+Automatic-Module-Name: org.eclipse.oomph.setup.projects
diff --git a/plugins/org.eclipse.oomph.setup.projectset.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.projectset.edit/META-INF/MANIFEST.MF
index 9cc3d98..17a56eb 100644
--- a/plugins/org.eclipse.oomph.setup.projectset.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.projectset.edit/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.projectset.edit
diff --git a/plugins/org.eclipse.oomph.setup.projectset/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.projectset/META-INF/MANIFEST.MF
index 17d56f8..b903458 100644
--- a/plugins/org.eclipse.oomph.setup.projectset/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.projectset/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@
  org.eclipse.team.ui;bundle-version="[3.5.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.oomph.setup.projectset.ProjectSetPlugin$Implementation
+Automatic-Module-Name: org.eclipse.oomph.setup.projectset
diff --git a/plugins/org.eclipse.oomph.setup.sync.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.sync.tests/META-INF/MANIFEST.MF
index 8462d0c..78ec76e 100644
--- a/plugins/org.eclipse.oomph.setup.sync.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.sync.tests/META-INF/MANIFEST.MF
@@ -9,8 +9,9 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.oomph.setup.sync.tests;version="1.9.0";x-internal:=true
 Require-Bundle: org.eclipse.userstorage.tests;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.oomph.tests;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.oomph.tests;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.oomph.setup.sync;bundle-version="[1.9.0,2.0.0)",
  org.apache.httpcomponents.httpcore;bundle-version="[4.0.0,5.0.0)",
  org.apache.httpcomponents.httpclient;bundle-version="[4.0.0,5.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.sync.tests
diff --git a/plugins/org.eclipse.oomph.setup.sync/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.sync/META-INF/MANIFEST.MF
index 26cdc6e..76d827b 100644
--- a/plugins/org.eclipse.oomph.setup.sync/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.sync/META-INF/MANIFEST.MF
@@ -30,3 +30,4 @@
  org.eclipse.oomph.setup.sync.impl;version="1.9.0";x-friends:="org.eclipse.oomph.setup.sync.tests,org.eclipse.oomph.setup.ui",
  org.eclipse.oomph.setup.sync.util;version="1.9.0";x-friends:="org.eclipse.oomph.setup.sync.tests,org.eclipse.oomph.setup.ui"
 Bundle-Activator: org.eclipse.oomph.setup.internal.sync.SetupSyncPlugin$Implementation
+Automatic-Module-Name: org.eclipse.oomph.setup.sync
diff --git a/plugins/org.eclipse.oomph.setup.targlets.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.targlets.edit/META-INF/MANIFEST.MF
index f59c126..c5e62c6 100644
--- a/plugins/org.eclipse.oomph.setup.targlets.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.targlets.edit/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@
  org.eclipse.oomph.setup.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.targlets.core;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.oomph.targlets.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util.pde;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.oomph.util.pde;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.targlets.edit
diff --git a/plugins/org.eclipse.oomph.setup.targlets/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.targlets/META-INF/MANIFEST.MF
index 87ba849..251c2f5 100644
--- a/plugins/org.eclipse.oomph.setup.targlets/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.targlets/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@
  org.eclipse.oomph.setup;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.targlets;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.targlets.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.oomph.util.pde;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.oomph.util.pde;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.targlets
diff --git a/plugins/org.eclipse.oomph.setup.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.tests/META-INF/MANIFEST.MF
index 1e7db87..e0a39b5 100644
--- a/plugins/org.eclipse.oomph.setup.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.tests/META-INF/MANIFEST.MF
@@ -23,6 +23,7 @@
  org.eclipse.oomph.p2.core;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.oomph.setup.core;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.oomph.setup.p2;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.oomph.tests;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.oomph.tests;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.oomph.setup.jdt;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.jdt.launching;bundle-version="[3.6.0,4.0.0)"
+Automatic-Module-Name: org.eclipse.oomph.setup.tests
diff --git a/plugins/org.eclipse.oomph.setup.ui.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.ui.ide/META-INF/MANIFEST.MF
index d2a8df7..ad5b66d 100644
--- a/plugins/org.eclipse.oomph.setup.ui.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.ui.ide/META-INF/MANIFEST.MF
@@ -26,3 +26,4 @@
  org.eclipse.oomph.setup.core;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.oomph.resources;bundle-version="[1.9.0,2.0.0)"
 Export-Package: org.eclipse.oomph.setup.ui.internal.ide;version="1.9.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.setup.ui.ide
diff --git a/plugins/org.eclipse.oomph.setup.ui.questionnaire/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.ui.questionnaire/META-INF/MANIFEST.MF
index 31643bc..b8e399b 100644
--- a/plugins/org.eclipse.oomph.setup.ui.questionnaire/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.ui.questionnaire/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
  org.eclipse.oomph.setup.ui;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.oomph.ui;bundle-version="[1.9.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.ui.questionnaire
diff --git a/plugins/org.eclipse.oomph.setup.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.ui/META-INF/MANIFEST.MF
index f489a2c..d53abde 100644
--- a/plugins/org.eclipse.oomph.setup.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.ui/META-INF/MANIFEST.MF
@@ -37,3 +37,4 @@
  org.eclipse.oomph.jreinfo.ui;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.oomph.preferences;bundle-version="[1.9.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.ui
diff --git a/plugins/org.eclipse.oomph.setup.workbench.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.workbench.edit/META-INF/MANIFEST.MF
index 40310bf..64fecc9 100644
--- a/plugins/org.eclipse.oomph.setup.workbench.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.workbench.edit/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.workbench.edit
diff --git a/plugins/org.eclipse.oomph.setup.workbench/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.workbench/META-INF/MANIFEST.MF
index 0cbe136..8c1a3aa 100644
--- a/plugins/org.eclipse.oomph.setup.workbench/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.workbench/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@
  org.eclipse.jface;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.oomph.ui;bundle-version="[1.9.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.workbench
diff --git a/plugins/org.eclipse.oomph.setup.workingsets.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.workingsets.edit/META-INF/MANIFEST.MF
index 4843dba..1c1d188 100644
--- a/plugins/org.eclipse.oomph.setup.workingsets.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.workingsets.edit/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@
  org.eclipse.oomph.setup.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.workingsets.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.workingsets.edit
diff --git a/plugins/org.eclipse.oomph.setup.workingsets/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.workingsets/META-INF/MANIFEST.MF
index 4afd021..adaeff1 100644
--- a/plugins/org.eclipse.oomph.setup.workingsets/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.workingsets/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@
  org.eclipse.oomph.setup;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.workingsets;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.setup.workingsets
diff --git a/plugins/org.eclipse.oomph.setup/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup/META-INF/MANIFEST.MF
index 60ed8a0..18dacaf 100644
--- a/plugins/org.eclipse.oomph.setup/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@
  org.eclipse.oomph.setup.log;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.setup.util;version="1.9.0";x-internal:=true
 Bundle-Activator: org.eclipse.oomph.internal.setup.SetupPlugin$Implementation
+Automatic-Module-Name: org.eclipse.oomph.setup
diff --git a/plugins/org.eclipse.oomph.targlets.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.targlets.core/META-INF/MANIFEST.MF
index 4915e83..fecdb06 100644
--- a/plugins/org.eclipse.oomph.targlets.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.targlets.core/META-INF/MANIFEST.MF
@@ -29,7 +29,7 @@
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.targlets;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util.pde;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.oomph.util.pde;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
@@ -38,3 +38,4 @@
  org.eclipse.oomph.targlets.internal.core.listeners;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.targlets.internal.core.variables;version="1.9.0";x-internal:=true
 Bundle-Activator: org.eclipse.oomph.targlets.internal.core.TargletsCorePlugin$Implementation
+Automatic-Module-Name: org.eclipse.oomph.targlets.core
diff --git a/plugins/org.eclipse.oomph.targlets.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.targlets.doc/META-INF/MANIFEST.MF
index 9f591dd..382f8a7 100644
--- a/plugins/org.eclipse.oomph.targlets.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.targlets.doc/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@
  org.eclipse.oomph.targlets.doc.reference;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.targlets.doc.reference.api;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.targlets.doc.reference.schema;version="1.9.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.oomph.targlets.doc
diff --git a/plugins/org.eclipse.oomph.targlets.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.targlets.edit/META-INF/MANIFEST.MF
index 1a93000..e4850ce 100644
--- a/plugins/org.eclipse.oomph.targlets.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.targlets.edit/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@
  org.eclipse.oomph.predicates.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.resources.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.targlets.edit
diff --git a/plugins/org.eclipse.oomph.targlets.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.targlets.editor/META-INF/MANIFEST.MF
index 40709ac..88e6342 100644
--- a/plugins/org.eclipse.oomph.targlets.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.targlets.editor/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.util.pde;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.oomph.util.pde;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.oomph.targlets.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.targlets.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
@@ -24,3 +24,4 @@
  org.eclipse.oomph.resources.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.ui;bundle-version="[1.9.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.targlets.editor
diff --git a/plugins/org.eclipse.oomph.targlets.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.targlets.tests/META-INF/MANIFEST.MF
index 404971b..0b5bb93 100644
--- a/plugins/org.eclipse.oomph.targlets.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.targlets.tests/META-INF/MANIFEST.MF
@@ -10,8 +10,9 @@
 Export-Package: org.eclipse.oomph.targlets.tests;version="1.9.0";x-internal:=true
 Require-Bundle: org.eclipse.oomph.p2.tests;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.targlets.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util.pde;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.oomph.util.pde;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.oomph.targlets.tests.TargletsTestsPlugin$Implementation
+Automatic-Module-Name: org.eclipse.oomph.targlets.tests
diff --git a/plugins/org.eclipse.oomph.targlets.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.targlets.ui/META-INF/MANIFEST.MF
index ff1567c..e6145e1 100644
--- a/plugins/org.eclipse.oomph.targlets.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.targlets.ui/META-INF/MANIFEST.MF
@@ -33,7 +33,7 @@
  org.eclipse.oomph.targlets.editor;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2.ui;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.oomph.ui;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.oomph.util.pde;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.oomph.util.pde;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.views;bundle-version="[3.5.0,4.0.0)",
@@ -43,3 +43,4 @@
 Export-Package: org.eclipse.oomph.targlets.internal.ui;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.targlets.internal.ui.wizards;version="1.9.0";x-internal:=true
 Bundle-Activator: org.eclipse.oomph.targlets.internal.ui.TargletsUIPlugin$Implementation
+Automatic-Module-Name: org.eclipse.oomph.targlets.ui
diff --git a/plugins/org.eclipse.oomph.targlets/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.targlets/META-INF/MANIFEST.MF
index 1c56f4f..ba4a117 100644
--- a/plugins/org.eclipse.oomph.targlets/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.targlets/META-INF/MANIFEST.MF
@@ -24,3 +24,4 @@
  org.eclipse.oomph.targlets.util;version="1.9.0";x-internal:=true
 Bundle-Activator: org.eclipse.oomph.internal.targlets.TargletsPlugin$Implementation
 Service-Component: META-INF/noopPluginConverter.xml
+Automatic-Module-Name: org.eclipse.oomph.targlets
diff --git a/plugins/org.eclipse.oomph.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.tests/META-INF/MANIFEST.MF
index 8c88341..7f94878 100644
--- a/plugins/org.eclipse.oomph.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.tests;singleton:=true
-Bundle-Version: 1.8.0.qualifier
+Bundle-Version: 1.9.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.tests;version="1.8.0";x-internal:=true
+Export-Package: org.eclipse.oomph.tests;version="1.9.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.core.net;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.oomph.util;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.11.0,5.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.tests
diff --git a/plugins/org.eclipse.oomph.tests/pom.xml b/plugins/org.eclipse.oomph.tests/pom.xml
index 0d6585c..32187b8 100644
--- a/plugins/org.eclipse.oomph.tests/pom.xml
+++ b/plugins/org.eclipse.oomph.tests/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.tests</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.ui.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.ui.tests/META-INF/MANIFEST.MF
index 9f34013..af7de20 100644
--- a/plugins/org.eclipse.oomph.ui.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.ui.tests/META-INF/MANIFEST.MF
@@ -2,15 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.ui.tests;singleton:=true
-Bundle-Version: 1.8.0.qualifier
+Bundle-Version: 1.9.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.ui.tests;version="1.8.0";x-internal:=true
-Require-Bundle: org.eclipse.oomph.tests;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+Export-Package: org.eclipse.oomph.ui.tests;version="1.9.0";x-internal:=true
+Require-Bundle: org.eclipse.oomph.tests;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.swtbot.junit4_x;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.swtbot.eclipse.finder;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.swtbot.go;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.swtbot.swt.finder;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.ui.tests
diff --git a/plugins/org.eclipse.oomph.ui.tests/pom.xml b/plugins/org.eclipse.oomph.ui.tests/pom.xml
index 20f6f2e..40f8455 100644
--- a/plugins/org.eclipse.oomph.ui.tests/pom.xml
+++ b/plugins/org.eclipse.oomph.ui.tests/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.ui.tests</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF
index bf6a2e5..117a133 100644
--- a/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@
 Export-Package: org.eclipse.oomph.internal.ui;version="1.9.0";x-internal:=true,
  org.eclipse.oomph.ui;version="1.9.0";x-internal:=true
 Eclipse-BuddyPolicy: dependent
+Automatic-Module-Name: org.eclipse.oomph.ui
diff --git a/plugins/org.eclipse.oomph.util.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.util.doc/META-INF/MANIFEST.MF
index 4490158..567adc5 100644
--- a/plugins/org.eclipse.oomph.util.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.util.doc/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.help;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.oomph.util.pde;bundle-version="[1.8.0,2.0.0)";resolution:=optional;visibility:=reexport,
+ org.eclipse.oomph.util.pde;bundle-version="[1.9.0,2.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.oomph.ui;bundle-version="[1.9.0,2.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.oomph.predicates.edit;bundle-version="[1.9.0,2.0.0)";resolution:=optional;visibility:=reexport,
@@ -20,3 +20,4 @@
  org.eclipse.oomph.util.doc.reference;version="1.9.0",
  org.eclipse.oomph.util.doc.reference.api;version="1.9.0",
  org.eclipse.oomph.util.doc.reference.schema;version="1.9.0"
+Automatic-Module-Name: org.eclipse.oomph.util.doc
diff --git a/plugins/org.eclipse.oomph.util.pde/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.util.pde/META-INF/MANIFEST.MF
index 04e86ca..9fbbd70 100644
--- a/plugins/org.eclipse.oomph.util.pde/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.util.pde/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.util.pde;singleton:=true
-Bundle-Version: 1.8.0.qualifier
+Bundle-Version: 1.9.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -14,7 +14,8 @@
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.8.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.oomph.util.internal.pde;version="1.8.0";x-internal:=true,
- org.eclipse.oomph.util.pde;version="1.8.0"
+ org.eclipse.oomph.util;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+Export-Package: org.eclipse.oomph.util.internal.pde;version="1.9.0";x-internal:=true,
+ org.eclipse.oomph.util.pde;version="1.9.0"
 Eclipse-BuddyPolicy: dependent
+Automatic-Module-Name: org.eclipse.oomph.util.pde
diff --git a/plugins/org.eclipse.oomph.util.pde/pom.xml b/plugins/org.eclipse.oomph.util.pde/pom.xml
index e338166..4f60fce 100644
--- a/plugins/org.eclipse.oomph.util.pde/pom.xml
+++ b/plugins/org.eclipse.oomph.util.pde/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.util.pde</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.util/META-INF/MANIFEST.MF
index 45104e9..962645e 100644
--- a/plugins/org.eclipse.oomph.util/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.util/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.util;singleton:=true
-Bundle-Version: 1.8.0.qualifier
+Bundle-Version: 1.9.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,7 +13,8 @@
  org.apache.httpcomponents.httpclient;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.common;bundle-version="[2.10.0,3.0.0)";visibility:=reexport
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)"
-Export-Package: org.eclipse.oomph.internal.util;version="1.8.0";x-internal:=true,
- org.eclipse.oomph.internal.util.table;version="1.8.0";x-internal:=true,
- org.eclipse.oomph.util;version="1.8.0";x-internal:=true
+Export-Package: org.eclipse.oomph.internal.util;version="1.9.0";x-internal:=true,
+ org.eclipse.oomph.internal.util.table;version="1.9.0";x-internal:=true,
+ org.eclipse.oomph.util;version="1.9.0";x-internal:=true
 Eclipse-BuddyPolicy: registered
+Automatic-Module-Name: org.eclipse.oomph.util
diff --git a/plugins/org.eclipse.oomph.util/pom.xml b/plugins/org.eclipse.oomph.util/pom.xml
index 8da6491..b54414b 100644
--- a/plugins/org.eclipse.oomph.util/pom.xml
+++ b/plugins/org.eclipse.oomph.util/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.util</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.version.digest/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.version.digest/META-INF/MANIFEST.MF
index 79aae4b..b8d4214 100644
--- a/plugins/org.eclipse.oomph.version.digest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.version.digest/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.version.digest;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,6 +12,7 @@
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.oomph.version;bundle-version="[1.8.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.oomph.version.digest;version="1.7.0";x-friends:="org.eclipse.oomph.version.ui"
+ org.eclipse.oomph.version;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+Export-Package: org.eclipse.oomph.version.digest;version="1.8.0";x-friends:="org.eclipse.oomph.version.ui"
 Eclipse-RegisterBuddy: org.eclipse.oomph.util
+Automatic-Module-Name: org.eclipse.oomph.version.digest
diff --git a/plugins/org.eclipse.oomph.version.digest/pom.xml b/plugins/org.eclipse.oomph.version.digest/pom.xml
index 725dea1..35ed45d 100644
--- a/plugins/org.eclipse.oomph.version.digest/pom.xml
+++ b/plugins/org.eclipse.oomph.version.digest/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.version.digest</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.version.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.version.tests/META-INF/MANIFEST.MF
index d51316c..73d4a5d 100644
--- a/plugins/org.eclipse.oomph.version.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.version.tests/META-INF/MANIFEST.MF
@@ -14,10 +14,11 @@
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.oomph.version;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.oomph.version.digest;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.oomph.version;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.oomph.version.digest;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.oomph.version.ui;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.oomph.resources;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.oomph.tests;bundle-version="[1.8.0,2.0.0)"
+ org.eclipse.oomph.tests;bundle-version="[1.9.0,2.0.0)"
 Export-Package: org.eclipse.oomph.version.tests;version="1.9.0"
 Bundle-Activator: org.eclipse.oomph.version.tests.VersionTestsPlugin$Implementation
+Automatic-Module-Name: org.eclipse.oomph.version.tests
diff --git a/plugins/org.eclipse.oomph.version.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.version.ui/META-INF/MANIFEST.MF
index e027e0a..9f01a82 100644
--- a/plugins/org.eclipse.oomph.version.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.version.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.ui;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.oomph.version;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.oomph.version;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.pde.api.tools;bundle-version="[1.0.0,2.0.0)";resolution:=optional
 Export-Package: org.eclipse.oomph.version.ui;version="1.9.0";x-internal:=true,
@@ -26,3 +26,4 @@
  org.eclipse.oomph.version.ui.quickfixes;version="1.9.0";x-friends:="org.eclipse.oomph.version.tests",
  org.eclipse.oomph.version.ui.views;version="1.9.0";x-internal:=true
 Eclipse-BuddyPolicy: dependent
+Automatic-Module-Name: org.eclipse.oomph.version.ui
diff --git a/plugins/org.eclipse.oomph.version/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.version/META-INF/MANIFEST.MF
index 39f0ed7..da77114 100644
--- a/plugins/org.eclipse.oomph.version/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.version/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.version;singleton:=true
-Bundle-Version: 1.8.0.qualifier
+Bundle-Version: 1.9.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,8 +12,9 @@
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.8.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.oomph.internal.version;version="1.8.0";x-friends:="org.eclipse.oomph.version.ui",
- org.eclipse.oomph.version;version="1.8.0"
+ org.eclipse.oomph.util;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+Export-Package: org.eclipse.oomph.internal.version;version="1.9.0";x-friends:="org.eclipse.oomph.version.ui",
+ org.eclipse.oomph.version;version="1.9.0"
 Eclipse-RegisterBuddy: org.eclipse.oomph.util
 Eclipse-BuddyPolicy: dependent
+Automatic-Module-Name: org.eclipse.oomph.version
diff --git a/plugins/org.eclipse.oomph.version/pom.xml b/plugins/org.eclipse.oomph.version/pom.xml
index ef7df1e..ea559ff 100644
--- a/plugins/org.eclipse.oomph.version/pom.xml
+++ b/plugins/org.eclipse.oomph.version/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.version</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.workingsets.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.workingsets.edit/META-INF/MANIFEST.MF
index e0c0130..2a3ba33 100644
--- a/plugins/org.eclipse.oomph.workingsets.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.workingsets.edit/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
  org.eclipse.oomph.predicates.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.workingsets.edit
diff --git a/plugins/org.eclipse.oomph.workingsets.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.workingsets.editor/META-INF/MANIFEST.MF
index c45a4da..c3b6ae3 100644
--- a/plugins/org.eclipse.oomph.workingsets.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.workingsets.editor/META-INF/MANIFEST.MF
@@ -20,3 +20,4 @@
  org.eclipse.oomph.base.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.ui;bundle-version="[1.9.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.oomph.workingsets.editor
diff --git a/plugins/org.eclipse.oomph.workingsets/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.workingsets/META-INF/MANIFEST.MF
index 6bd28a5..8016368 100644
--- a/plugins/org.eclipse.oomph.workingsets/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.workingsets/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
 Export-Package: org.eclipse.oomph.workingsets;version="1.9.0",
  org.eclipse.oomph.workingsets.impl;version="1.9.0",
  org.eclipse.oomph.workingsets.util;version="1.9.0"
+Automatic-Module-Name: org.eclipse.oomph.workingsets