diff --git a/org.framed.iorm.editpolicymodel.tests/plugin.properties b/org.framed.iorm.editpolicymodel.tests/plugin.properties
index ab1f467ce837121207d33a8aecbd07da91c1cbe9..baf45be9c8e20c8bc68e6ab651d956349dd21ee9 100644
--- a/org.framed.iorm.editpolicymodel.tests/plugin.properties
+++ b/org.framed.iorm.editpolicymodel.tests/plugin.properties
@@ -1,4 +1,4 @@
 #
 
-pluginName = editpolicymodel Tests
-providerName = www.example.org
+pluginName = Generic Editpolicy Model Tests
+providerName = TU Dresden
diff --git a/org.framed.iorm.editpolicymodel/META-INF/MANIFEST.MF b/org.framed.iorm.editpolicymodel/META-INF/MANIFEST.MF
index bbe2e66817f951b0c84321f22f5c2a10962714f3..76b289fab62244e08697281a1b8c9cf9ff0b2f76 100644
--- a/org.framed.iorm.editpolicymodel/META-INF/MANIFEST.MF
+++ b/org.framed.iorm.editpolicymodel/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.framed.iorm.editpolicymodel;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.codegen.ecore,
- org.framed.iorm.model;bundle-version="1.0.0";visibility:=reexport,
+ org.framed.iorm.model;bundle-version="2.2.0";visibility:=reexport,
  org.framed.iorm.featuremodel;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.framed.iorm.editpolicymodel/plugin.properties b/org.framed.iorm.editpolicymodel/plugin.properties
index 8980796226b95d31cc1e58231ebaba593532763a..72ea0125f3d6706bafc870557a9def6747d9032e 100644
--- a/org.framed.iorm.editpolicymodel/plugin.properties
+++ b/org.framed.iorm.editpolicymodel/plugin.properties
@@ -1,4 +1,4 @@
 #
 
-pluginName = Editpolicymodel Model
-providerName = framed
+pluginName = General Editpolicy Model
+providerName = TU Dresden
diff --git a/org.framed.iorm.featuremodel/build.properties b/org.framed.iorm.featuremodel/build.properties
index 41eb6ade2b4f20b43023591aff3c2d34c4d95883..076250ce977b2c8e5708119d734ac28671fe5e86 100644
--- a/org.framed.iorm.featuremodel/build.properties
+++ b/org.framed.iorm.featuremodel/build.properties
@@ -1,4 +1,7 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               model.xml
+src.includes = model.xml,\
+               META-INF/
diff --git a/org.framed.iorm.model.edit/META-INF/MANIFEST.MF b/org.framed.iorm.model.edit/META-INF/MANIFEST.MF
index 010c6ac2f0a962bf0ba4d8542c6782a4f88b70cf..01ac633303afc7daada00aef4caaf118f5f840ec 100644
--- a/org.framed.iorm.model.edit/META-INF/MANIFEST.MF
+++ b/org.framed.iorm.model.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.framed.iorm.model.edit;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.framed.iorm.model.provider.ORMEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.framed.iorm.model.edit/plugin.properties b/org.framed.iorm.model.edit/plugin.properties
index 5c0cf60365942adc254fcc0334b8d872b2394687..9f334749046c7ea02714aa8fb4cbefdf2cb28e45 100644
--- a/org.framed.iorm.model.edit/plugin.properties
+++ b/org.framed.iorm.model.edit/plugin.properties
@@ -1,7 +1,7 @@
 #
 
-pluginName = ORM Edit Support
-providerName = www.example.org
+pluginName = Object Relation Model Edit Support
+providerName = TU Dresden
 
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/org.framed.iorm.model/META-INF/MANIFEST.MF b/org.framed.iorm.model/META-INF/MANIFEST.MF
index bd3313a6857818500b3c4d3eefe5a8ab349fd06f..2c8298013864301d8e95dec533f168eb6b168fae 100644
--- a/org.framed.iorm.model/META-INF/MANIFEST.MF
+++ b/org.framed.iorm.model/META-INF/MANIFEST.MF
@@ -2,12 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.framed.iorm.model;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Automatic-Module-Name: org.framed.iorm.model
+Bundle-Version: 2.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.framed.iorm.featuremodel;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
+Export-Package: org.framed.iorm.featuremodel;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util",
  org.framed.iorm.featuremodel.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
diff --git a/org.framed.iorm.model/plugin.properties b/org.framed.iorm.model/plugin.properties
index 05eda19000fb0004c02034c183ef3ef234b8ff01..5ca250e7f543bbcca70974af3ef448c0d72e8448 100644
--- a/org.framed.iorm.model/plugin.properties
+++ b/org.framed.iorm.model/plugin.properties
@@ -1,4 +1,4 @@
 #
 
-pluginName = ORM Model
-providerName = www.example.org
+pluginName = Object Relation Model
+providerName = TU Dresden
diff --git a/org.framed.iorm.model/src/org/framed/iorm/featuremodel/impl/FeaturemodelPackageImpl.java b/org.framed.iorm.model/src/org/framed/iorm/featuremodel/impl/FeaturemodelPackageImpl.java
index a282c526c81d8c18f433d849d6fc52cade48c35d..0d970d59b337b997fe1df3a041de79389072577a 100644
--- a/org.framed.iorm.model/src/org/framed/iorm/featuremodel/impl/FeaturemodelPackageImpl.java
+++ b/org.framed.iorm.model/src/org/framed/iorm/featuremodel/impl/FeaturemodelPackageImpl.java
@@ -76,7 +76,7 @@ public class FeaturemodelPackageImpl extends EPackageImpl implements Featuremode
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>This method is used to initialize {@link FeaturemodelPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
@@ -91,17 +91,17 @@ public class FeaturemodelPackageImpl extends EPackageImpl implements Featuremode
 			return (FeaturemodelPackage) EPackage.Registry.INSTANCE.getEPackage(FeaturemodelPackage.eNS_URI);
 
 		// Obtain or create and register package
-		FeaturemodelPackageImpl theFeaturemodelPackage = (FeaturemodelPackageImpl) (EPackage.Registry.INSTANCE
-				.get(eNS_URI) instanceof FeaturemodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-						: new FeaturemodelPackageImpl());
+		Object registeredFeaturemodelPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		FeaturemodelPackageImpl theFeaturemodelPackage = registeredFeaturemodelPackage instanceof FeaturemodelPackageImpl
+				? (FeaturemodelPackageImpl) registeredFeaturemodelPackage
+				: new FeaturemodelPackageImpl();
 
 		isInited = true;
 
 		// Obtain or create and register interdependencies
-		OrmPackageImpl theOrmPackage = (OrmPackageImpl) (EPackage.Registry.INSTANCE
-				.getEPackage(OrmPackage.eNS_URI) instanceof OrmPackageImpl
-						? EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI)
-						: OrmPackage.eINSTANCE);
+		Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
+		OrmPackageImpl theOrmPackage = (OrmPackageImpl) (registeredPackage instanceof OrmPackageImpl ? registeredPackage
+				: OrmPackage.eINSTANCE);
 
 		// Create package meta-data objects
 		theFeaturemodelPackage.createPackageContents();
diff --git a/org.framed.iorm.model/src/org/framed/iorm/model/impl/OrmPackageImpl.java b/org.framed.iorm.model/src/org/framed/iorm/model/impl/OrmPackageImpl.java
index fad75ed28167b301eecc145ef3b04cba51cd3ddf..f171d188e7c3ad0b4a91d42e1d62a0a25415a253 100644
--- a/org.framed.iorm.model/src/org/framed/iorm/model/impl/OrmPackageImpl.java
+++ b/org.framed.iorm.model/src/org/framed/iorm/model/impl/OrmPackageImpl.java
@@ -108,7 +108,7 @@ public class OrmPackageImpl extends EPackageImpl implements OrmPackage {
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>This method is used to initialize {@link OrmPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
@@ -123,17 +123,18 @@ public class OrmPackageImpl extends EPackageImpl implements OrmPackage {
 			return (OrmPackage) EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
 
 		// Obtain or create and register package
-		OrmPackageImpl theOrmPackage = (OrmPackageImpl) (EPackage.Registry.INSTANCE
-				.get(eNS_URI) instanceof OrmPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-						: new OrmPackageImpl());
+		Object registeredOrmPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		OrmPackageImpl theOrmPackage = registeredOrmPackage instanceof OrmPackageImpl
+				? (OrmPackageImpl) registeredOrmPackage
+				: new OrmPackageImpl();
 
 		isInited = true;
 
 		// Obtain or create and register interdependencies
-		FeaturemodelPackageImpl theFeaturemodelPackage = (FeaturemodelPackageImpl) (EPackage.Registry.INSTANCE
-				.getEPackage(FeaturemodelPackage.eNS_URI) instanceof FeaturemodelPackageImpl
-						? EPackage.Registry.INSTANCE.getEPackage(FeaturemodelPackage.eNS_URI)
-						: FeaturemodelPackage.eINSTANCE);
+		Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(FeaturemodelPackage.eNS_URI);
+		FeaturemodelPackageImpl theFeaturemodelPackage = (FeaturemodelPackageImpl) (registeredPackage instanceof FeaturemodelPackageImpl
+				? registeredPackage
+				: FeaturemodelPackage.eINSTANCE);
 
 		// Create package meta-data objects
 		theOrmPackage.createPackageContents();
diff --git a/org.framed.iorm.transformation.test/META-INF/MANIFEST.MF b/org.framed.iorm.transformation.test/META-INF/MANIFEST.MF
index 3bcd422d9c42f98eb83102809ffbd902b5447e21..ebb44d50bb581af7f44d44ef0921ec7e45ed0b69 100644
--- a/org.framed.iorm.transformation.test/META-INF/MANIFEST.MF
+++ b/org.framed.iorm.transformation.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.framed.iorm.transformation.test;singleton:=true
-Bundle-Version: 2.0.3
+Bundle-Version: 2.2.3
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,8 +10,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.framed.iorm.transformation;bundle-version="1.0.0",
  org.junit,
- org.rosi.crom.metamodel;visibility:=reexport,
- org.framed.iorm.model;bundle-version="1.0.0";visibility:=reexport,
+ org.rosi.crom.metamodel;bundle-version="1.0.0";visibility:=reexport,
+ org.framed.iorm.model;bundle-version="2.2.0";visibility:=reexport,
  org.eclipse.emf.ecore.xmi,
  org.eclipse.compare;bundle-version="3.5.501",
  org.eclipse.emf.compare;bundle-version="3.1.0",
diff --git a/org.framed.iorm.transformation.test/plugin.properties b/org.framed.iorm.transformation.test/plugin.properties
index 7fec06f496a196f1b7b95424ea703e72fc6fe633..31025ef0142d23fae1174769ef5ffbfb75712562 100644
--- a/org.framed.iorm.transformation.test/plugin.properties
+++ b/org.framed.iorm.transformation.test/plugin.properties
@@ -1,4 +1,4 @@
 #
 
-pluginName = Testmodel Model
-providerName = www.example.org
+pluginName = Transformation Family Test
+providerName = TU Dresden
diff --git a/org.framed.iorm.transformation/META-INF/MANIFEST.MF b/org.framed.iorm.transformation/META-INF/MANIFEST.MF
index 8f2113c72ba8e285227be145c962110dfc4c3419..d34c0a2cc64e95414cc42e003d2abfe23f2a9c04 100644
--- a/org.framed.iorm.transformation/META-INF/MANIFEST.MF
+++ b/org.framed.iorm.transformation/META-INF/MANIFEST.MF
@@ -1,16 +1,17 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Transformation
+Bundle-Name: Transformation Family
 Bundle-SymbolicName: org.framed.iorm.transformation;singleton:=true
-Bundle-Version: 2.0.3
+Bundle-Version: 2.2.0
 Bundle-Activator: org.framed.iorm.transformation.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.epsilon.eol.engine,
  org.eclipse.epsilon.emc.emf,
- org.eclipse.epsilon.eol.dt;bundle-version="1.2.0",
+ org.eclipse.epsilon.eol.dt,
  org.eclipse.epsilon.etl.engine,
- org.rosi.crom.metamodel;bundle-version="0.1.0"
+ org.rosi.crom.metamodel;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.framed.iorm.transformation
+Bundle-Vendor: TU Dresden
diff --git a/org.framed.iorm.ui/META-INF/MANIFEST.MF b/org.framed.iorm.ui/META-INF/MANIFEST.MF
index 0ab8a1ed7e51b6f2fab09113b24277eead3514f0..e916b03708a3da31913836cf9284a4ba9bf65538 100644
--- a/org.framed.iorm.ui/META-INF/MANIFEST.MF
+++ b/org.framed.iorm.ui/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Ui
+Bundle-Name: FRaMED SPL
 Bundle-SymbolicName: org.framed.iorm.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.framed.iorm.featuremodel;bundle-version="1.0.0",
- org.framed.iorm.model.edit;visibility:=reexport,
+ org.framed.iorm.model.edit;bundle-version="1.0.0";visibility:=reexport,
  de.ovgu.featureide.fm.core;bundle-version="3.3.1",
  de.ovgu.featureide.fm.ui;bundle-version="3.3.2",
  org.eclipse.graphiti;bundle-version="0.13.2",
@@ -27,9 +27,10 @@ Require-Bundle: org.framed.iorm.featuremodel;bundle-version="1.0.0",
  org.eclipse.core.resources;bundle-version="3.11.1";visibility:=reexport,
  org.eclipse.ui.workbench,
  org.eclipse.emf.ecore,
- org.framed.iorm.editpolicymodel;bundle-version="0.1.0",
+ org.framed.iorm.editpolicymodel;bundle-version="1.0.0",
  org.eclipse.osgi
 Import-Package: org.eclipse.graphiti.features;version="0.13.2",
  org.framed.iorm.transformation
 Bundle-ClassPath: src/,
  .
+Bundle-Vendor: TU Dresden