diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.ecore b/org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.ecore
index a5cecbd..755eb8c 100644
--- a/org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.ecore
+++ b/org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.ecore
@@ -4,6 +4,6 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="customizationcatalog"
     nsURI="http://www.eclipse.org/emf/facet/custom/0.2.internal/customizationcatalog"
     nsPrefix="customizationcatalog">
-  <eClassifiers xsi:type="ecore:EClass" name="CustomizationCatalog" eSuperTypes="platform:/plugin/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.ecore#//Catalog"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomizationPropertiesCatalog" eSuperTypes="platform:/plugin/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.ecore#//Catalog"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CustomizationCatalog" eSuperTypes="platform:/plugin/org.eclipse.emf.facet.util.emf.catalog/model/catalog.ecore#//Catalog"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CustomizationPropertiesCatalog" eSuperTypes="platform:/plugin/org.eclipse.emf.facet.util.emf.catalog/model/catalog.ecore#//Catalog"/>
 </ecore:EPackage>
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.genmodel b/org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.genmodel
index 1990c42..d89a479 100644
--- a/org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.genmodel
+++ b/org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.genmodel
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2011 Mia-Software and others.&#xD;&#xA; &#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA; Contributors:&#xD;&#xA; &#x9;Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model&#xD;&#xA;  &#x9;Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning&#xD;&#xA; "
-    modelDirectory="/org.eclipse.modisco.facet.custom.metamodel/src" modelPluginID="org.eclipse.modisco.facet.custom.metamodel"
+    modelDirectory="/org.eclipse.emf.facet.custom.metamodel/src" modelPluginID="org.eclipse.emf.facet.custom.metamodel"
     modelName="Catalog" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.genmodel#//catalog">
+    copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.emf.facet.util.emf.catalog/model/catalog.genmodel#//catalog">
   <foreignModel>catalog.ecore</foreignModel>
-  <genPackages prefix="Customizationcatalog" basePackage="org.eclipse.modisco.facet.custom.metamodel.v0_2_0"
+  <genPackages prefix="Customizationcatalog" basePackage="org.eclipse.emf.facet.custom.metamodel.v0_2_0"
       disposableProviderFactory="true" ecorePackage="catalog.ecore#/">
     <genClasses ecoreClass="catalog.ecore#//CustomizationCatalog"/>
     <genClasses ecoreClass="catalog.ecore#//CustomizationPropertiesCatalog"/>
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.ecore b/org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.ecore
index 5799c2f..5ad2233 100644
--- a/org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.ecore
+++ b/org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.ecore
@@ -15,19 +15,19 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EClassCustomization" eSuperTypes="../../org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.ecore#//Facet">
+  <eClassifiers xsi:type="ecore:EClass" name="EClassCustomization" eSuperTypes="../../org.eclipse.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore#//Facet">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="An EClassCustomization contains the customization for an EClass. There must not exist two EClassCustomizations customizing the same EClass in the same customization."/>
     </eAnnotations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FacetCustomization" eSuperTypes="../../org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.ecore#//Facet">
+  <eClassifiers xsi:type="ecore:EClass" name="FacetCustomization" eSuperTypes="../../org.eclipse.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore#//Facet">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A FacetCustomization contains the customization for a Facet. There must not exist two FacetCustomizations customizing the same facet in the same customization."/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="customizedFacet" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.ecore#//Facet"/>
+        eType="ecore:EClass ../../org.eclipse.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore#//Facet"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ETypedElementSwitchQuery" eSuperTypes="../../org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.ecore#//extensible/Query">
+  <eClassifiers xsi:type="ecore:EClass" name="ETypedElementSwitchQuery" eSuperTypes="../../org.eclipse.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore#//extensible/Query">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="This query can return a value depending of an instance of ETypedElement. This query is dedicated to the definition of customizations."/>
     </eAnnotations>
@@ -39,7 +39,7 @@
       <details key="documentation" value="Case part of the ETypedElementSwitchQuery."/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="case" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass ../../org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.ecore#//extensible/Query"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass ../../org.eclipse.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore#//extensible/Query"
         containment="true"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.genmodel b/org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.genmodel
index a387df9..b34d0f8 100644
--- a/org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.genmodel
+++ b/org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.genmodel
@@ -2,11 +2,11 @@
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2011 Mia-Software and others.&#xD;&#xA; &#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA; Contributors:&#xD;&#xA; &#x9;Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model&#xD;&#xA;      Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework&#xD;&#xA;      Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning "
-    modelDirectory="/org.eclipse.modisco.facet.custom.metamodel/src" modelPluginID="org.eclipse.modisco.facet.custom.metamodel"
+    modelDirectory="/org.eclipse.emf.facet.custom.metamodel/src" modelPluginID="org.eclipse.emf.facet.custom.metamodel"
     modelName="Custom" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.genmodel#//efacet">
+    copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel#//efacet">
   <foreignModel>custom-0.2.0.ecore</foreignModel>
-  <genPackages prefix="Custom" basePackage="org.eclipse.modisco.facet.custom.metamodel.v0_2_0"
+  <genPackages prefix="Custom" basePackage="org.eclipse.emf.facet.custom.metamodel.v0_2_0"
       disposableProviderFactory="true" ecorePackage="custom-0.2.0.ecore#/">
     <genClasses ecoreClass="custom-0.2.0.ecore#//Customization">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute custom-0.2.0.ecore#//Customization/mustBeLoadedByDefault"/>
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.ecore b/org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.ecore
index 1472c7a..4def309 100644
--- a/org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.ecore
+++ b/org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.ecore
@@ -4,8 +4,8 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="custompt"
     nsURI="http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom_primitive_types"
     nsPrefix="custompt">
-  <eClassifiers xsi:type="ecore:EDataType" name="Image" instanceClassName="org.eclipse.modisco.facet.custom.metamodel.custompt.IImage"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Color" instanceClassName="org.eclipse.modisco.facet.custom.metamodel.custompt.IColor"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="Image" instanceClassName="org.eclipse.emf.facet.custom.metamodel.custompt.IImage"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="Color" instanceClassName="org.eclipse.emf.facet.custom.metamodel.custompt.IColor"/>
   <eClassifiers xsi:type="ecore:EEnum" name="Shadow">
     <eLiterals name="NONE" literal="NONE"/>
     <eLiterals name="IN" value="1" literal="IN"/>
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.genmodel b/org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.genmodel
index 913e105..e0d2854 100644
--- a/org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.genmodel
+++ b/org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.genmodel
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
     copyrightText=" Copyright (c) 2012 Mia-Software and others.&#xD;&#xA; &#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA; Contributors:&#xD;&#xA; &#x9;Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model&#xD;&#xA; &#x9;Vincent Lorenzo (CEA-LIST)   - Bug 372644 - Create Customizable tooltips for the TreeViewer using a CustomizableLabelProvider&#xD;&#xA; "
-    modelDirectory="/org.eclipse.modisco.facet.custom.metamodel/src" modelPluginID="org.eclipse.modisco.facet.custom.metamodel"
+    modelDirectory="/org.eclipse.emf.facet.custom.metamodel/src" modelPluginID="org.eclipse.emf.facet.custom.metamodel"
     modelName="Custom_primitive_types-0.2" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6">
   <foreignModel>custom_primitive_types-0.2.0.ecore</foreignModel>
-  <genPackages prefix="Custompt" basePackage="org.eclipse.modisco.facet.custom.metamodel.v0_2_0"
+  <genPackages prefix="Custompt" basePackage="org.eclipse.emf.facet.custom.metamodel.v0_2_0"
       disposableProviderFactory="true" ecorePackage="custom_primitive_types-0.2.0.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="custom_primitive_types-0.2.0.ecore#//Shadow">
       <genEnumLiterals ecoreEnumLiteral="custom_primitive_types-0.2.0.ecore#//Shadow/NONE"/>
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/query-0.3.0.genmodel b/org.eclipse.modisco.facet.custom.metamodel/model/query-0.3.0.genmodel
index d0d582a..1482030 100644
--- a/org.eclipse.modisco.facet.custom.metamodel/model/query-0.3.0.genmodel
+++ b/org.eclipse.modisco.facet.custom.metamodel/model/query-0.3.0.genmodel
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2013 Soft-Maint.&#xD;&#xA; &#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA; Contributors:&#xD;&#xA;&#x9;&#x9;David Couvrand (Soft-Maint) - Bug 402725 - Need a query to get an image from an URI&#xD;&#xA; &#x9;Nicolas Rault (Soft-Maint) - Bug 402725 - Need a query to get an image from an URI"
-    modelDirectory="/org.eclipse.modisco.facet.custom.metamodel/src" modelPluginID="org.eclipse.modisco.facet.custom.metamodel"
+    modelDirectory="/org.eclipse.emf.facet.custom.metamodel/src" modelPluginID="org.eclipse.emf.facet.custom.metamodel"
     modelName="Query-0.3" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.genmodel#//efacet">
+    copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel#//efacet">
   <foreignModel>query-0.3.0.ecore</foreignModel>
-  <genPackages prefix="Query" basePackage="org.eclipse.modisco.facet.custom.metamodel.v0_3_0"
+  <genPackages prefix="Query" basePackage="org.eclipse.emf.facet.custom.metamodel.v0_3_0"
       disposableProviderFactory="true" ecorePackage="query-0.3.0.ecore#/">
     <genClasses ecoreClass="query-0.3.0.ecore#//URIImageQuery">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute query-0.3.0.ecore#//URIImageQuery/uri"/>
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/treeproxy-0.2.0.genmodel b/org.eclipse.modisco.facet.custom.metamodel/model/treeproxy-0.2.0.genmodel
index e9632a4..dedc985 100644
--- a/org.eclipse.modisco.facet.custom.metamodel/model/treeproxy-0.2.0.genmodel
+++ b/org.eclipse.modisco.facet.custom.metamodel/model/treeproxy-0.2.0.genmodel
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2012,2014 Mia-Software and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider&#xD;&#xA;   Gregoire Dupe (Mia-Software) - Bug 386387 - [CustomizedTreeContentProvider] The TreeElements are not preserved between two calls to getElements() &#xD;&#xA;   Thomas Cicognani (Soft-Maint) - Bug 441321 - isVisible customisation doesn't work after refreshing a tree&#xD;&#xA;   Gregoire Dupe (Mia-Software) - Bug 441570 - Children custom property"
-    modelDirectory="/org.eclipse.modisco.facet.custom.metamodel/src" modelPluginID="org.eclipse.modisco.facet.custom.metamodel"
+    modelDirectory="/org.eclipse.emf.facet.custom.metamodel/src" modelPluginID="org.eclipse.emf.facet.custom.metamodel"
     modelName="Treeproxy-0.2" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
     copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <foreignModel>treeproxy-0.2.0.ecore</foreignModel>
-  <genPackages prefix="Internal" basePackage="org.eclipse.modisco.facet.custom.metamodel.v0_2_0"
+  <genPackages prefix="Internal" basePackage="org.eclipse.emf.facet.custom.metamodel.v0_2_0"
       disposableProviderFactory="true" ecorePackage="treeproxy-0.2.0.ecore#/">
-    <nestedGenPackages prefix="Treeproxy" basePackage="org.eclipse.modisco.facet.custom.metamodel.v0_2_0.internal"
+    <nestedGenPackages prefix="Treeproxy" basePackage="org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal"
         disposableProviderFactory="true" ecorePackage="treeproxy-0.2.0.ecore#//treeproxy">
       <genClasses image="false" ecoreClass="treeproxy-0.2.0.ecore#//treeproxy/TreeElement">
         <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference treeproxy-0.2.0.ecore#//treeproxy/TreeElement/parent"/>
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.genmodel b/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.genmodel
index 41ed5dd..9b3367b 100644
--- a/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.genmodel
+++ b/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.genmodel
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2015 Mia-Software, and Soft-Maint.&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Gregoire Dupe (Mia-Software) - Design&#xD;&#xA;   Nicolas Guyomar (Mia-Software) - Implementation&#xD;&#xA;   Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values. &#xD;&#xA;   Nicolas Bros (Mia-Software) - Bug 361823 - [Restructuring] eFacet2 meta-model&#xD;&#xA;   Gregoire Dupe (Mia-Software) - Bug 366055 - NavigationQuery&#xD;&#xA;   Gregoire Dupe (Mia-Software) - Bug 369673 - [Facet] IsOneOfQuery&#xD;&#xA;   Olivier Remaud (Soft-Maint) - Bug 369824 - Add a simple way to return string literal constants from a customization query&#xD;&#xA;   Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework&#xD;&#xA;   Gregoire Dupe (Mia-software) - Bug 364325 - [Restructuring] The user must be able to navigate into a model using the Facet.&#xD;&#xA;   Nicolas Bros (Mia-Software) - Bug 372626 - [Facet] Aggregates&#xD;&#xA;   Nicolas Bros (Mia-Software) - Bug 376941 - [EFacet] Facet operation arguments in Facet model&#xD;&#xA;   Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet&#xD;&#xA;   Jonathan Pepin (Soft-Maint) - Bug 463898 - Create FacetReference not derived, without query and with opposite mechanism&#xD;&#xA;   Jonathan Pepin (Soft-Maint) - Bug 464519 - Declare file extension .efs (EMF Facet Serialization) for facet serialization file"
-    modelDirectory="/org.eclipse.modisco.facet.efacet.metamodel/src" modelPluginID="org.eclipse.modisco.facet.efacet.metamodel"
+    modelDirectory="/org.eclipse.emf.facet.efacet.metamodel/src" modelPluginID="org.eclipse.emf.facet.efacet.metamodel"
     modelName="Efacet2" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" language=""
     usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <foreignModel>efacet-0.2.0.ecore</foreignModel>
-  <genPackages prefix="EFacet" basePackage="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0"
+  <genPackages prefix="EFacet" basePackage="org.eclipse.emf.facet.efacet.metamodel.v0_2_0"
       disposableProviderFactory="true" ecorePackage="efacet-0.2.0.ecore#/">
     <genDataTypes ecoreDataType="efacet-0.2.0.ecore#//Resource"/>
     <genClasses ecoreClass="efacet-0.2.0.ecore#//FacetAttribute"/>
@@ -40,7 +40,7 @@
     <genClasses ecoreClass="efacet-0.2.0.ecore#//DocumentedElement">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute efacet-0.2.0.ecore#//DocumentedElement/documentation"/>
     </genClasses>
-    <nestedGenPackages prefix="Serialization" basePackage="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet"
+    <nestedGenPackages prefix="Serialization" basePackage="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet"
         disposableProviderFactory="true" fileExtensions="efs" ecorePackage="efacet-0.2.0.ecore#//serialization">
       <genClasses ecoreClass="efacet-0.2.0.ecore#//serialization/AbstractReferenceInstance">
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
@@ -77,14 +77,14 @@
             ecoreFeature="ecore:EReference efacet-0.2.0.ecore#//serialization/AbstractAttributeInstance/eAttribute"/>
       </genClasses>
     </nestedGenPackages>
-    <nestedGenPackages prefix="Extensible" basePackage="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet"
+    <nestedGenPackages prefix="Extensible" basePackage="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet"
         disposableProviderFactory="true" ecorePackage="efacet-0.2.0.ecore#//extensible">
       <genClasses image="false" ecoreClass="efacet-0.2.0.ecore#//extensible/Query">
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute efacet-0.2.0.ecore#//extensible/Query/canHaveSideEffects"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute efacet-0.2.0.ecore#//extensible/Query/canBeCached"/>
       </genClasses>
     </nestedGenPackages>
-    <nestedGenPackages prefix="Query" basePackage="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet"
+    <nestedGenPackages prefix="Query" basePackage="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet"
         disposableProviderFactory="true" ecorePackage="efacet-0.2.0.ecore#//query">
       <genClasses ecoreClass="efacet-0.2.0.ecore#//query/NavigationQuery">
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
@@ -117,7 +117,7 @@
         <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference efacet-0.2.0.ecore#//query/OperationCallQuery/arguments"/>
       </genClasses>
     </nestedGenPackages>
-    <nestedGenPackages prefix="Runtime" basePackage="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet"
+    <nestedGenPackages prefix="Runtime" basePackage="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet"
         disposableProviderFactory="true" ecorePackage="efacet-0.2.0.ecore#//runtime">
       <genDataTypes ecoreDataType="efacet-0.2.0.ecore#//runtime/JavaException"/>
       <genClasses ecoreClass="efacet-0.2.0.ecore#//runtime/ETypedElementPrimitiveTypeResult">
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore b/org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore
index e05576a..34f0b8b 100644
--- a/org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore
+++ b/org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore
@@ -3,7 +3,7 @@
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="efacetcatalog"
     nsURI="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacetcatalog" nsPrefix="efacetcatalog">
-  <eClassifiers xsi:type="ecore:EClass" name="FacetSetCatalog" eSuperTypes="platform:/plugin/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.ecore#//Catalog">
+  <eClassifiers xsi:type="ecore:EClass" name="FacetSetCatalog" eSuperTypes="platform:/plugin/org.eclipse.emf.facet.util.emf.catalog/model/catalog.ecore#//Catalog">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A FacetSetCatalog aims at referencing EMF Facet FacetSet."/>
     </eAnnotations>
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel b/org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel
index 30e3a01..c2ab341 100644
--- a/org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel
+++ b/org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel
@@ -2,12 +2,12 @@
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2011,2012 Mia-Software and others.&#xD;&#xA; &#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA; &#xD;&#xA; Contributors:&#xD;&#xA;    Gregoire Dupe (Mia-Software) - Design&#xD;&#xA;    Nicolas Guyomar (Mia-Software) - Implementation&#xD;&#xA;    Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non-derived facet structural features and save their values.&#xD;&#xA;    Nicolas Bros (Mia-Software) - Bug 370110 - Rename efacetcatalog2.ecore&#xD;&#xA;    Grégoire Dupé (Mia-Software) - Bug 361817 - [Restructuring] Dynamic load to the facet catalog&#xD;&#xA;    Grégoire Dupé (Mia-Software) - Bug 373078 - API Cleaning"
-    modelDirectory="/org.eclipse.modisco.facet.efacet.metamodel/src" modelPluginID="org.eclipse.modisco.facet.efacet.metamodel"
+    modelDirectory="/org.eclipse.emf.facet.efacet.metamodel/src" modelPluginID="org.eclipse.emf.facet.efacet.metamodel"
     modelName="Efacetcatalog" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" language=""
-    usedGenPackages="platform:/plugin/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.genmodel#//catalog platform:/plugin/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.genmodel#//efacet">
+    usedGenPackages="platform:/plugin/org.eclipse.emf.facet.util.emf.catalog/model/catalog.genmodel#//catalog platform:/plugin/org.eclipse.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel#//efacet">
   <foreignModel>efacetcatalog-0.2.0.ecore</foreignModel>
-  <genPackages prefix="Efacetcatalog" basePackage="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0"
+  <genPackages prefix="Efacetcatalog" basePackage="org.eclipse.emf.facet.efacet.metamodel.v0_2_0"
       disposableProviderFactory="true" ecorePackage="efacetcatalog-0.2.0.ecore#/">
     <genClasses ecoreClass="efacetcatalog-0.2.0.ecore#//FacetSetCatalog">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference efacetcatalog-0.2.0.ecore#//FacetSetCatalog/installedFacetSets"/>
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.ecore b/org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.ecore
index 1bd98b0..1f2e52e 100644
--- a/org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.ecore
+++ b/org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.ecore
@@ -3,7 +3,7 @@
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="javaquery"
     nsURI="http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery" nsPrefix="javaQuery">
-  <eClassifiers xsi:type="ecore:EClass" name="JavaQuery" eSuperTypes="platform:/plugin/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.ecore#//extensible/Query">
+  <eClassifiers xsi:type="ecore:EClass" name="JavaQuery" eSuperTypes="platform:/plugin/org.eclipse.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore#//extensible/Query">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="implementationClassName"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.genmodel b/org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.genmodel
index 1f1d0a7..301d5f8 100644
--- a/org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.genmodel
+++ b/org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.genmodel
@@ -2,11 +2,11 @@
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2011 Mia-Software and others.&#xD;&#xA; &#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA; Contributors:&#xD;&#xA; &#x9;Nicolas Guyomar (Mia-Software) - Bug 334615 - Java Query for EMF Facet&#xD;&#xA; &#x9;Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values. &#xD;&#xA; "
-    modelDirectory="/org.eclipse.modisco.facet.query.java.metamodel/src" modelPluginID="org.eclipse.modisco.facet.query.java.metamodel"
+    modelDirectory="/org.eclipse.emf.facet.query.java.metamodel/src" modelPluginID="org.eclipse.emf.facet.query.java.metamodel"
     modelName="javaQuery" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.genmodel#//efacet">
+    complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel#//efacet">
   <foreignModel>javaQuery-0.2.0.ecore</foreignModel>
-  <genPackages prefix="JavaQuery" basePackage="org.eclipse.modisco.facet.query.java.metamodel.v0_2_0"
+  <genPackages prefix="JavaQuery" basePackage="org.eclipse.emf.facet.query.java.metamodel.v0_2_0"
       disposableProviderFactory="true" childCreationExtenders="true" ecorePackage="javaQuery-0.2.0.ecore#/">
     <genClasses ecoreClass="javaQuery-0.2.0.ecore#//JavaQuery">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute javaQuery-0.2.0.ecore#//JavaQuery/implementationClassName"/>
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/model/catalog-1.1.genmodel b/org.eclipse.modisco.facet.util.emf.catalog.metamodel/model/catalog-1.1.genmodel
index cfd17cc..3c25acc 100644
--- a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/model/catalog-1.1.genmodel
+++ b/org.eclipse.modisco.facet.util.emf.catalog.metamodel/model/catalog-1.1.genmodel
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2015 Mia-Software and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Grégoire Dupé (Mia-Software) - Bug 477657 - The catalog manager should be able to manage workspace model"
-    modelDirectory="/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src" modelPluginID="org.eclipse.modisco.facet.util.emf.catalog.metamodel"
+    modelDirectory="/org.eclipse.emf.facet.util.emf.catalog.metamodel/src" modelPluginID="org.eclipse.emf.facet.util.emf.catalog.metamodel"
     modelName="Catalog-1.1" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
     runtimeVersion="2.6" operationReflection="true" importOrganizing="true">
   <foreignModel>catalog-1.1.ecore</foreignModel>
-  <genPackages prefix="Catalog" basePackage="org.eclipse.modisco.facet.util.emf.catalog.metamodel.internal.v1_1"
+  <genPackages prefix="Catalog" basePackage="org.eclipse.emf.facet.util.emf.catalog.metamodel.internal.v1_1"
       disposableProviderFactory="true" ecorePackage="catalog-1.1.ecore#/">
     <genClasses ecoreClass="catalog-1.1.ecore#//InstallAndWokspaceCatalog">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference catalog-1.1.ecore#//InstallAndWokspaceCatalog/installedEntries"/>
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.genmodel b/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.genmodel
index b186c65..4adf4c7 100644
--- a/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.genmodel
+++ b/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.genmodel
@@ -2,15 +2,15 @@
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2011 Mia-Software and others.&#xD;&#xA; &#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA; &#xD;&#xA; Contributors:&#xD;&#xA;&#x9;Gregoire Dupe (Mia-Software) - Design&#xD;&#xA;&#x9;Nicolas Guyomar (Mia-Software) - Implementation&#xD;&#xA; "
-    modelDirectory="/org.eclipse.modisco.facet.util.emf.catalog/src" modelPluginID="org.eclipse.modisco.facet.util.emf.catalog"
-    modelName="Catalog" editPluginClass="org.eclipse.modisco.facet.util.emf.catalog.provider.CatalogEditPlugin"
-    editorPluginClass="org.eclipse.modisco.facet.util.emf.catalog.presentation.CatalogEditorPlugin"
-    nonNLSMarkers="true" testsDirectory="/org.eclipse.modisco.facet.util.emf.catalog.tests/src"
-    testSuiteClass="org.eclipse.modisco.facet.util.emf.catalog.tests.CatalogAllTests"
+    modelDirectory="/org.eclipse.emf.facet.util.emf.catalog/src" modelPluginID="org.eclipse.emf.facet.util.emf.catalog"
+    modelName="Catalog" editPluginClass="org.eclipse.emf.facet.util.emf.catalog.provider.CatalogEditPlugin"
+    editorPluginClass="org.eclipse.emf.facet.util.emf.catalog.presentation.CatalogEditorPlugin"
+    nonNLSMarkers="true" testsDirectory="/org.eclipse.emf.facet.util.emf.catalog.tests/src"
+    testSuiteClass="org.eclipse.emf.facet.util.emf.catalog.tests.CatalogAllTests"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    testsPluginID="org.eclipse.modisco.facet.util.emf.catalog.tests">
+    testsPluginID="org.eclipse.emf.facet.util.emf.catalog.tests">
   <foreignModel>catalog.ecore</foreignModel>
-  <genPackages prefix="Catalog" basePackage="org.eclipse.modisco.facet.util.emf" disposableProviderFactory="true"
+  <genPackages prefix="Catalog" basePackage="org.eclipse.emf.facet.util.emf" disposableProviderFactory="true"
       ecorePackage="catalog.ecore#/">
     <genClasses ecoreClass="catalog.ecore#//CatalogSet">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference catalog.ecore#//CatalogSet/catalogs"/>
diff --git a/org.eclipse.modisco.facet.util.emf.core/model/serialization.genmodel b/org.eclipse.modisco.facet.util.emf.core/model/serialization.genmodel
index 1ce9f76..ce3ec10 100644
--- a/org.eclipse.modisco.facet.util.emf.core/model/serialization.genmodel
+++ b/org.eclipse.modisco.facet.util.emf.core/model/serialization.genmodel
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011 Mia-Software and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Nicolas Bros (Mia-Software) - initial API and implementation"
-    modelDirectory="/org.eclipse.modisco.facet.util.emf.core/src" modelPluginID="org.eclipse.modisco.facet.util.emf.core"
+    modelDirectory="/org.eclipse.emf.facet.util.emf.core/src" modelPluginID="org.eclipse.emf.facet.util.emf.core"
     modelName="Serialization" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="5.0" copyrightFields="false">
   <foreignModel>serialization.ecore</foreignModel>
-  <genPackages prefix="Serialization" basePackage="org.eclipse.modisco.facet.util.emf.core.serialization.model"
+  <genPackages prefix="Serialization" basePackage="org.eclipse.emf.facet.util.emf.core.serialization.model"
       disposableProviderFactory="true" ecorePackage="serialization.ecore#/">
     <genDataTypes ecoreDataType="serialization.ecore#//ExtensibleSerializableJavaObject"/>
   </genPackages>
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.genmodel b/org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.genmodel
index 213ba66..600333c 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.genmodel
+++ b/org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.genmodel
@@ -2,16 +2,16 @@
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010 CEA LIST.&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Nicolas Bros (Mia-Software) - initial API and implementation"
-    modelDirectory="/org.eclipse.modisco.facet.widgets.celleditors/src" editDirectory="/org.eclipse.modisco.facet.widgets.celleditors.edit/src"
-    editorDirectory="/org.eclipse.modisco.facet.widgets.celleditors.editor/src" modelPluginID="org.eclipse.modisco.facet.widgets.celleditors"
-    modelName="Celleditors" modelPluginClass="org.eclipse.modisco.facet.widgets.celleditors.CelleditorsPlugin"
+    modelDirectory="/org.eclipse.emf.facet.widgets.celleditors/src" editDirectory="/org.eclipse.emf.facet.widgets.celleditors.edit/src"
+    editorDirectory="/org.eclipse.emf.facet.widgets.celleditors.editor/src" modelPluginID="org.eclipse.emf.facet.widgets.celleditors"
+    modelName="Celleditors" modelPluginClass="org.eclipse.emf.facet.widgets.celleditors.CelleditorsPlugin"
     editPluginClass="org.eclipse.emf.facet.widgets.celleditors.edit.CelleditorsEditPlugin"
-    editorPluginClass="org.eclipse.modisco.facet.widgets.celleditors.editor.CelleditorsEditorPlugin"
-    testSuiteClass="org.eclipse.modisco.facet.widgets.celleditors.modelCellEditor.tests.CelleditorsAllTests"
+    editorPluginClass="org.eclipse.emf.facet.widgets.celleditors.editor.CelleditorsEditorPlugin"
+    testSuiteClass="org.eclipse.emf.facet.widgets.celleditors.modelCellEditor.tests.CelleditorsAllTests"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    editPluginID="org.eclipse.modisco.facet.widgets.celleditors.edit" classNamePattern="">
+    editPluginID="org.eclipse.emf.facet.widgets.celleditors.edit" classNamePattern="">
   <foreignModel>celleditors.ecore</foreignModel>
-  <genPackages prefix="ModelCellEditor" basePackage="org.eclipse.modisco.facet.widgets.celleditors"
+  <genPackages prefix="ModelCellEditor" basePackage="org.eclipse.emf.facet.widgets.celleditors"
       disposableProviderFactory="true" contentTypeIdentifier="" fileExtensions="modelcelleditors"
       ecorePackage="celleditors.ecore#/">
     <genClasses ecoreClass="celleditors.ecore#//ModelCellEditorDeclarations">
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/model/benchmark.genmodel b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/model/benchmark.genmodel
index ed46447..40b11f8 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/model/benchmark.genmodel
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/model/benchmark.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen"
     modelPluginID="org.eclipse.modisco.infra.discovery.benchmark.metamodel" modelName="Benchmark"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" runtimeVersion="2.6"
-    usedGenPackages="platform:/plugin/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.genmodel#//catalog platform:/plugin/org.eclipse.modisco.infra.discovery/model/discovery.genmodel#//discovery platform:/plugin/org.eclipse.emf.facet.util.emf.core/model/serialization.genmodel#//serialization">
+    usedGenPackages="platform:/plugin/org.eclipse.emf.facet.util.emf.catalog/model/catalog.genmodel#//catalog platform:/plugin/org.eclipse.modisco.infra.discovery/model/discovery.genmodel#//discovery platform:/plugin/org.eclipse.emf.facet.util.emf.core/model/serialization.genmodel#//serialization">
   <foreignModel>benchmark.ecore</foreignModel>
   <genPackages prefix="Benchmark" basePackage="org.eclipse.modisco.infra.discovery.benchmark.metamodel.internal"
       disposableProviderFactory="true" ecorePackage="benchmark.ecore#/">
diff --git a/org.eclipse.modisco.infra.discovery/model/discovery.ecore b/org.eclipse.modisco.infra.discovery/model/discovery.ecore
index 7be43ad..82499d3 100644
--- a/org.eclipse.modisco.infra.discovery/model/discovery.ecore
+++ b/org.eclipse.modisco.infra.discovery/model/discovery.ecore
@@ -68,7 +68,7 @@
         serializable="false"/>
     <eClassifiers xsi:type="ecore:EDataType" name="Field" instanceClassName="java.lang.reflect.Field"
         serializable="false"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DiscovererCatalog" eSuperTypes="platform:/plugin/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.ecore#//Catalog">
+    <eClassifiers xsi:type="ecore:EClass" name="DiscovererCatalog" eSuperTypes="platform:/plugin/org.eclipse.emf.facet.util.emf.catalog/model/catalog.ecore#//Catalog">
       <eStructuralFeatures xsi:type="ecore:EReference" name="installedDiscoverers"
           upperBound="-1" eType="#//catalog/DiscovererDescription" volatile="true"
           transient="true" derived="true"/>
@@ -77,7 +77,7 @@
   <eSubpackages name="launch" nsURI="http://www.eclipse.org/MoDisco/Discovery/0.1.incubation/discovery/launch"
       nsPrefix="launch">
     <eClassifiers xsi:type="ecore:EClass" name="LaunchConfiguration">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType ../../org.eclipse.modisco.facet.util.emf.core/model/serialization.ecore#//ExtensibleSerializableJavaObject"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType ../../org.eclipse.emf.facet.util.emf.core/model/serialization.ecore#//ExtensibleSerializableJavaObject"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="parameterValues" upperBound="-1"
           eType="#//launch/ParameterValue" containment="true"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="discoverer" lowerBound="1"
@@ -88,7 +88,7 @@
     <eClassifiers xsi:type="ecore:EClass" name="ParameterValue">
       <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" lowerBound="1"
           eType="#//catalog/DiscovererParameter"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType ../../org.eclipse.modisco.facet.util.emf.core/model/serialization.ecore#//ExtensibleSerializableJavaObject"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType ../../org.eclipse.emf.facet.util.emf.core/model/serialization.ecore#//ExtensibleSerializableJavaObject"/>
     </eClassifiers>
   </eSubpackages>
 </ecore:EPackage>
diff --git a/org.eclipse.modisco.infra.discovery/model/discovery.genmodel b/org.eclipse.modisco.infra.discovery/model/discovery.genmodel
index adb4132..e334b55 100644
--- a/org.eclipse.modisco.infra.discovery/model/discovery.genmodel
+++ b/org.eclipse.modisco.infra.discovery/model/discovery.genmodel
@@ -4,7 +4,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2018 Mia-Software and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;    Fabien Giquel (Mia-Software) - design and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;"
     modelDirectory="/org.eclipse.modisco.infra.discovery/src-gen" modelPluginID="org.eclipse.modisco.infra.discovery"
     modelName="Discovery" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.genmodel#//catalog ../../org.eclipse.emf.facet.util.emf.core/model/serialization.genmodel#//serialization">
+    copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.emf.facet.util.emf.catalog/model/catalog.genmodel#//catalog ../../org.eclipse.emf.facet.util.emf.core/model/serialization.genmodel#//serialization">
   <foreignModel>discovery.ecore</foreignModel>
   <genPackages prefix="Discovery" basePackage="org.eclipse.modisco.infra" disposableProviderFactory="true"
       ecorePackage="discovery.ecore#/">