diff --git a/bundles/archived/org.eclipse.equinox.console.ssh.tests/META-INF/MANIFEST.MF b/bundles/archived/org.eclipse.equinox.console.ssh.tests/META-INF/MANIFEST.MF
index 20f5ae4..3fe896a 100755
--- a/bundles/archived/org.eclipse.equinox.console.ssh.tests/META-INF/MANIFEST.MF
+++ b/bundles/archived/org.eclipse.equinox.console.ssh.tests/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@
  org.easymock;version="2.4.0",
  org.junit;version="4.8.1"
 Fragment-Host: org.eclipse.equinox.console.ssh, org.eclipse.equinox.console
+Automatic-Module-Name: org.eclipse.equinox.console.ssh.tests
diff --git a/bundles/archived/org.eclipse.equinox.console.tests/META-INF/MANIFEST.MF b/bundles/archived/org.eclipse.equinox.console.tests/META-INF/MANIFEST.MF
index 6abdf9a..069d59e 100755
--- a/bundles/archived/org.eclipse.equinox.console.tests/META-INF/MANIFEST.MF
+++ b/bundles/archived/org.eclipse.equinox.console.tests/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@
  org.easymock;version="2.4.0",
  org.junit;version="4.8.1"
 Fragment-Host: org.eclipse.equinox.console
+Automatic-Module-Name: org.eclipse.equinox.console.tests
diff --git a/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF
index 676a9d0..3f4d5be 100644
--- a/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.equinox.app; singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 1.3.500.qualifier
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.equinox.internal.app.Activator
 Bundle-Localization: plugin
@@ -33,3 +33,4 @@
 Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.2,
  CDC-1.1/Foundation-1.1,
  J2SE-1.4
+Automatic-Module-Name: org.eclipse.equinox.app
diff --git a/bundles/org.eclipse.equinox.app/pom.xml b/bundles/org.eclipse.equinox.app/pom.xml
index 463b36a..930c75f 100644
--- a/bundles/org.eclipse.equinox.app/pom.xml
+++ b/bundles/org.eclipse.equinox.app/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.app</artifactId>
-  <version>1.3.400-SNAPSHOT</version>
+  <version>1.3.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/bundles/org.eclipse.equinox.bidi.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.bidi.tests/META-INF/MANIFEST.MF
index 1134195..ad66d31 100644
--- a/bundles/org.eclipse.equinox.bidi.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.bidi.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: BiDi tests
 Bundle-SymbolicName: org.eclipse.equinox.bidi.tests;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Require-Bundle: org.eclipse.equinox.bidi;bundle-version="1.0.0",
  org.eclipse.equinox.registry;bundle-version="3.5.0",
  org.junit;bundle-version="4.12.0"
@@ -11,3 +11,4 @@
 Export-Package: org.eclipse.equinox.bidi.internal.tests;x-internal:=true,
  org.eclipse.equinox.bidi.tests
 Eclipse-BundleShape: dir
+Automatic-Module-Name: org.eclipse.equinox.bidi.tests
diff --git a/bundles/org.eclipse.equinox.bidi.tests/pom.xml b/bundles/org.eclipse.equinox.bidi.tests/pom.xml
index a92ffa4..3e0177d 100644
--- a/bundles/org.eclipse.equinox.bidi.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.bidi.tests/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.bidi.tests</artifactId>
-  <version>1.0.200-SNAPSHOT</version>
+  <version>1.0.300-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.bidi/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.bidi/META-INF/MANIFEST.MF
index a6cd2fb..1bfacab 100644
--- a/bundles/org.eclipse.equinox.bidi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.bidi/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.equinox.bidi;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-ActivationPolicy: lazy
@@ -20,3 +20,4 @@
  org.osgi.framework;version="1.5.0",
  org.osgi.util.tracker;version="1.4.0"
 Bundle-Activator: org.eclipse.equinox.bidi.internal.StructuredTextActivator
+Automatic-Module-Name: org.eclipse.equinox.bidi
diff --git a/bundles/org.eclipse.equinox.bidi/pom.xml b/bundles/org.eclipse.equinox.bidi/pom.xml
index 5c53cee..bf5718a 100644
--- a/bundles/org.eclipse.equinox.bidi/pom.xml
+++ b/bundles/org.eclipse.equinox.bidi/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.bidi</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.cm.test/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.cm.test/META-INF/MANIFEST.MF
index b0dfe2b..38e3182 100644
--- a/bundles/org.eclipse.equinox.cm.test/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.cm.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Test Plug-in
 Bundle-SymbolicName: org.eclipse.equinox.cm.test
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.100.qualifier
 Bundle-Activator: org.eclipse.equinox.cm.test.Activator
 Import-Package: org.eclipse.equinox.log,
  org.junit;version="4.12.0",
@@ -15,3 +15,4 @@
  org.osgi.service.packageadmin;version="1.2.0"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Automatic-Module-Name: org.eclipse.equinox.cm.test
diff --git a/bundles/org.eclipse.equinox.cm.test/pom.xml b/bundles/org.eclipse.equinox.cm.test/pom.xml
index be5adaf..1cb330e 100644
--- a/bundles/org.eclipse.equinox.cm.test/pom.xml
+++ b/bundles/org.eclipse.equinox.cm.test/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.cm.test</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>  
 </project>
diff --git a/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF
index e4a5b6d..e86b4b2 100644
--- a/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.equinox.cm
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
 Bundle-Activator: org.eclipse.equinox.internal.cm.Activator
 Import-Package: org.osgi.framework;version="1.7.0",
  org.osgi.service.cm;version="[1.5,1.6)",
@@ -16,3 +16,4 @@
  osgi.service;
   objectClass:List<String>="org.osgi.service.cm.ConfigurationAdmin";
   uses:="org.osgi.service.cm"
+Automatic-Module-Name: org.eclipse.equinox.cm
diff --git a/bundles/org.eclipse.equinox.cm/pom.xml b/bundles/org.eclipse.equinox.cm/pom.xml
index 1ae69fc..e3cf86b 100644
--- a/bundles/org.eclipse.equinox.cm/pom.xml
+++ b/bundles/org.eclipse.equinox.cm/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.cm</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF
index 9947dbf..1540f62 100644
--- a/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF
@@ -34,3 +34,4 @@
 Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.equinox.common
diff --git a/bundles/org.eclipse.equinox.compendium.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.compendium.tests/META-INF/MANIFEST.MF
index 777ef45..323e5b5 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.compendium.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.equinox.compendium.tests
-Bundle-Version: 1.2.0
+Bundle-Version: 1.2.100.qualifier
 Bundle-Activator: org.eclipse.equinox.compendium.tests.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.junit;bundle-version="4.12.0"
@@ -19,3 +19,4 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: plugin
 Bundle-Vendor: %bundleVendor
+Automatic-Module-Name: org.eclipse.equinox.compendium.tests
diff --git a/bundles/org.eclipse.equinox.compendium.tests/pom.xml b/bundles/org.eclipse.equinox.compendium.tests/pom.xml
index 9b5b12e..da71645 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.compendium.tests/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.compendium.tests</artifactId>
-  <version>1.2.0</version>
+  <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF
index d706013..2884dc9 100644
--- a/bundles/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.equinox.concurrent
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-Vendor: %pluginProvider
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.eclipse.core.runtime;version="3.4.0";common=split,
@@ -11,3 +11,4 @@
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Export-Package: org.eclipse.equinox.concurrent.future;version="1.1.0"
+Automatic-Module-Name: org.eclipse.equinox.concurrent
diff --git a/bundles/org.eclipse.equinox.concurrent/pom.xml b/bundles/org.eclipse.equinox.concurrent/pom.xml
index d4cbdaa..5b6f6d3 100644
--- a/bundles/org.eclipse.equinox.concurrent/pom.xml
+++ b/bundles/org.eclipse.equinox.concurrent/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.concurrent</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF
index 55242c8..90fc992 100755
--- a/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF
@@ -4,7 +4,8 @@
 Bundle-Vendor: %bundleVendor
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.equinox.console.jaas.fragment
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 DynamicImport-Package: org.eclipse.equinox.console.jaas
 Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0"
+Automatic-Module-Name: org.eclipse.equinox.console.jaas.fragment
diff --git a/bundles/org.eclipse.equinox.console.jaas.fragment/pom.xml b/bundles/org.eclipse.equinox.console.jaas.fragment/pom.xml
index 6d5c46b..e9495ff 100644
--- a/bundles/org.eclipse.equinox.console.jaas.fragment/pom.xml
+++ b/bundles/org.eclipse.equinox.console.jaas.fragment/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.console.jaas.fragment</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.console.ssh/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.console.ssh/META-INF/MANIFEST.MF
index 6471445..0464fd8 100644
--- a/bundles/org.eclipse.equinox.console.ssh/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.console.ssh/META-INF/MANIFEST.MF
@@ -30,3 +30,4 @@
  org.eclipse.equinox.console.jaas,
  org.eclipse.equinox.console.ssh;x-internal:=true,
  org.eclipse.equinox.console.storage;x-internal:=true
+Automatic-Module-Name: org.eclipse.equinox.console.ssh
diff --git a/bundles/org.eclipse.equinox.console/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.console/META-INF/MANIFEST.MF
index 6f43221..ea03681 100755
--- a/bundles/org.eclipse.equinox.console/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.console/META-INF/MANIFEST.MF
@@ -28,3 +28,4 @@
  org.apache.felix.service.command;status=provisional;mandatory:=status;version="0.10.0"
 Require-Bundle: org.apache.felix.gogo.runtime;bundle-version="0.10.0",
  org.apache.felix.gogo.shell;bundle-version="0.10.0"
+Automatic-Module-Name: org.eclipse.equinox.console
diff --git a/bundles/org.eclipse.equinox.coordinator/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.coordinator/META-INF/MANIFEST.MF
index 603ef9e..27b5d22 100644
--- a/bundles/org.eclipse.equinox.coordinator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.coordinator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.equinox.coordinator
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 1.3.500.qualifier
 Bundle-Activator: org.eclipse.equinox.coordinator.Activator
 Bundle-Vendor: %bundleVendor
 Import-Package: org.eclipse.osgi.util;version="[1.1,2.0)",
@@ -14,3 +14,4 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: plugin
 Export-Package: org.osgi.service.coordinator;version="1.0.2"
+Automatic-Module-Name: org.eclipse.equinox.coordinator
diff --git a/bundles/org.eclipse.equinox.coordinator/pom.xml b/bundles/org.eclipse.equinox.coordinator/pom.xml
index 7669ad8..b4468ca 100644
--- a/bundles/org.eclipse.equinox.coordinator/pom.xml
+++ b/bundles/org.eclipse.equinox.coordinator/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.coordinator</artifactId>
-  <version>1.3.400-SNAPSHOT</version>
+  <version>1.3.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF
index d06ed3f..3f6c0e6 100644
--- a/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
-Bundle-Version: 1.0.500.qualifier
+Bundle-Version: 1.0.600.qualifier
 Bundle-Activator: org.eclipse.equinox.device.Activator
 Bundle-SymbolicName: org.eclipse.equinox.device
 Bundle-Vendor: %bundleVendor
@@ -14,3 +14,4 @@
 Export-Package: org.eclipse.equinox.device; x-internal:=true
 Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
  J2SE-1.3
+Automatic-Module-Name: org.eclipse.equinox.device
diff --git a/bundles/org.eclipse.equinox.device/pom.xml b/bundles/org.eclipse.equinox.device/pom.xml
index 16161b5..9d0a83d 100644
--- a/bundles/org.eclipse.equinox.device/pom.xml
+++ b/bundles/org.eclipse.equinox.device/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.device</artifactId>
-  <version>1.0.500-SNAPSHOT</version>
+  <version>1.0.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF
index 6c6deab..f9bdd6e 100644
--- a/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@
 Export-Package: org.eclipse.equinox.ds.tests.tbc
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Eclipse-BundleShape: dir
+Automatic-Module-Name: org.eclipse.equinox.ds.tests
diff --git a/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF
index e0a9427..1c942ce 100644
--- a/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF
@@ -23,3 +23,4 @@
 Require-Bundle: org.apache.felix.scr;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Localization: plugin
+Automatic-Module-Name: org.eclipse.equinox.ds
diff --git a/bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF
index 08d1d59..bec08df 100644
--- a/bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
-Bundle-Version: 1.4.100.qualifier
+Bundle-Version: 1.4.200.qualifier
 Bundle-SymbolicName: org.eclipse.equinox.event
 Bundle-Activator: org.eclipse.equinox.internal.event.Activator
 Import-Package: org.eclipse.osgi.framework.eventmgr;version="1.1.0",
@@ -20,3 +20,4 @@
  osgi.service;
   objectClass:List<String>="org.osgi.service.event.EventAdmin";
   uses:="org.osgi.service.event"
+Automatic-Module-Name: org.eclipse.equinox.event
diff --git a/bundles/org.eclipse.equinox.event/pom.xml b/bundles/org.eclipse.equinox.event/pom.xml
index dd0bd35..cafe0e5 100644
--- a/bundles/org.eclipse.equinox.event/pom.xml
+++ b/bundles/org.eclipse.equinox.event/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.event</artifactId>
-  <version>1.4.100-SNAPSHOT</version>
+  <version>1.4.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.http.jetty.starter/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.jetty.starter/META-INF/MANIFEST.MF
index a49a26f..7081fd2 100644
--- a/bundles/org.eclipse.equinox.http.jetty.starter/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.jetty.starter/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@
  org.osgi.framework.startlevel;version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Comment-Header: The purpose of this plugin is to eagerly start the Jetty Service. It's primary use is in testing the Equinox http.servlet against the OSGi Http Whiteboard CT.
+Automatic-Module-Name: org.eclipse.equinox.http.jetty.starter
diff --git a/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF
index d9f5271..20ec86b 100644
--- a/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF
@@ -29,3 +29,4 @@
 Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.equinox.http.jetty
diff --git a/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF
index 655f786..12e04b6 100644
--- a/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.equinox.http.registry;singleton:=true
-Bundle-Version: 1.1.400.qualifier
+Bundle-Version: 1.1.500.qualifier
 Bundle-Activator: org.eclipse.equinox.http.registry.internal.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.equinox.common,
@@ -17,3 +17,4 @@
  J2SE-1.3
 Export-Package: org.eclipse.equinox.http.registry;version="1.0.0"
 Bundle-Vendor: %providerName
+Automatic-Module-Name: org.eclipse.equinox.http.registry
diff --git a/bundles/org.eclipse.equinox.http.registry/pom.xml b/bundles/org.eclipse.equinox.http.registry/pom.xml
index 9053048..1a87f9c 100644
--- a/bundles/org.eclipse.equinox.http.registry/pom.xml
+++ b/bundles/org.eclipse.equinox.http.registry/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.http.registry</artifactId>
-  <version>1.1.400-SNAPSHOT</version>
+  <version>1.1.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.servlet.tests/META-INF/MANIFEST.MF
index f42c404..2205f8b 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/META-INF/MANIFEST.MF
@@ -25,4 +25,5 @@
  org.osgi.service.http.whiteboard;version="1.0.0",
  org.osgi.util.tracker;version="1.5.0"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.equinox.http.servlet.tests
 
diff --git a/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
index 02d9c75..0159977 100644
--- a/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
@@ -40,4 +40,5 @@
  osgi.service;
   objectClass:List<String>="org.osgi.service.http.runtime.HttpServiceRuntime";
   uses:="org.osgi.service.http.runtime"
+Automatic-Module-Name: org.eclipse.equinox.http.servlet
 
diff --git a/bundles/org.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
index 934018f..32068a3 100644
--- a/bundles/org.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %bundleName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.equinox.http.servletbridge;singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.400.qualifier
 Bundle-Activator: org.eclipse.equinox.http.servletbridge.internal.Activator
 Bundle-Localization: plugin
 Import-Package: javax.servlet;version="2.3",
@@ -14,3 +14,4 @@
  org.osgi.service.http;version="1.2.0"
 Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
  J2SE-1.3
+Automatic-Module-Name: org.eclipse.equinox.http.servletbridge
diff --git a/bundles/org.eclipse.equinox.http.servletbridge/pom.xml b/bundles/org.eclipse.equinox.http.servletbridge/pom.xml
index 56d83b8..c31fffa 100644
--- a/bundles/org.eclipse.equinox.http.servletbridge/pom.xml
+++ b/bundles/org.eclipse.equinox.http.servletbridge/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.http.servletbridge</artifactId>
-  <version>1.0.300-SNAPSHOT</version>
+  <version>1.0.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/bundles/org.eclipse.equinox.io/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.io/META-INF/MANIFEST.MF
index 05683b6..3d717d1 100644
--- a/bundles/org.eclipse.equinox.io/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.io/META-INF/MANIFEST.MF
@@ -24,3 +24,4 @@
 Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.0
 Provided-Services: class=org.osgi.service.io.ConnectorService
 Bundle-Localization: plugin
+Automatic-Module-Name: org.eclipse.equinox.io
diff --git a/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF
index c2e8582..af88dbd 100644
--- a/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF
@@ -39,4 +39,5 @@
 Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
  J2SE-1.3
 Bundle-Localization: plugin
+Automatic-Module-Name: org.eclipse.equinox.ip
 
diff --git a/bundles/org.eclipse.equinox.jsp.jasper.registry/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.jsp.jasper.registry/META-INF/MANIFEST.MF
index b37ee50..424ee99 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper.registry/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.jsp.jasper.registry/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@
 Export-Package: org.eclipse.equinox.jsp.jasper.registry;version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.equinox.jsp.jasper.registry
diff --git a/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
index 5fbb4bd..64086eb 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@
 Export-Package: org.eclipse.equinox.jsp.jasper;version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.equinox.jsp.jasper
diff --git a/bundles/org.eclipse.equinox.log.stream/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.log.stream/META-INF/MANIFEST.MF
index 581edcb..896f89d 100644
--- a/bundles/org.eclipse.equinox.log.stream/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.log.stream/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
  org.osgi.util.tracker;version="[1.5.0,2.0.0)"
 Export-Package: org.osgi.service.log.stream;version="1.0.0";uses:="org.osgi.util.pushstream",
  org.osgi.util.pushstream;version="1.0.0";uses:="org.osgi.util.promise"
+Automatic-Module-Name: org.eclipse.equinox.log.stream
diff --git a/bundles/org.eclipse.equinox.metatype/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.metatype/META-INF/MANIFEST.MF
index c25eda2..aabc493 100644
--- a/bundles/org.eclipse.equinox.metatype/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.metatype/META-INF/MANIFEST.MF
@@ -29,3 +29,4 @@
  osgi.service;
   objectClass:List<String>="org.osgi.service.metatype.MetaTypeService";
   uses:="org.osgi.service.metatype"
+Automatic-Module-Name: org.eclipse.equinox.metatype
diff --git a/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
index 01341ee..d0b1f55 100644
--- a/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
@@ -25,3 +25,4 @@
  org.osgi.util.tracker,
  org.osgi.service.prefs;version="[1.1.1,1.2)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.equinox.preferences
diff --git a/bundles/org.eclipse.equinox.region.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.region.tests/META-INF/MANIFEST.MF
index c54782a..35d5554 100644
--- a/bundles/org.eclipse.equinox.region.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.region.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Equinox Region Tests
 Bundle-SymbolicName: org.eclipse.equinox.region.tests
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: junit.framework;version="4.8.1",
  org.aspectj.internal.lang.annotation;version="[1.6.3,2.0.0)";resolution:=optional,
@@ -31,3 +31,4 @@
  .
 Eclipse-BundleShape: dir
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.equinox.region.tests
diff --git a/bundles/org.eclipse.equinox.region.tests/pom.xml b/bundles/org.eclipse.equinox.region.tests/pom.xml
index b740509..174bac9 100644
--- a/bundles/org.eclipse.equinox.region.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.region.tests/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.region.tests</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
index 7662c66..0384331 100644
--- a/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
@@ -2,9 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.equinox.region
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Fragment-Host: system.bundle
 ExtensionBundle-Activator: org.eclipse.equinox.internal.region.RegionManager
 Export-Package: org.eclipse.equinox.region;version="1.2.0"
 Bundle-Vendor: %Bundle-Vendor
+Automatic-Module-Name: org.eclipse.equinox.region
diff --git a/bundles/org.eclipse.equinox.region/pom.xml b/bundles/org.eclipse.equinox.region/pom.xml
index af7e9bd..ddff32fc 100644
--- a/bundles/org.eclipse.equinox.region/pom.xml
+++ b/bundles/org.eclipse.equinox.region/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.region</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF
index bf55ed3..6fb9b90 100644
--- a/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF
@@ -34,3 +34,4 @@
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.equinox.registry
diff --git a/bundles/org.eclipse.equinox.security.linux.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.security.linux.x86_64/META-INF/MANIFEST.MF
index e005238..1d0d3f5 100644
--- a/bundles/org.eclipse.equinox.security.linux.x86_64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.security.linux.x86_64/META-INF/MANIFEST.MF
@@ -9,3 +9,4 @@
 Bundle-Localization: fragment
 Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
 Export-Package: org.eclipse.equinox.internal.security.linux;x-internal:=true
+Automatic-Module-Name: org.eclipse.equinox.security.linux.x86_64
diff --git a/bundles/org.eclipse.equinox.security.macosx/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.security.macosx/META-INF/MANIFEST.MF
index ef63354..5986df3 100644
--- a/bundles/org.eclipse.equinox.security.macosx/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.security.macosx/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@
 Bundle-Localization: fragment
 Export-Package: org.eclipse.equinox.internal.security.osx;x-internal:=true,
  org.eclipse.equinox.internal.security.osx.nls;x-internal:=true
+Automatic-Module-Name: org.eclipse.equinox.security.macosx
diff --git a/bundles/org.eclipse.equinox.security.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.security.tests/META-INF/MANIFEST.MF
index 31bfd7f..672768b 100644
--- a/bundles/org.eclipse.equinox.security.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.security.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Equinox security tests
 Bundle-SymbolicName: org.eclipse.equinox.security.tests;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Bundle-Activator: org.eclipse.equinox.internal.security.tests.SecurityTestsActivator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse.org
@@ -18,3 +18,4 @@
  org.eclipse.equinox.security.tests;version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Eclipse-BundleShape: dir
+Automatic-Module-Name: org.eclipse.equinox.security.tests
diff --git a/bundles/org.eclipse.equinox.security.tests/pom.xml b/bundles/org.eclipse.equinox.security.tests/pom.xml
index 10cbe7a..bd05797 100644
--- a/bundles/org.eclipse.equinox.security.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.security.tests/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.security.tests</artifactId>
-  <version>1.0.200-SNAPSHOT</version>
+  <version>1.0.300-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF
index 3df733c..869146b 100644
--- a/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF
@@ -29,3 +29,4 @@
  org.eclipse.equinox.internal.security.ui.wizard;x-internal:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.equinox.security.ui
diff --git a/bundles/org.eclipse.equinox.security.win32.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.security.win32.x86/META-INF/MANIFEST.MF
index fbf828c..80a494b 100644
--- a/bundles/org.eclipse.equinox.security.win32.x86/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.security.win32.x86/META-INF/MANIFEST.MF
@@ -9,3 +9,4 @@
 Bundle-Localization: fragment
 Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86))
 Export-Package: org.eclipse.equinox.internal.security.win32;x-internal:=true
+Automatic-Module-Name: org.eclipse.equinox.security.win32.x86
diff --git a/bundles/org.eclipse.equinox.security.win32.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.security.win32.x86_64/META-INF/MANIFEST.MF
index 2fc2510..058a4f7 100644
--- a/bundles/org.eclipse.equinox.security.win32.x86_64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.security.win32.x86_64/META-INF/MANIFEST.MF
@@ -9,3 +9,4 @@
 Bundle-Localization: fragment
 Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86_64))
 Export-Package: org.eclipse.equinox.internal.security.win32;x-internal:=true
+Automatic-Module-Name: org.eclipse.equinox.security.win32.x86_64
diff --git a/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF
index f924ca6..c032c0f 100644
--- a/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.equinox.security;singleton:=true
-Bundle-Version: 1.2.300.qualifier
+Bundle-Version: 1.2.400.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.equinox.internal.security.auth.AuthPlugin
@@ -39,3 +39,4 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-ActivationPolicy: lazy
 Eclipse-BuddyPolicy: registered
+Automatic-Module-Name: org.eclipse.equinox.security
diff --git a/bundles/org.eclipse.equinox.security/pom.xml b/bundles/org.eclipse.equinox.security/pom.xml
index 9cc9261..1615581 100644
--- a/bundles/org.eclipse.equinox.security/pom.xml
+++ b/bundles/org.eclipse.equinox.security/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.security</artifactId>
-  <version>1.2.300-SNAPSHOT</version>
+  <version>1.2.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/bundles/org.eclipse.equinox.servletbridge.extensionbundle/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.servletbridge.extensionbundle/META-INF/MANIFEST.MF
index 6dae5f8..20675d8 100644
--- a/bundles/org.eclipse.equinox.servletbridge.extensionbundle/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.servletbridge.extensionbundle/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@
  javax.servlet.http;version="2.6.0";uses:="javax.servlet",
  javax.servlet.resources;version="2.6.0",
  org.eclipse.equinox.servletbridge;version="1.1"
+Automatic-Module-Name: org.eclipse.equinox.servletbridge.extensionbundle
diff --git a/bundles/org.eclipse.equinox.servletbridge.template/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.servletbridge.template/META-INF/MANIFEST.MF
index dc4431b..b48c13e 100644
--- a/bundles/org.eclipse.equinox.servletbridge.template/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.servletbridge.template/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Servletbridge Template
 Bundle-SymbolicName: org.eclipse.equinox.servletbridge.template
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
 
 
diff --git a/bundles/org.eclipse.equinox.servletbridge.template/pom.xml b/bundles/org.eclipse.equinox.servletbridge.template/pom.xml
index 72e970f..0a3e73a 100644
--- a/bundles/org.eclipse.equinox.servletbridge.template/pom.xml
+++ b/bundles/org.eclipse.equinox.servletbridge.template/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.servletbridge.template</artifactId>
-  <version>1.0.100-SNAPSHOT</version>
+  <version>1.0.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
index 72c9cd1..97d6ed4 100644
--- a/bundles/org.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
@@ -3,10 +3,11 @@
 Bundle-Name: %bundleName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.equinox.servletbridge;singleton:=true
-Bundle-Version: 1.3.200.qualifier
+Bundle-Version: 1.3.300.qualifier
 Bundle-Localization: plugin
 Import-Package: javax.servlet;version="2.3.0",
  javax.servlet.http;version="2.3.0"
 Export-Package: org.eclipse.equinox.servletbridge;version="1.1.0"
 Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
  J2SE-1.4
+Automatic-Module-Name: org.eclipse.equinox.servletbridge
diff --git a/bundles/org.eclipse.equinox.servletbridge/pom.xml b/bundles/org.eclipse.equinox.servletbridge/pom.xml
index d795e23..ef68acd 100644
--- a/bundles/org.eclipse.equinox.servletbridge/pom.xml
+++ b/bundles/org.eclipse.equinox.servletbridge/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.servletbridge</artifactId>
-  <version>1.3.200-SNAPSHOT</version>
+  <version>1.3.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.slf4j.stub/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.slf4j.stub/META-INF/MANIFEST.MF
index 7ab9749..c0d8bc5 100755
--- a/bundles/org.eclipse.equinox.slf4j.stub/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.slf4j.stub/META-INF/MANIFEST.MF
@@ -2,6 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: slf4j Stub
 Bundle-SymbolicName: org.eclipse.equinox.slf4j.stub
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Provide-Capability: generic; generic="org.slf4j.impl.StaticLoggerBinder"; version:Version="1.6.1"
+Automatic-Module-Name: org.eclipse.equinox.slf4j.stub
diff --git a/bundles/org.eclipse.equinox.slf4j.stub/pom.xml b/bundles/org.eclipse.equinox.slf4j.stub/pom.xml
index b39c3e0..f3030c9 100644
--- a/bundles/org.eclipse.equinox.slf4j.stub/pom.xml
+++ b/bundles/org.eclipse.equinox.slf4j.stub/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.slf4j.stub</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.transforms.hook/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.transforms.hook/META-INF/MANIFEST.MF
index bcc8303..3dc56f1 100644
--- a/bundles/org.eclipse.equinox.transforms.hook/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.transforms.hook/META-INF/MANIFEST.MF
@@ -8,4 +8,5 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Localization: transformsHook
 Export-Package: org.eclipse.equinox.internal.transforms;x-internal:=true
+Automatic-Module-Name: org.eclipse.equinox.transforms.hook
 
diff --git a/bundles/org.eclipse.equinox.transforms.xslt/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.transforms.xslt/META-INF/MANIFEST.MF
index 2f11d78..9ba6eca 100644
--- a/bundles/org.eclipse.equinox.transforms.xslt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.transforms.xslt/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %bundleName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.equinox.transforms.xslt
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.400.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Import-Package: org.eclipse.osgi.framework.log;version="1.0.0",
  org.osgi.framework;version="1.3.0",
@@ -15,3 +15,4 @@
 Export-Package: org.eclipse.equinox.internal.transforms;x-internal:=true,
  org.eclipse.equinox.internal.transforms.xslt;x-internal:=true
 Bundle-Activator: org.eclipse.equinox.internal.transforms.xslt.Activator
+Automatic-Module-Name: org.eclipse.equinox.transforms.xslt
diff --git a/bundles/org.eclipse.equinox.transforms.xslt/pom.xml b/bundles/org.eclipse.equinox.transforms.xslt/pom.xml
index 697ac07..f639812 100644
--- a/bundles/org.eclipse.equinox.transforms.xslt/pom.xml
+++ b/bundles/org.eclipse.equinox.transforms.xslt/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.transforms.xslt</artifactId>
-  <version>1.0.300-SNAPSHOT</version>
+  <version>1.0.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.useradmin/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.useradmin/META-INF/MANIFEST.MF
index c3246f4..d7a5f23 100644
--- a/bundles/org.eclipse.equinox.useradmin/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.useradmin/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@
 Export-Package: org.eclipse.equinox.internal.useradmin;x-internal:=true
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.1
+Automatic-Module-Name: org.eclipse.equinox.useradmin
diff --git a/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF
index 76d6220..beca65f 100644
--- a/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF
@@ -26,3 +26,4 @@
 Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.1
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
+Automatic-Module-Name: org.eclipse.equinox.util
diff --git a/bundles/org.eclipse.equinox.weaving.caching.j9/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.weaving.caching.j9/META-INF/MANIFEST.MF
index b7643dd..83ed6e4 100644
--- a/bundles/org.eclipse.equinox.weaving.caching.j9/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.weaving.caching.j9/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: J9 CachingService Plug-in
 Bundle-SymbolicName: org.eclipse.equinox.weaving.caching.j9
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-Vendor: Eclipse.org - Equinox
 Bundle-Activator: org.eclipse.equinox.weaving.internal.caching.j9.CachingServicePlugin
 Bundle-ActivationPolicy: lazy
@@ -11,3 +11,4 @@
  org.eclipse.osgi.service.debug;version="1.0.0",
  org.osgi.framework;version="1.4.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Automatic-Module-Name: org.eclipse.equinox.weaving.caching.j9
diff --git a/bundles/org.eclipse.equinox.weaving.caching.j9/pom.xml b/bundles/org.eclipse.equinox.weaving.caching.j9/pom.xml
index 3d9ca7d..4fb88b9 100644
--- a/bundles/org.eclipse.equinox.weaving.caching.j9/pom.xml
+++ b/bundles/org.eclipse.equinox.weaving.caching.j9/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.weaving.caching.j9</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF
index b019e5e..939106b 100644
--- a/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.equinox.weaving.caching
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-Name: Standard Caching Service for Equinox Aspects
 Bundle-Vendor: Eclipse.org - Equinox
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
@@ -12,3 +12,4 @@
  org.eclipse.osgi.service.debug;version="1.0.0",
  org.osgi.framework;version="1.4.0"
 Export-Package: org.eclipse.equinox.weaving.internal.caching;x-friends:="org.aspectj.osgi.service.caching.test"
+Automatic-Module-Name: org.eclipse.equinox.weaving.caching
diff --git a/bundles/org.eclipse.equinox.weaving.caching/pom.xml b/bundles/org.eclipse.equinox.weaving.caching/pom.xml
index e173e09..53d19f6 100644
--- a/bundles/org.eclipse.equinox.weaving.caching/pom.xml
+++ b/bundles/org.eclipse.equinox.weaving.caching/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.weaving.caching</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF
index cf04a3c..65f0edb 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF
@@ -9,3 +9,4 @@
  org.eclipse.equinox.weaving.adaptors;x-friends:="org.eclipse.equinox.weaving.tests",
  org.eclipse.equinox.weaving.hooks;x-friends:="org.eclipse.equinox.weaving.tests"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Automatic-Module-Name: org.eclipse.equinox.weaving.hook
diff --git a/bundles/org.eclipse.equinox.wireadmin/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.wireadmin/META-INF/MANIFEST.MF
index 43ae5f6..5b4bfe9 100644
--- a/bundles/org.eclipse.equinox.wireadmin/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.wireadmin/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@
 Export-Package: org.eclipse.equinox.internal.wireadmin; x-internal:=true
 Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.0
 Bundle-Localization: plugin
+Automatic-Module-Name: org.eclipse.equinox.wireadmin