diff --git a/connectors/tools.descartes.dql.connector.nop/META-INF/MANIFEST.MF b/connectors/tools.descartes.dql.connector.nop/META-INF/MANIFEST.MF
index 6d28aba9203c1d0f0d39e479c391554077640ae7..a27195a3fb8ee5e40921ab35b59b725b8097ac72 100644
--- a/connectors/tools.descartes.dql.connector.nop/META-INF/MANIFEST.MF
+++ b/connectors/tools.descartes.dql.connector.nop/META-INF/MANIFEST.MF
@@ -1,24 +1,25 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: DQL Connector for NOP
-Bundle-SymbolicName: tools.descartes.dql.connector.nop
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: tools.descartes.dql.connector.nop.Activator
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.apache.log4j,
- org.eclipse.emf.common,
- org.eclipse.emf.common.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.util,
- org.osgi.framework,
- tools.descartes.dql.connector,
- tools.descartes.dql.core.engine,
- tools.descartes.dql.core.engine.util,
- tools.descartes.dql.models.mapping.domain,
- tools.descartes.dql.models.mapping.domain.util,
- tools.descartes.dql.models.mapping.mapping
-Require-Bundle: org.eclipse.osgi
-Export-Package: tools.descartes.dql.connector.nop
-Service-Component: META-INF/component.xml
-Bundle-Vendor: Descartes Research Group
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: DQL Connector for NOP
+Bundle-SymbolicName: tools.descartes.dql.connector.nop
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: tools.descartes.dql.connector.nop.Activator
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.apache.log4j,
+ org.eclipse.emf.common,
+ org.eclipse.emf.common.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.util,
+ org.osgi.framework,
+ tools.descartes.dql.connector,
+ tools.descartes.dql.core.engine,
+ tools.descartes.dql.core.engine.util,
+ tools.descartes.dql.models.mapping.domain,
+ tools.descartes.dql.models.mapping.domain.util,
+ tools.descartes.dql.models.mapping.mapping
+Require-Bundle: org.eclipse.osgi
+Export-Package: tools.descartes.dql.connector.nop
+Service-Component: META-INF/component.xml
+Bundle-Vendor: Descartes Research Group
+Automatic-Module-Name: tools.descartes.dql.connector.nop
diff --git a/connectors/tools.descartes.dql.connector.pdr/META-INF/MANIFEST.MF b/connectors/tools.descartes.dql.connector.pdr/META-INF/MANIFEST.MF
index a35bf643c3793655a04ecac396c90fe8a8222697..d2af9e1073f3437ca7518042a5af587093015f61 100644
--- a/connectors/tools.descartes.dql.connector.pdr/META-INF/MANIFEST.MF
+++ b/connectors/tools.descartes.dql.connector.pdr/META-INF/MANIFEST.MF
@@ -1,26 +1,27 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: DQL Connector for PDR
-Bundle-SymbolicName: tools.descartes.dql.connector.pdr
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: tools.descartes.dql.connector.pdr.Activator
-Bundle-Vendor: Descartes Research Group
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.apache.log4j,
- org.eclipse.emf.common.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.resource,
- org.eclipse.emf.ecore.resource.impl,
- org.eclipse.emf.ecore.util,
- org.osgi.framework,
- tools.descartes.dql.connector,
- tools.descartes.dql.core.engine.util,
- tools.descartes.dql.models.mapping.domain,
- tools.descartes.dql.models.mapping.filter,
- tools.descartes.dql.models.mapping.mapping,
- tools.descartes.dql.models.repository
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.osgi,
- org.eclipse.core.runtime,
- org.eclipse.core.resources
-Service-Component: META-INF/component.xml
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: DQL Connector for PDR
+Bundle-SymbolicName: tools.descartes.dql.connector.pdr
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: tools.descartes.dql.connector.pdr.Activator
+Bundle-Vendor: Descartes Research Group
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.apache.log4j,
+ org.eclipse.emf.common.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.resource,
+ org.eclipse.emf.ecore.resource.impl,
+ org.eclipse.emf.ecore.util,
+ org.osgi.framework,
+ tools.descartes.dql.connector,
+ tools.descartes.dql.core.engine.util,
+ tools.descartes.dql.models.mapping.domain,
+ tools.descartes.dql.models.mapping.filter,
+ tools.descartes.dql.models.mapping.mapping,
+ tools.descartes.dql.models.repository
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.osgi,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources
+Service-Component: META-INF/component.xml
+Automatic-Module-Name: tools.descartes.dql.connector.pdr
diff --git a/connectors/tools.descartes.dql.connector.vsp/META-INF/MANIFEST.MF b/connectors/tools.descartes.dql.connector.vsp/META-INF/MANIFEST.MF
index b694880f3614b2f82c725445321d41c199394d91..441e5996926ad365006c7ac739ef31acec30ab46 100644
--- a/connectors/tools.descartes.dql.connector.vsp/META-INF/MANIFEST.MF
+++ b/connectors/tools.descartes.dql.connector.vsp/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@ Import-Package: tools.descartes.dql.connector,
 Bundle-ActivationPolicy: lazy
 Service-Component: META-INF/component.xml
 Require-Bundle: org.eclipse.osgi
+Automatic-Module-Name: tools.descartes.dql.connector.vsp
diff --git a/connectors/tools.descartes.dql.connector/META-INF/MANIFEST.MF b/connectors/tools.descartes.dql.connector/META-INF/MANIFEST.MF
index d1ffbab61ac5f06440a95962fc2f682dab469079..dd4b33e00763292fab5e9ae6a371dcaf83dcb403 100644
--- a/connectors/tools.descartes.dql.connector/META-INF/MANIFEST.MF
+++ b/connectors/tools.descartes.dql.connector/META-INF/MANIFEST.MF
@@ -1,14 +1,15 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: DQL Connector
-Bundle-SymbolicName: tools.descartes.dql.connector
-Bundle-Version: 1.0.0.qualifier
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: tools.descartes.dql.connector
-Require-Bundle: tools.descartes.dql.models.mapping,
- org.eclipse.osgi
-Import-Package: org.eclipse.core.runtime,
- org.osgi.framework
-Bundle-Activator: tools.descartes.dql.connector.Activator
-Bundle-Vendor: Descartes Research Group
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: DQL Connector
+Bundle-SymbolicName: tools.descartes.dql.connector
+Bundle-Version: 1.0.0.qualifier
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: tools.descartes.dql.connector
+Require-Bundle: tools.descartes.dql.models.mapping,
+ org.eclipse.osgi
+Import-Package: org.eclipse.core.runtime,
+ org.osgi.framework
+Bundle-Activator: tools.descartes.dql.connector.Activator
+Bundle-Vendor: Descartes Research Group
+Automatic-Module-Name: tools.descartes.dql.connector
diff --git a/core/tools.descartes.dql.core.engine/META-INF/MANIFEST.MF b/core/tools.descartes.dql.core.engine/META-INF/MANIFEST.MF
index c025c524e403dd99276b635e957b28848db29034..5f665f8c14bec2bee65e976ba323aa93dbda5860 100644
--- a/core/tools.descartes.dql.core.engine/META-INF/MANIFEST.MF
+++ b/core/tools.descartes.dql.core.engine/META-INF/MANIFEST.MF
@@ -28,3 +28,4 @@ Export-Package: tools.descartes.dql.core.engine;uses:="org.osgi.framework,com.go
  tools.descartes.dql.core.engine.query,
  tools.descartes.dql.core.engine.util;uses:="tools.descartes.dql.models.mapping.mapping,org.apache.log4j,tools.descartes.dql.models.mapping.domain"
 Bundle-Vendor: Descartes Research Group
+Automatic-Module-Name: tools.descartes.dql.core.engine
diff --git a/core/tools.descartes.dql.core.platform.eclipse/META-INF/MANIFEST.MF b/core/tools.descartes.dql.core.platform.eclipse/META-INF/MANIFEST.MF
index 7044f8fdf302a2052b43342834dad4c399a6c675..e967b07591a20d42696aa9e97569b1404f32058c 100644
--- a/core/tools.descartes.dql.core.platform.eclipse/META-INF/MANIFEST.MF
+++ b/core/tools.descartes.dql.core.platform.eclipse/META-INF/MANIFEST.MF
@@ -1,38 +1,39 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: DQL Eclipse Plug-In
-Bundle-SymbolicName: tools.descartes.dql.core.platform.eclipse;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.core.runtime.jobs,
- org.eclipse.debug.ui,
- org.eclipse.emf.common,
- org.eclipse.emf.common.util,
- org.eclipse.jface.action,
- org.eclipse.jface.viewers,
- org.eclipse.swt,
- org.eclipse.swt.graphics,
- org.eclipse.swt.widgets,
- org.eclipse.ui,
- org.eclipse.ui.part,
- org.eclipse.xtext.ui.editor,
- org.osgi.framework,
- tools.descartes.pavo,
- tools.descartes.pavo.types,
- tools.descartes.dql.connector,
- tools.descartes.dql.core.engine.query,
- tools.descartes.dql.models.mapping.domain,
- tools.descartes.dql.models.mapping.mapping,
- tools.descartes.dql.models.mapping.mapping.impl
-Export-Package: tools.descartes.dql.core.platform.eclipse.launch
-Require-Bundle: org.eclipse.debug.ui,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- com.google.inject,
- tools.descartes.dql.lang,
- tools.descartes.pavo
-Bundle-Activator: tools.descartes.dql.core.platform.eclipse.Activator
-Bundle-Vendor: Descartes Research Group
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: DQL Eclipse Plug-In
+Bundle-SymbolicName: tools.descartes.dql.core.platform.eclipse;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.core.runtime.jobs,
+ org.eclipse.debug.ui,
+ org.eclipse.emf.common,
+ org.eclipse.emf.common.util,
+ org.eclipse.jface.action,
+ org.eclipse.jface.viewers,
+ org.eclipse.swt,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.widgets,
+ org.eclipse.ui,
+ org.eclipse.ui.part,
+ org.eclipse.xtext.ui.editor,
+ org.osgi.framework,
+ tools.descartes.pavo,
+ tools.descartes.pavo.types,
+ tools.descartes.dql.connector,
+ tools.descartes.dql.core.engine.query,
+ tools.descartes.dql.models.mapping.domain,
+ tools.descartes.dql.models.mapping.mapping,
+ tools.descartes.dql.models.mapping.mapping.impl
+Export-Package: tools.descartes.dql.core.platform.eclipse.launch
+Require-Bundle: org.eclipse.debug.ui,
+ org.eclipse.ui,
+ org.eclipse.ui.editors,
+ com.google.inject,
+ tools.descartes.dql.lang,
+ tools.descartes.pavo
+Bundle-Activator: tools.descartes.dql.core.platform.eclipse.Activator
+Bundle-Vendor: Descartes Research Group
+Automatic-Module-Name: tools.descartes.dql.core.platform.eclipse
diff --git a/core/tools.descartes.dql.core.platform.external/META-INF/MANIFEST.MF b/core/tools.descartes.dql.core.platform.external/META-INF/MANIFEST.MF
index 5b503be7f6bfde0397dce1c86601e34529b2030e..beff58fcc9fdf865179b2eb326d24873e24ba32f 100644
--- a/core/tools.descartes.dql.core.platform.external/META-INF/MANIFEST.MF
+++ b/core/tools.descartes.dql.core.platform.external/META-INF/MANIFEST.MF
@@ -1,26 +1,27 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: DQL External API
-Bundle-SymbolicName: tools.descartes.dql.core.platform.external;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: tools.descartes.dql.platform.external.Activator
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.resource,
- org.eclipse.emf.ecore.util,
- org.osgi.framework,
- tools.descartes.dql.core.engine,
- tools.descartes.dql.core.engine.aggregates,
- tools.descartes.dql.core.engine.interpreter,
- tools.descartes.dql.core.engine.query,
- tools.descartes.dql.core.engine.util,
- tools.descartes.dql.lang,
- tools.descartes.dql.lang.descartesQL,
- tools.descartes.dql.models.mapping.domain,
- tools.descartes.dql.models.mapping.filter,
- tools.descartes.dql.models.mapping.mapping
-Require-Bundle: org.eclipse.ui,
- tools.descartes.dql.core.engine
-Bundle-Vendor: Descartes Research Group
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: DQL External API
+Bundle-SymbolicName: tools.descartes.dql.core.platform.external;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: tools.descartes.dql.platform.external.Activator
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.eclipse.core.resources,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.resource,
+ org.eclipse.emf.ecore.util,
+ org.osgi.framework,
+ tools.descartes.dql.core.engine,
+ tools.descartes.dql.core.engine.aggregates,
+ tools.descartes.dql.core.engine.interpreter,
+ tools.descartes.dql.core.engine.query,
+ tools.descartes.dql.core.engine.util,
+ tools.descartes.dql.lang,
+ tools.descartes.dql.lang.descartesQL,
+ tools.descartes.dql.models.mapping.domain,
+ tools.descartes.dql.models.mapping.filter,
+ tools.descartes.dql.models.mapping.mapping
+Require-Bundle: org.eclipse.ui,
+ tools.descartes.dql.core.engine
+Bundle-Vendor: Descartes Research Group
+Automatic-Module-Name: tools.descartes.dql.core.platform.external
diff --git a/core/tools.descartes.dql.core.registry/META-INF/MANIFEST.MF b/core/tools.descartes.dql.core.registry/META-INF/MANIFEST.MF
index 875906d2312e827bba823837be60879f7de4b8fe..f44ac63e5ae42c043605f77ee201485ed19173bc 100644
--- a/core/tools.descartes.dql.core.registry/META-INF/MANIFEST.MF
+++ b/core/tools.descartes.dql.core.registry/META-INF/MANIFEST.MF
@@ -1,22 +1,23 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: DQL Connector Registry
-Bundle-SymbolicName: tools.descartes.dql.core.registry
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: tools.descartes.dql.core.registry.impl.Activator
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.apache.log4j,
- org.osgi.framework,
- tools.descartes.dql.connector
-Require-Bundle: org.eclipse.osgi,
- org.eclipse.osgi.services,
- org.eclipse.equinox.ds,
- org.eclipse.equinox.console,
- org.eclipse.equinox.event,
- org.eclipse.osgi.util
-Service-Component: META-INF/component.xml
-Export-Package: tools.descartes.dql.core.registry,
- tools.descartes.dql.core.registry.impl
-Bundle-ClassPath: .
-Bundle-Vendor: Descartes Research Group
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: DQL Connector Registry
+Bundle-SymbolicName: tools.descartes.dql.core.registry
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: tools.descartes.dql.core.registry.impl.Activator
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.apache.log4j,
+ org.osgi.framework,
+ tools.descartes.dql.connector
+Require-Bundle: org.eclipse.osgi,
+ org.eclipse.osgi.services,
+ org.eclipse.equinox.ds,
+ org.eclipse.equinox.console,
+ org.eclipse.equinox.event,
+ org.eclipse.osgi.util
+Service-Component: META-INF/component.xml
+Export-Package: tools.descartes.dql.core.registry,
+ tools.descartes.dql.core.registry.impl
+Bundle-ClassPath: .
+Bundle-Vendor: Descartes Research Group
+Automatic-Module-Name: tools.descartes.dql.core.registry
diff --git a/lang/tools.descartes.dql.lang.ui/META-INF/MANIFEST.MF b/lang/tools.descartes.dql.lang.ui/META-INF/MANIFEST.MF
index 46bbcb607d072df700a591196a31b6c81c1e586e..0f2a47f47d3036d8576e0edf598799ce3aca2301 100644
--- a/lang/tools.descartes.dql.lang.ui/META-INF/MANIFEST.MF
+++ b/lang/tools.descartes.dql.lang.ui/META-INF/MANIFEST.MF
@@ -33,3 +33,4 @@ Export-Package: tools.descartes.dql.lang.ui,
  tools.descartes.dql.lang.ui.outline,
  tools.descartes.dql.lang.ui.quickfix
 Bundle-Activator: tools.descartes.dql.lang.ui.internal.DescartesQLActivator
+Automatic-Module-Name: tools.descartes.dql.lang.ui
diff --git a/lang/tools.descartes.dql.lang/META-INF/MANIFEST.MF b/lang/tools.descartes.dql.lang/META-INF/MANIFEST.MF
index a113ac2af684358007f3463b9be11425c4919cd9..bc18843c5a66af5dc7dfbd4dabb2e2953eb6c7d2 100644
--- a/lang/tools.descartes.dql.lang/META-INF/MANIFEST.MF
+++ b/lang/tools.descartes.dql.lang/META-INF/MANIFEST.MF
@@ -35,3 +35,4 @@ Export-Package: tools.descartes.dql.lang.descartesQL,
  tools.descartes.dql.lang.generator,
  tools.descartes.dql.lang.scoping,
  tools.descartes.dql.lang.validation
+Automatic-Module-Name: tools.descartes.dql.lang
diff --git a/models/tools.descartes.dql.models.mapping/META-INF/MANIFEST.MF b/models/tools.descartes.dql.models.mapping/META-INF/MANIFEST.MF
index dc614f4417f8624ebde017e54dd76b21d651b897..023d5048e8a1c22506a8fd56c8d6103c0d90b9d6 100644
--- a/models/tools.descartes.dql.models.mapping/META-INF/MANIFEST.MF
+++ b/models/tools.descartes.dql.models.mapping/META-INF/MANIFEST.MF
@@ -55,3 +55,4 @@ Export-Package: tools.descartes.dql.models.mapping.domain;
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: tools.descartes.dql.models.mapping
diff --git a/models/tools.descartes.dql.models.repository/META-INF/MANIFEST.MF b/models/tools.descartes.dql.models.repository/META-INF/MANIFEST.MF
index 3468bcd8730317659c6c340e31f137fad9471454..a0299b8d2b5a17987d88e328272d9e6d03cd91eb 100644
--- a/models/tools.descartes.dql.models.repository/META-INF/MANIFEST.MF
+++ b/models/tools.descartes.dql.models.repository/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@ Import-Package: tools.descartes.dql.models.mapping.domain,
 Export-Package: tools.descartes.dql.models.repository,
  tools.descartes.dql.models.repository.impl,
  tools.descartes.dql.models.repository.util
+Automatic-Module-Name: tools.descartes.dql.models.repository
diff --git a/tests/tools.descartes.dql.lang.examples.tests/META-INF/MANIFEST.MF b/tests/tools.descartes.dql.lang.examples.tests/META-INF/MANIFEST.MF
index 17449e1691091a494029da9e9f04c43e0327cb52..6257d7dde49359bdf39b48e7382fda1f84246652 100644
--- a/tests/tools.descartes.dql.lang.examples.tests/META-INF/MANIFEST.MF
+++ b/tests/tools.descartes.dql.lang.examples.tests/META-INF/MANIFEST.MF
@@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext.junit4,
  tools.descartes.dql.lang.tests
 Import-Package: org.eclipse.xtext.junit4,
  org.eclipse.xtext.junit4.util
+Automatic-Module-Name: tools.descartes.dql.lang.examples.tests
diff --git a/tests/tools.descartes.dql.lang.tests/META-INF/MANIFEST.MF b/tests/tools.descartes.dql.lang.tests/META-INF/MANIFEST.MF
index 6ebd33c15daf3f9de38f9f5a70fead29166786ed..3e5d7ba58d3e1cc58599e4c4beb338ca4600e2b1 100644
--- a/tests/tools.descartes.dql.lang.tests/META-INF/MANIFEST.MF
+++ b/tests/tools.descartes.dql.lang.tests/META-INF/MANIFEST.MF
@@ -24,3 +24,4 @@ Import-Package: org.apache.log4j,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: tools.descartes.dql.lang.tests,
  tools.descartes.dql.lang
+Automatic-Module-Name: tools.descartes.dql.lang.tests
diff --git a/tools.descartes.dql.whatif.tests/META-INF/MANIFEST.MF b/tools.descartes.dql.whatif.tests/META-INF/MANIFEST.MF
index f71c676f7f1c9fe4cae4dd70b4bab50a65c683c3..e9b6ba72dee2e056e6874cb7c41fd450dced39e0 100644
--- a/tools.descartes.dql.whatif.tests/META-INF/MANIFEST.MF
+++ b/tools.descartes.dql.whatif.tests/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@ Import-Package: org.apache.log4j;version="1.2.15",
  org.dom4j.io,
  org.eclipse.core.resources,
  org.eclipse.core.runtime;version="3.5.0"
+Automatic-Module-Name: tools.descartes.dql.whatif.tests
diff --git a/tools.descartes.pavo.export.csv.comma/META-INF/MANIFEST.MF b/tools.descartes.pavo.export.csv.comma/META-INF/MANIFEST.MF
index 443b33bf548e887f8984b35d2a90d726fadcbc32..ab364729a853051002db1c413c166560a20e18bb 100644
--- a/tools.descartes.pavo.export.csv.comma/META-INF/MANIFEST.MF
+++ b/tools.descartes.pavo.export.csv.comma/META-INF/MANIFEST.MF
@@ -8,3 +8,4 @@ Require-Bundle: tools.descartes.pavo;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.12.0"
 Import-Package: org.jfree.chart,
  tools.descartes.dql.models.mapping.domain
+Automatic-Module-Name: tools.descartes.pavo.extension.csv.comma
diff --git a/tools.descartes.pavo.export.csv.semicolon/META-INF/MANIFEST.MF b/tools.descartes.pavo.export.csv.semicolon/META-INF/MANIFEST.MF
index 5304f13e40575d3865060d8feea0dae47ccbfa76..a4743aaa69e3a03c54bac665009092160bd67418 100644
--- a/tools.descartes.pavo.export.csv.semicolon/META-INF/MANIFEST.MF
+++ b/tools.descartes.pavo.export.csv.semicolon/META-INF/MANIFEST.MF
@@ -8,3 +8,4 @@ Require-Bundle: tools.descartes.pavo;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.12.0"
 Import-Package: org.jfree.chart,
  tools.descartes.dql.models.mapping.domain
+Automatic-Module-Name: tools.descartes.pavo.extension.csv.semicolon
diff --git a/tools.descartes.pavo.export.png/META-INF/MANIFEST.MF b/tools.descartes.pavo.export.png/META-INF/MANIFEST.MF
index a12edd73c80a9541c17c491e0ef3c057692fd407..908e8b2f7589bd4c44da5ee807ada3a8a186eb99 100644
--- a/tools.descartes.pavo.export.png/META-INF/MANIFEST.MF
+++ b/tools.descartes.pavo.export.png/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Require-Bundle: tools.descartes.pavo;bundle-version="1.0.0",
  org.jfreechart.jcommon;bundle-version="1.0.19"
 Import-Package: org.jfree.chart,
  tools.descartes.dql.models.mapping.domain
+Automatic-Module-Name: tools.descartes.pavo.export.png
diff --git a/tools.descartes.pavo.export.svg/META-INF/MANIFEST.MF b/tools.descartes.pavo.export.svg/META-INF/MANIFEST.MF
index e5e62e9b7642e58018fbc2f726cf2df6f12156f1..57baadc4c7c8e4d40c966def4e5958e32b00556a 100644
--- a/tools.descartes.pavo.export.svg/META-INF/MANIFEST.MF
+++ b/tools.descartes.pavo.export.svg/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Require-Bundle: tools.descartes.pavo;bundle-version="1.0.0",
  jfreesvg
 Import-Package: org.jfree.chart,
  tools.descartes.dql.models.mapping.domain
+Automatic-Module-Name: tools.descartes.pavo.extension.svg
diff --git a/tools.descartes.pavo/META-INF/MANIFEST.MF b/tools.descartes.pavo/META-INF/MANIFEST.MF
index 00d31025d1d26bfa2b2af7be18356d1edd855ce6..1877da12c51965548919445f997054580f34f045 100644
--- a/tools.descartes.pavo/META-INF/MANIFEST.MF
+++ b/tools.descartes.pavo/META-INF/MANIFEST.MF
@@ -28,3 +28,4 @@ Export-Package: tools.descartes.pavo,
  tools.descartes.pavo.view
 Bundle-Vendor: Descartes Research Group
 Bundle-Name: tools.descartes.pavo
+Automatic-Module-Name: tools.descartes.pavo