next version will be 2.0.0

Change-Id: I68e0ce73d54ea500a5d0df14d09be96ce1879948
diff --git a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF
index 383f786..d7010fc 100644
--- a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF
+++ b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Derived Generator Launcher
 Bundle-SymbolicName: my.etrice.generator.launch;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: my.etrice.generator;bundle-version="1.1.3",
- org.eclipse.etrice.generator;bundle-version="1.1.3",
- org.eclipse.etrice.generator.launch;bundle-version="1.1.3",
- org.eclipse.etrice.generator.launch.java;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.generator.java;bundle-version="1.1.3",
+Require-Bundle: my.etrice.generator;bundle-version="2.0.0",
+ org.eclipse.etrice.generator;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.launch;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.launch.java;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.java;bundle-version="2.0.0",
  org.eclipse.debug.ui;bundle-version="3.8.1",
  org.eclipse.swt;bundle-version="3.100.1",
  org.eclipse.core.runtime;bundle-version="3.8.0",
diff --git a/examples/my.etrice.generator/META-INF/MANIFEST.MF b/examples/my.etrice.generator/META-INF/MANIFEST.MF
index c672c67..24e0087 100644
--- a/examples/my.etrice.generator/META-INF/MANIFEST.MF
+++ b/examples/my.etrice.generator/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Derived Generator
 Bundle-SymbolicName: my.etrice.generator
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.room;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.generator;bundle-version="1.1.3",
- org.eclipse.etrice.generator.java;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.generator;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.java;bundle-version="2.0.0",
  com.google.inject;bundle-version="3.0.0"
 Export-Package: my.etrice.generator
diff --git a/features/org.eclipse.etrice.cdt-integration.feature/feature.xml b/features/org.eclipse.etrice.cdt-integration.feature/feature.xml
index 3951d8f..6623f96 100644
--- a/features/org.eclipse.etrice.cdt-integration.feature/feature.xml
+++ b/features/org.eclipse.etrice.cdt-integration.feature/feature.xml
@@ -17,7 +17,7 @@
 <feature
       id="org.eclipse.etrice.cdt-integration.feature"
       label="%featureName"
-      version="1.1.3.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.etrice.core.room.ui"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index 36e51da..2461e20 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -17,7 +17,7 @@
 <feature
       id="org.eclipse.etrice.feature"
       label="%featureName"
-      version="1.1.3.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.etrice.core.room.ui"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.etrice.fsm.feature/feature.xml b/features/org.eclipse.etrice.fsm.feature/feature.xml
index aef7be7..134c1d2 100644
--- a/features/org.eclipse.etrice.fsm.feature/feature.xml
+++ b/features/org.eclipse.etrice.fsm.feature/feature.xml
@@ -17,7 +17,7 @@
 <feature
       id="org.eclipse.etrice.fsm.feature"
       label="eTrice.FSM Feature"
-      version="1.1.3.qualifier"
+      version="2.0.0.qualifier"
       provider-name="eTrice"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.v20140414-1359">
diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml
index ab242eb..5bb6054 100644
--- a/features/org.eclipse.etrice.tests.feature/feature.xml
+++ b/features/org.eclipse.etrice.tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.etrice.tests.feature"
       label="%featureName"
-      version="1.1.3.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -23,40 +23,40 @@
    </license>
 
    <requires>
-      <import plugin="org.eclipse.etrice.core.room" version="1.1.3" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.common" version="1.1.3" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.fsm" version="1.1.3" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.room" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.common" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.fsm" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.junit" version="4.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.junit4" version="2.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext" version="2.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.etrice.generator" version="1.1.3" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.generator.fsm" version="1.1.3" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.behavior" version="1.1.3" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.behavior.fsm" version="1.1.3" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.common" version="1.1.3" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.common.base" version="1.1.3" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.generator" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.generator.fsm" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.behavior" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.behavior.fsm" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.common" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.common.base" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.graphiti" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.structure" version="1.1.3" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.etunit.converter" version="1.1.3" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.structure" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.etunit.converter" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.junit" version="4.8.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.genmodel" version="1.1.3" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.genmodel" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.config" version="1.1.3" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.config.ui" version="1.1.3" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.config" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.config.ui" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.logging" version="1.0.4" match="greaterOrEqual"/>
       <import plugin="org.hamcrest.core"/>
-      <import plugin="org.eclipse.etrice.abstractexec.behavior" version="1.1.3" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.abstractexec.behavior" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="greaterOrEqual"/>
       <import plugin="com.google.inject" version="3.0.0" match="greaterOrEqual"/>
       <import plugin="org.junit" version="4.10.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.etmap" version="1.1.3" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.etmap.ui" version="1.1.3" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.etphys" version="1.1.3" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.etmap" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.etmap.ui" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.etphys" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.etrice.core.etphys.ui"/>
       <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
       <import plugin="org.eclipse.core.variables" version="3.0.0" match="compatible"/>
@@ -64,7 +64,7 @@
       <import plugin="org.eclipse.pde.core" version="3.5.0" match="compatible"/>
       <import plugin="org.eclipse.equinox.frameworkadmin" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.xtext.xbase.junit"/>
-      <import plugin="org.eclipse.etrice.ui.base.tests" version="1.1.3" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.base.tests" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.xbase.lib"/>
       <import plugin="org.eclipse.etrice.core.common.ui"/>
       <import plugin="org.eclipse.oomph.util" version="1.7.0" match="compatible"/>
diff --git a/features/pom.xml b/features/pom.xml
index 1975980..a7a149e 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.etrice</groupId>
 		<artifactId>org.eclipse.etrice.parent</artifactId>
-		<version>1.1.3-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../releng/org.eclipse.etrice.parent</relativePath>
 	</parent>
 	<groupId>org.eclipse.etrice</groupId>
diff --git a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF
index 751e56e..74297be 100644
--- a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract Execution for State Machines
 Bundle-SymbolicName: org.eclipse.etrice.abstractexec.behavior;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
  org.eclipse.emf.ecore;bundle-version="2.7.0",
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF
index 2c03ab8..09ef6d5 100644
--- a/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Common eTrice DSL UI classes
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.common.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport,
diff --git a/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF
index ac1e93a..5f68100 100644
--- a/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Common eTrice Grammar Fragment and Utility Classes
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.common; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
diff --git a/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF
index 6cc879e..d70612d 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Config DSL UI
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.config.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.room;bundle-version="1.1.3",
- org.eclipse.etrice.core.config;bundle-version="1.1.3";visibility:=reexport,
+Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room;bundle-version="2.0.0",
+ org.eclipse.etrice.core.config;bundle-version="2.0.0";visibility:=reexport,
  org.eclipse.xtext.ui;bundle-version="2.6.0",
  org.eclipse.ui.editors;bundle-version="3.5.0",
  org.eclipse.ui.ide;bundle-version="3.5.0",
diff --git a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF
index e3c6043..f155f7f 100644
--- a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Config DSL
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.config; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.3",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.room;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0",
+ org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room;bundle-version="2.0.0",
  org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
  org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport,
  org.apache.log4j;bundle-version="1.2.15";visibility:=reexport,
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
index adb3b99..43adbc6 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etmap.ui
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etmap.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.3";visibility:=reexport,
- org.eclipse.etrice.core.etphys;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etmap;bundle-version="2.0.0";visibility:=reexport,
+ org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
  org.eclipse.xtext.ui;bundle-version="2.6.0",
  org.eclipse.ui.editors;bundle-version="3.5.0",
  org.eclipse.ui.ide;bundle-version="3.5.0",
@@ -17,8 +17,8 @@
  org.antlr.runtime,
  org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0",
  org.eclipse.compare,
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.room;bundle-version="1.1.3"
+ org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room;bundle-version="2.0.0"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core.etmap.ui,
diff --git a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF
index eaff038..1a8a001 100644
--- a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etmap
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etmap; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.3",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.room;bundle-version="1.1.3",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.3",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0",
+ org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
+ org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
  org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
  org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport,
  org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
index aca7e60..7d5a4b3 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etphys.ui
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etphys.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.3";visibility:=reexport,
+Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etphys;bundle-version="2.0.0";visibility:=reexport,
  org.eclipse.xtext.ui;bundle-version="2.6.0",
  org.eclipse.ui.editors;bundle-version="3.5.0",
  org.eclipse.ui.ide;bundle-version="3.5.0",
@@ -16,7 +16,7 @@
  org.antlr.runtime,
  org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0",
  org.eclipse.compare,
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.3"
+ org.eclipse.etrice.core.common.ui;bundle-version="2.0.0"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core.etphys.ui.contentassist,
diff --git a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF
index 9342025..9381264 100644
--- a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etphys
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etphys; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.room;bundle-version="2.0.0",
  org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
  org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
  org.antlr.runtime,
@@ -16,7 +16,7 @@
  org.eclipse.xtext.util;bundle-version="2.6.0",
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
- org.eclipse.etrice.core.common;bundle-version="1.1.3",
+ org.eclipse.etrice.core.common;bundle-version="2.0.0",
  org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j,
  org.eclipse.xtext.xbase.lib
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF
index e237066..44bc27f 100644
--- a/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FSM DSL UI
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.fsm.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
  org.eclipse.etrice.core.fsm;visibility:=reexport,
  org.eclipse.xtext.ui;bundle-version="2.6.0",
  org.eclipse.ui.editors;bundle-version="3.5.0",
diff --git a/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF
index 49daa2d..dff4fc3 100644
--- a/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FSM DSL
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.fsm; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0",
  org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
  org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport,
  org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF
index 7e57925..f544ec7 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.fsm;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core.genmodel.fsm,
@@ -10,7 +10,7 @@
  org.eclipse.etrice.core.genmodel.fsm.fsmgen.impl,
  org.eclipse.etrice.core.genmodel.fsm.fsmgen.util
 Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport,
- org.eclipse.etrice.core.fsm;bundle-version="1.1.3";visibility:=reexport,
+ org.eclipse.etrice.core.fsm;bundle-version="2.0.0";visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
diff --git a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF
index dec32cb..da56a9f 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.etrice.core.genmodel;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse eTrice
 Bundle-Localization: plugin
@@ -13,10 +13,10 @@
  org.eclipse.etrice.core.genmodel.etricegen.impl,
  org.eclipse.etrice.core.genmodel.etricegen.util,
  org.eclipse.etrice.core.genmodel.util
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.3";visibility:=reexport,
- org.eclipse.etrice.core.fsm;bundle-version="1.1.3";visibility:=reexport,
- org.eclipse.etrice.core.room;bundle-version="1.1.3";visibility:=reexport,
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.3";visibility:=reexport,
+Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0";visibility:=reexport,
+ org.eclipse.etrice.core.fsm;bundle-version="2.0.0";visibility:=reexport,
+ org.eclipse.etrice.core.room;bundle-version="2.0.0";visibility:=reexport,
+ org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0";visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport
diff --git a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
index ce15bfd..39a59ca 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ROOM DSL UI
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.room.ui;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.room;bundle-version="1.1.3";visibility:=reexport,
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.3",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.3",
- org.eclipse.etrice.doc;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.fsm.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room;bundle-version="2.0.0";visibility:=reexport,
+ org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
+ org.eclipse.etrice.doc;bundle-version="2.0.0",
  org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.5.0",
  org.eclipse.ui.ide;bundle-version="3.5.0",
@@ -24,8 +24,8 @@
  org.eclipse.help,
  com.google.inject,
  org.eclipse.etrice.expressions.ui,
- org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.dctools;bundle-version="1.1.3"
+ org.eclipse.etrice.ui.behavior.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.dctools;bundle-version="2.0.0"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core.ui,
diff --git a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
index 844cca3..d3b25bc 100644
--- a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ROOM DSL
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.room;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.3",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0",
+ org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
  org.eclipse.xtext.util;bundle-version="2.6.0",
@@ -21,7 +21,7 @@
  org.antlr.runtime;bundle-version="3.0.0",
  org.eclipse.core.resources;bundle-version="3.7.100",
  org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.3"
+ org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0"
 Import-Package: org.apache.log4j,
  org.eclipse.etrice.core.room
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.etrice.dctools.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.dctools.fsm/META-INF/MANIFEST.MF
index b06c4db..1507f12 100644
--- a/plugins/org.eclipse.etrice.dctools.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.dctools.fsm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Detail Code Tools for FSM
 Bundle-SymbolicName: org.eclipse.etrice.dctools.fsm
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Automatic-Module-Name: org.eclipse.etrice.dctools.fsm
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse eTrice
diff --git a/plugins/org.eclipse.etrice.dctools/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.dctools/META-INF/MANIFEST.MF
index 9a9f248..1419588 100644
--- a/plugins/org.eclipse.etrice.dctools/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.dctools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Detail Code Tools
 Bundle-SymbolicName: org.eclipse.etrice.dctools
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Automatic-Module-Name: org.eclipse.etrice.dctools
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
index 3b70e76..bcd289f 100644
--- a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Documentation
 Bundle-SymbolicName: org.eclipse.etrice.doc;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF
index ebf3216..f4a5f32 100644
--- a/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: etUnit File Converter
 Bundle-SymbolicName: org.eclipse.etrice.etunit.converter;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse eTrice
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.etrice.expressions.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.expressions.ui/META-INF/MANIFEST.MF
index ab278b5..39990f5 100644
--- a/plugins/org.eclipse.etrice.expressions.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.expressions.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Expressions UI
 Bundle-SymbolicName: org.eclipse.etrice.expressions.ui;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jface.text,
  org.eclipse.xtext.xbase.lib,
diff --git a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
index 1952736..7b1a855 100644
--- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice C Generator
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.c;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.3",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.3",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.generator;bundle-version="1.1.3",
- org.eclipse.etrice.generator.config;bundle-version="1.1.3",
- org.eclipse.etrice.generator.doc;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.generator;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.config;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.doc;bundle-version="2.0.0",
  org.eclipse.xtend.lib;bundle-version="2.6.0",
  org.eclipse.xtext.generator;bundle-version="2.6.0",
  org.eclipse.xtext.util;bundle-version="2.6.0",
- org.eclipse.etrice.generator.gnuplot;bundle-version="1.1.3"
+ org.eclipse.etrice.generator.gnuplot;bundle-version="2.0.0"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.generator.c,
diff --git a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF
index 6893000..df2d77d 100644
--- a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Generator Config
 Bundle-SymbolicName: org.eclipse.etrice.generator.config;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.3",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.room;bundle-version="1.1.3",
- org.eclipse.etrice.core.config;bundle-version="1.1.3",
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.3",
- org.eclipse.etrice.generator;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0",
+ org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room;bundle-version="2.0.0",
+ org.eclipse.etrice.core.config;bundle-version="2.0.0",
+ org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
+ org.eclipse.etrice.generator;bundle-version="2.0.0",
  org.eclipse.xtend.lib;bundle-version="2.6.0",
  com.google.guava;bundle-version="8.0.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.6.0"
diff --git a/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF
index 5af209e..b67aa42 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice C++ Generator
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.cpp;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.3",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.3",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.generator;bundle-version="1.1.3",
- org.eclipse.etrice.generator.config;bundle-version="1.1.3",
- org.eclipse.etrice.generator.doc;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.generator;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.config;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.doc;bundle-version="2.0.0",
  org.eclipse.xtend.lib;bundle-version="2.6.0",
  org.eclipse.xtext.generator;bundle-version="2.6.0",
  org.eclipse.xtext.util;bundle-version="2.6.0",
diff --git a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
index fc4dab0..dbd1d54 100644
--- a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Document Generator
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.doc;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.3",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.generator;bundle-version="1.1.3",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.3",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
+ org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.generator;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.ui;bundle-version="3.7.0",
diff --git a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF
index fbcf11a..c632b87 100644
--- a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Generator for Finite State Machines
 Bundle-SymbolicName: org.eclipse.etrice.generator.fsm
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.generator.fsm.base,
  org.eclipse.etrice.generator.fsm.generic
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0",
  org.eclipse.emf;bundle-version="2.6.0",
  org.apache.commons.io;bundle-version="2.0.1",
  org.eclipse.core.resources,
diff --git a/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF
index 11885cb..e0c5275 100644
--- a/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.generator.fsmtest.ui
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.etrice.generator.fsmtest;visibility:=reexport,
diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF
index 998cc7f..29cf26a 100644
--- a/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.generator.fsmtest
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
diff --git a/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF
index f45cd74..73db4fd 100644
--- a/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Gnuplot generator
 Bundle-SymbolicName: org.eclipse.etrice.generator.gnuplot
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Export-Package: org.eclipse.etrice.generator.gnuplot
 Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.xtend.lib;bundle-version="2.6.0",
- org.eclipse.etrice.generator;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.room;bundle-version="1.1.3",
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.3",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.3",
- org.eclipse.etrice.generator.config;bundle-version="1.1.3",
- org.eclipse.etrice.generator.java;bundle-version="1.1.3",
- org.eclipse.etrice.core.config;bundle-version="1.1.3",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.3",
+ org.eclipse.etrice.generator;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room;bundle-version="2.0.0",
+ org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.config;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.java;bundle-version="2.0.0",
+ org.eclipse.etrice.core.config;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
  org.eclipse.core.runtime;bundle-version="3.10.0",
- org.eclipse.etrice.generator.doc;bundle-version="1.1.3",
- org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.3"
+ org.eclipse.etrice.generator.doc;bundle-version="2.0.0",
+ org.eclipse.etrice.abstractexec.behavior;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.etrice.generator.java.mvn/pom.xml b/plugins/org.eclipse.etrice.generator.java.mvn/pom.xml
index a4bd5b5..447b974 100644
--- a/plugins/org.eclipse.etrice.generator.java.mvn/pom.xml
+++ b/plugins/org.eclipse.etrice.generator.java.mvn/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.eclipse.etrice</groupId>
 		<artifactId>java-generator</artifactId>
-		<version>1.1.3-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
 	</parent>
 
@@ -188,67 +188,67 @@
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.generator.java</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.generator.config</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.generator.doc</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.generator.fsm</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.generator</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.common</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.fsm</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.room</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.etphys</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.etmap</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.config</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.genmodel.fsm</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.genmodel</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- IMPORTANT: runtime-assembler-cli uses another version of com.google.guava 
diff --git a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
index 5d06dde..b943077 100644
--- a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Java Generator
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.java;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.3",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.3",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.generator;bundle-version="1.1.3",
- org.eclipse.etrice.generator.config;bundle-version="1.1.3",
- org.eclipse.etrice.generator.doc;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.generator;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.config;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.doc;bundle-version="2.0.0",
  org.eclipse.xtend.lib;bundle-version="2.6.0",
  org.eclipse.xtext.generator;bundle-version="2.6.0",
  org.eclipse.xtext.util;bundle-version="2.6.0"
diff --git a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
index af15d3d..9ed3dab 100644
--- a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice C Generator Launcher
 Bundle-SymbolicName: org.eclipse.etrice.generator.launch.c;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.generator.launch.c.Activator
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.generator.c;bundle-version="1.1.3",
- org.eclipse.etrice.generator.launch;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.generator;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.c;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.launch;bundle-version="2.0.0",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.core,
@@ -15,7 +15,7 @@
  org.eclipse.jdt.ui;bundle-version="3.7.0",
  org.eclipse.jdt.core;bundle-version="3.7.0",
  org.eclipse.core.variables;bundle-version="3.2.500",
- org.eclipse.etrice.generator.ui;bundle-version="1.1.3"
+ org.eclipse.etrice.generator.ui;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.jdt.launching,
diff --git a/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF
index 278d3c7..8b589de 100644
--- a/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Cpp Generator Launcher
 Bundle-SymbolicName: org.eclipse.etrice.generator.launch.cpp;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.generator.launch.cpp.Activator
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.generator.cpp;bundle-version="1.1.3",
- org.eclipse.etrice.generator.launch;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.generator;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.cpp;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.launch;bundle-version="2.0.0",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.core,
@@ -15,7 +15,7 @@
  org.eclipse.jdt.ui;bundle-version="3.7.0",
  org.eclipse.jdt.core;bundle-version="3.7.0",
  org.eclipse.core.variables;bundle-version="3.2.500",
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.3"
+ org.eclipse.etrice.core.genmodel;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.jdt.launching,
diff --git a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
index 550e841..186e5f3 100644
--- a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Java Generator Launcher
 Bundle-SymbolicName: org.eclipse.etrice.generator.launch.java;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.generator.launch.java.Activator
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.generator.java;bundle-version="1.1.3",
- org.eclipse.etrice.generator.launch;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.generator;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.java;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.launch;bundle-version="2.0.0",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.core,
@@ -15,7 +15,7 @@
  org.eclipse.jdt.ui;bundle-version="3.7.0",
  org.eclipse.jdt.core;bundle-version="3.7.0",
  org.eclipse.core.variables;bundle-version="3.2.500",
- org.eclipse.etrice.generator.ui;bundle-version="1.1.3"
+ org.eclipse.etrice.generator.ui;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.jdt.launching,
diff --git a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF
index 2dedd59..621f70e 100644
--- a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Generator Launch Base Classes
 Bundle-SymbolicName: org.eclipse.etrice.generator.launch;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.generator.launch.Activator
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.generator.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.3",
- org.eclipse.etrice.core.common;bundle-version="1.1.3",
- org.eclipse.etrice.core.room.ui;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.generator;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
+ org.eclipse.etrice.core.common;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
  org.eclipse.ui,
  org.eclipse.ui.console,
  org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
diff --git a/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF
index e64d19d..0e5a383 100644
--- a/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CDT integration of eTrice
 Bundle-SymbolicName: org.eclipse.etrice.generator.ui.cdt;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.etrice.generator.ui;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.generator.ui;bundle-version="2.0.0",
  org.eclipse.cdt.core;bundle-version="5.5.0",
  org.eclipse.cdt.managedbuilder.core;bundle-version="8.2.0",
  org.eclipse.equinox.common;bundle-version="3.6.200",
diff --git a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF
index 3c90430..eb9569a 100644
--- a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF
@@ -2,30 +2,30 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Generator UI
 Bundle-SymbolicName: org.eclipse.etrice.generator.ui;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.3",
- org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.3",
- org.eclipse.etrice.core.etphys.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.ui.common;bundle-version="1.1.3",
- org.eclipse.etrice.ui.runtime;bundle-version="1.1.3",
- org.eclipse.etrice.core.common;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etmap.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etphys.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.common;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.runtime;bundle-version="2.0.0",
+ org.eclipse.etrice.core.common;bundle-version="2.0.0",
  org.eclipse.core.runtime,
  org.eclipse.ui,
  org.apache.log4j;bundle-version="1.2.15",
  org.eclipse.core.resources;bundle-version="3.8.100",
  org.eclipse.emf.ecore;bundle-version="2.9.0",
- org.eclipse.etrice.core.room.ui;bundle-version="1.1.3",
+ org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
  org.eclipse.jdt.core;bundle-version="3.9.0",
  org.eclipse.jdt.launching;bundle-version="3.7.0",
  org.eclipse.ui.ide;bundle-version="3.9.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.6.0",
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.etrice.generator;bundle-version="1.1.3"
+ org.eclipse.etrice.generator;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.etrice.generator.ui.Activator
 Export-Package: org.eclipse.etrice.generator.ui.configurator,
diff --git a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
index 26142c5..f217ae8 100644
--- a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Generator Model
 Bundle-SymbolicName: org.eclipse.etrice.generator;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.generator.base,
  org.eclipse.etrice.generator.generic
-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.3",
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.3",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.3",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.room;bundle-version="2.0.0",
+ org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.emf.ecore;bundle-version="2.6.0";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",
diff --git a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
index 0b9ff24..f85df07 100644
--- a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Logging Fragment
 Bundle-SymbolicName: org.eclipse.etrice.logging
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Fragment-Host: org.apache.log4j;bundle-version="1.2.15"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF
index 2f698d4..f83015b 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ROOM Action Code Editor
 Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.actioneditor;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.behavior.actioneditor.Activator
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.room;bundle-version="1.1.3",
- org.eclipse.etrice.ui.behavior;bundle-version="1.1.3",
- org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.behavior;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.behavior.fsm;bundle-version="2.0.0",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.common,
@@ -21,7 +21,7 @@
  org.eclipse.xtext.xbase.lib,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.etrice.core.room.ui,
- org.eclipse.etrice.expressions.ui;bundle-version="1.1.3"
+ org.eclipse.etrice.expressions.ui;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.etrice.ui.behavior.actioneditor,
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF
index af6a4bf..8c5c567 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract FSM Diagram Editor
 Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.fsm;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.behavior.fsm.Activator
 Bundle-Vendor: eTrice
-Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.3",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.3",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
+ org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.fsm.ui;bundle-version="2.0.0",
  org.eclipse.graphiti;bundle-version="0.8.0",
  org.eclipse.graphiti.ui;bundle-version="0.8.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
@@ -19,7 +19,7 @@
  org.eclipse.xtext.ui;bundle-version="2.7.0",
  org.eclipse.xtend.lib;bundle-version="2.7.0",
  org.eclipse.xtext.ui.shared;bundle-version="2.7.0",
- org.eclipse.etrice.expressions.ui;bundle-version="1.1.3",
+ org.eclipse.etrice.expressions.ui;bundle-version="2.0.0",
  org.eclipse.xtext.ui.shared;bundle-version="2.7.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
index a21837d..8bf5158 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Actor Behavior Diagram Editor
 Bundle-SymbolicName: org.eclipse.etrice.ui.behavior;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.behavior.Activator
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.3",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.3",
- org.eclipse.etrice.ui.common;bundle-version="1.1.3",
- org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.common;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.behavior.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.fsm.ui;bundle-version="2.0.0",
  org.eclipse.graphiti;bundle-version="0.8.0",
  org.eclipse.graphiti.ui;bundle-version="0.8.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
@@ -19,10 +19,10 @@
  org.eclipse.emf.transaction;bundle-version="1.4.0",
  org.eclipse.xtext.ui;bundle-version="2.6.0",
  org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
- org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.3",
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.3",
- org.eclipse.etrice.expressions.ui;bundle-version="1.1.3",
- org.eclipse.etrice.generator;bundle-version="1.1.3"
+ org.eclipse.etrice.abstractexec.behavior;bundle-version="2.0.0",
+ org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
+ org.eclipse.etrice.expressions.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.generator;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse eTrice
diff --git a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF
index 2e26131..e9fceb0 100644
--- a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Commands
 Bundle-SymbolicName: org.eclipse.etrice.ui.commands; singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.commands.Activator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.room.ui;bundle-version="1.1.3",
- org.eclipse.etrice.ui.common;bundle-version="1.1.3",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.3",
- org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.common;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.behavior.fsm;bundle-version="2.0.0",
  org.eclipse.graphiti;bundle-version="0.8.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
  org.eclipse.xtext.ui;bundle-version="2.6.0",
diff --git a/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
index d571d03..fec558a 100644
--- a/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Base for UI
 Bundle-SymbolicName: org.eclipse.etrice.ui.common.base;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.common.base.UIBaseActivator
 Bundle-Vendor: eTrice
-Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.3",
- org.eclipse.etrice.doc;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.fsm.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.doc;bundle-version="2.0.0",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.transaction;bundle-version="1.4.0",
diff --git a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF
index fe0384a..f678dcc 100644
--- a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: UI Common
 Bundle-SymbolicName: org.eclipse.etrice.ui.common;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.room;bundle-version="1.1.3",
- org.eclipse.etrice.core.room.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.3",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
  org.eclipse.emf.transaction;bundle-version="1.4.0",
  org.eclipse.graphiti;bundle-version="0.8.0",
  org.eclipse.ui.ide;bundle-version="3.6.0",
diff --git a/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF
index d8928ab..a8476a5 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: New Wizards for Runtime
 Bundle-SymbolicName: org.eclipse.etrice.ui.runtime;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.etrice.ui.runtime/pom.xml b/plugins/org.eclipse.etrice.ui.runtime/pom.xml
index 27b3ef1..327f785 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/pom.xml
+++ b/plugins/org.eclipse.etrice.ui.runtime/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.etrice</groupId>
 		<artifactId>org.eclipse.etrice.parent</artifactId>
-		<version>1.1.3-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.etrice.parent</relativePath>
 	</parent>
 	<groupId>org.eclipse.etrice</groupId>
diff --git a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF
index be40c72..c5f562e 100644
--- a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Actor Structure Diagram Editor
 Bundle-SymbolicName: org.eclipse.etrice.ui.structure;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.structure.Activator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.room.ui;bundle-version="1.1.3",
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.3",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.3",
- org.eclipse.etrice.ui.common;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.common;bundle-version="2.0.0",
  org.eclipse.graphiti;bundle-version="0.8.0",
  org.eclipse.graphiti.ui;bundle-version="0.8.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
diff --git a/plugins/pom.xml b/plugins/pom.xml
index e25064e..d9d6159 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.etrice</groupId>
 		<artifactId>org.eclipse.etrice.parent</artifactId>
-		<version>1.1.3-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../releng/org.eclipse.etrice.parent</relativePath>
 	</parent>
 	<groupId>org.eclipse.etrice</groupId>
diff --git a/pom.xml b/pom.xml
index 164abf7..43bf008 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	
 	<groupId>org.eclipse.etrice</groupId>
 	<artifactId>org.eclipse.etrice</artifactId>
-	<version>1.1.3-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml
index 8ef673b..a956159 100644
--- a/releng/org.eclipse.etrice.parent/pom.xml
+++ b/releng/org.eclipse.etrice.parent/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.etrice</groupId>
 	<artifactId>org.eclipse.etrice.parent</artifactId>
-	<version>1.1.3-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<properties>
diff --git a/releng/org.eclipse.etrice.site/category.xml b/releng/org.eclipse.etrice.site/category.xml
index 045c534..7958f4e 100644
--- a/releng/org.eclipse.etrice.site/category.xml
+++ b/releng/org.eclipse.etrice.site/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="org.eclipse.etrice.feature" version="1.1.3.qualifier">
+   <feature id="org.eclipse.etrice.feature" version="2.0.0.qualifier">
       <category name="org.eclipse.etrice"/>
    </feature>
-   <feature id="org.eclipse.etrice.cdt-integration.feature" version="1.1.3.qualifier">
+   <feature id="org.eclipse.etrice.cdt-integration.feature" version="2.0.0.qualifier">
       <category name="org.eclipse.etrice"/>
    </feature>
    <category-def name="org.eclipse.etrice" label="eTrice">
diff --git a/releng/org.eclipse.etrice.site/pom.xml b/releng/org.eclipse.etrice.site/pom.xml
index eea317f..2de71c8 100644
--- a/releng/org.eclipse.etrice.site/pom.xml
+++ b/releng/org.eclipse.etrice.site/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.etrice</groupId>
 		<artifactId>org.eclipse.etrice.parent</artifactId>
-		<version>1.1.3-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.etrice.parent</relativePath>
 	</parent>
 	
diff --git a/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF
index a74e7e5..8b772fd 100644
--- a/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Java ModelLib
 Bundle-SymbolicName: org.eclipse.etrice.modellib.java
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF
index eeedc3a..54c38e5 100644
--- a/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Java Runtime Aspects
 Bundle-SymbolicName: org.eclipse.etrice.runtime.java.aspects
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Export-Package: org.eclipse.etrice.runtime.java.aspects
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF
index 0480d80..64aa804 100644
--- a/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Java Runtime
 Bundle-SymbolicName: org.eclipse.etrice.runtime.java
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Export-Package: org.eclipse.etrice.runtime.java.config,
  org.eclipse.etrice.runtime.java.debugging,
  org.eclipse.etrice.runtime.java.etunit,
diff --git a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF
index 6636e50..41a3584 100644
--- a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract Execution for Behavior Tests
 Bundle-SymbolicName: org.eclipse.etrice.abstractexec.behavior.tests
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.abstractexec.behavior.tests.Activator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.abstractexec.behavior;bundle-version="2.0.0",
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;bundle-version="2.7.0",
  com.google.inject;bundle-version="3.0.0",
diff --git a/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF
index 235b5d3..6c21fd1 100644
--- a/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for common eTrice grammar fragments and classes
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.common.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.etrice.core.common,
diff --git a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
index 1348098..2071d39 100644
--- a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Config DSL Tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.config.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.config;bundle-version="1.1.3",
- org.eclipse.etrice.core.config.ui;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.config;bundle-version="2.0.0",
+ org.eclipse.etrice.core.config.ui;bundle-version="2.0.0",
  org.eclipse.core.runtime,
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.xtext.junit4;bundle-version="2.6.0",
diff --git a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
index 9bee0f1..50c8a75 100644
--- a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etmap.tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etmap.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.3",
- org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
+ org.eclipse.etrice.core.etmap.ui;bundle-version="2.0.0",
  org.eclipse.core.runtime,
  org.eclipse.xtext.junit4;bundle-version="2.6.0",
  org.eclipse.ui.workbench;resolution:=optional,
diff --git a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF
index 3166c03..ad0ea5d 100644
--- a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etphys.tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etphys.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.etphys;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
  org.eclipse.etrice.core.etphys.ui,
  org.eclipse.core.runtime,
  org.eclipse.xtext.junit4;bundle-version="2.6.0",
diff --git a/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF
index e804a5c..40bae65 100644
--- a/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FSM DSL Tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.fsm.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.etrice.core.common,
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF
index 6d9ad50..4f4c59f 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.tests
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.3",
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.room;bundle-version="2.0.0",
+ org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
  org.junit;bundle-version="4.8.1",
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.core.runtime;bundle-version="3.7.0"
diff --git a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
index 8989e4b..1aa9aa9 100644
--- a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Room Core Tests
 Bundle-SymbolicName: org.eclipse.etrice.core.room.tests
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.3",
- org.eclipse.etrice.core.common;bundle-version="1.1.3",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.room;bundle-version="2.0.0",
+ org.eclipse.etrice.core.common;bundle-version="2.0.0",
+ org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
  org.junit;bundle-version="4.8.1",
  org.eclipse.xtext.junit4,
  org.eclipse.xtext.xbase.junit,
diff --git a/tests/org.eclipse.etrice.dctools.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.dctools.tests/META-INF/MANIFEST.MF
index 204ab55..8e0996a 100644
--- a/tests/org.eclipse.etrice.dctools.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.dctools.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Expressions UI Tests
 Bundle-SymbolicName: org.eclipse.etrice.dctools.tests;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Automatic-Module-Name: org.eclipse.etrice.expressions.ui.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse eTrice
diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF
index d5d3fb7..90506c0 100644
--- a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: etUnit Converter Tests
 Bundle-SymbolicName: org.eclipse.etrice.etunit.converter.tests
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.etunit.converter.tests.Activator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.etunit.converter;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.etunit.converter;bundle-version="2.0.0",
  org.eclipse.core.runtime,
  org.junit;bundle-version="4.8.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF
index a53b516..af4c807 100644
--- a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.generator.fsmtest.tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.generator.fsmtest;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsmtest.ui;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.generator.fsmtest;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsmtest.ui;bundle-version="2.0.0",
  org.eclipse.core.runtime,
  org.eclipse.xtext.junit4;bundle-version="2.6.0",
  org.eclipse.ui.workbench;resolution:=optional
diff --git a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
index 982278b..be6f444 100644
--- a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Generator Model Tests
 Bundle-SymbolicName: org.eclipse.etrice.generator.tests
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.3",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.room;bundle-version="1.1.3",
- org.eclipse.etrice.generator;bundle-version="1.1.3",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0",
+ org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room;bundle-version="2.0.0",
+ org.eclipse.etrice.generator;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
  org.junit;bundle-version="4.8.1",
  org.eclipse.osgi;bundle-version="3.6.0",
  org.eclipse.xtext;bundle-version="2.6.0",
diff --git a/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF
index f6ef6ee..8476b89 100644
--- a/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Diagram Test Base Classes
 Bundle-SymbolicName: org.eclipse.etrice.ui.base.tests
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Require-Bundle: org.junit;bundle-version="4.8.1",
  org.eclipse.core.runtime,
- org.eclipse.etrice.core.room;bundle-version="1.1.3",
- org.eclipse.etrice.ui.structure;bundle-version="1.1.3",
+ org.eclipse.etrice.core.room;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.structure;bundle-version="2.0.0",
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.graphiti;bundle-version="0.8.0",
  org.eclipse.etrice.ui.common.base,
diff --git a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
index c33ebf4..5fbd441 100644
--- a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Behavior Diagram Tests
 Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.tests
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.behavior.BehaviorTestActivator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.room;bundle-version="1.1.3",
- org.eclipse.etrice.ui.behavior;bundle-version="1.1.3",
- org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.ui.common;bundle-version="1.1.3",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.3",
- org.eclipse.etrice.ui.base.tests;bundle-version="1.1.3",
- org.eclipse.etrice.generator.launch;bundle-version="1.1.3",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.behavior;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.behavior.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.common;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.base.tests;bundle-version="2.0.0",
+ org.eclipse.etrice.generator.launch;bundle-version="2.0.0",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit;bundle-version="4.8.1",
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.graphiti;bundle-version="0.8.0",
- org.eclipse.etrice.core.room.tests;bundle-version="1.1.3",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.3"
+ org.eclipse.etrice.core.room.tests;bundle-version="2.0.0",
+ org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0"
 Import-Package: org.eclipse.xtext.xbase.lib
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
index b947584..fc10f1a 100644
--- a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Structure Diagram Tests
 Bundle-SymbolicName: org.eclipse.etrice.ui.structure.tests
-Bundle-Version: 1.1.3.qualifier
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.3",
- org.eclipse.etrice.core.room;bundle-version="1.1.3",
- org.eclipse.etrice.ui.structure;bundle-version="1.1.3",
- org.eclipse.etrice.ui.common;bundle-version="1.1.3",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.3",
- org.eclipse.etrice.ui.base.tests;bundle-version="1.1.3",
+Bundle-Version: 2.0.0.qualifier
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
+ org.eclipse.etrice.core.room;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.structure;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.common;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
+ org.eclipse.etrice.ui.base.tests;bundle-version="2.0.0",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit;bundle-version="4.8.1",
diff --git a/tests/pom.xml b/tests/pom.xml
index 312159d..48b67a2 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.etrice</groupId>
 		<artifactId>org.eclipse.etrice.parent</artifactId>
-		<version>1.1.3-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../releng/org.eclipse.etrice.parent</relativePath>
 	</parent>
 	<groupId>org.eclipse.etrice</groupId>