Revert "[559269] replace all technical "emf.facet" with "modisco.facet""

This reverts commit 6e4b271d3b02c18585e72570df03a691c2541821.
diff --git a/org.eclipse.modisco.facet.common.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.common.ui/OSGI-INF/l10n/bundle.properties
index 44b5644..5cec749 100644
--- a/org.eclipse.modisco.facet.common.ui/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.common.ui/OSGI-INF/l10n/bundle.properties
@@ -14,4 +14,4 @@
 Bundle-Vendor = Eclipse Modeling Project

 Bundle-Name = MoDisco Facet Common UI

 category.name = MoDisco Facet

-modisco.facet.examples = MoDisco Facet Examples
\ No newline at end of file
+emf.facet.examples = MoDisco Facet Examples
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.common.ui/plugin.xml b/org.eclipse.modisco.facet.common.ui/plugin.xml
index 3e24836..92a63e3 100644
--- a/org.eclipse.modisco.facet.common.ui/plugin.xml
+++ b/org.eclipse.modisco.facet.common.ui/plugin.xml
@@ -42,7 +42,7 @@
             locationURI="popup:org.eclipse.ui.popup.any">

          <menu

                id="org.eclipse.modisco.facet.common.ui.menu.examples"

-               label="%modisco.facet.examples">

+               label="%emf.facet.examples">

             <visibleWhen

                   checkEnabled="true">

             </visibleWhen>

diff --git a/org.eclipse.modisco.facet.custom.metamodel/.settings/.api_filters b/org.eclipse.modisco.facet.custom.metamodel/.settings/.api_filters
index 933ab68..2c3d174 100644
--- a/org.eclipse.modisco.facet.custom.metamodel/.settings/.api_filters
+++ b/org.eclipse.modisco.facet.custom.metamodel/.settings/.api_filters
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<component id="org.eclipse.modisco.facet.custom.metamodel" version="2">

-    <resource path="src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java" type="org.eclipse.modisco.facet.custom.metamodel.v0_2_0.custom.CustomPackage">

+<component id="org.eclipse.emf.facet.custom.metamodel" version="2">

+    <resource path="src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java" type="org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.CustomPackage">

         <filter comment="This an allowed (by modeling PMC) API break. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376576" id="403767336">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.custom.metamodel.v0_2_0.custom.CustomPackage"/>

+                <message_argument value="org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.CustomPackage"/>

                 <message_argument value="ECLASS_CUSTOMIZATION__EXTENDED_FACETS"/>

             </message_arguments>

         </filter>

         <filter comment="This an allowed (by modeling PMC) API break. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376576" id="403767336">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.custom.metamodel.v0_2_0.custom.CustomPackage"/>

+                <message_argument value="org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.CustomPackage"/>

                 <message_argument value="FACET_CUSTOMIZATION__EXTENDED_FACETS"/>

             </message_arguments>

         </filter>

         <filter comment="This an allowed (by modeling PMC) API break. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376576" id="405864542">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.custom.metamodel.v0_2_0.custom.CustomPackage"/>

+                <message_argument value="org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.CustomPackage"/>

                 <message_argument value="ECLASS_CUSTOMIZATION__EXTENDED_FACET"/>

             </message_arguments>

         </filter>

         <filter comment="This an allowed (by modeling PMC) API break. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376576" id="405864542">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.custom.metamodel.v0_2_0.custom.CustomPackage"/>

+                <message_argument value="org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.CustomPackage"/>

                 <message_argument value="FACET_CUSTOMIZATION__EXTENDED_FACET"/>

             </message_arguments>

         </filter>

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 8c8ac1f..15259ec 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
@@ -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="custom"

     nsURI="http://www.eclipse.org/modisco/facet/custom/0.2.incubation/custom" nsPrefix="custom">

-  <eClassifiers xsi:type="ecore:EClass" name="Customization" eSuperTypes="../../org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.ecore#//FacetSet">

+  <eClassifiers xsi:type="ecore:EClass" name="Customization" eSuperTypes="../../org.eclipse.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore#//FacetSet">

     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

       <details key="documentation" value="The customization model element is the root of a customization model. A customization is applied to only one ePackage and contains EClassCustomizations."/>

     </eAnnotations>

diff --git a/org.eclipse.modisco.facet.custom.ui/.options b/org.eclipse.modisco.facet.custom.ui/.options
index da7a589..b76ff8c 100644
--- a/org.eclipse.modisco.facet.custom.ui/.options
+++ b/org.eclipse.modisco.facet.custom.ui/.options
@@ -1,5 +1,5 @@
-org.eclipse.modisco.facet.custom.ui/debug=false

-org.eclipse.modisco.facet.custom.ui/debug/TreeElementAdapter=false

-org.eclipse.modisco.facet.custom.ui/debug/CustomizedTreeContentProvider=false

-org.eclipse.modisco.facet.custom.ui/debug/CustomizedLabelProvider/font=false

-org.eclipse.modisco.facet.custom.ui/debug/CustomizedLabelProvider/color=false
\ No newline at end of file
+org.eclipse.emf.facet.custom.ui/debug=false

+org.eclipse.emf.facet.custom.ui/debug/TreeElementAdapter=false

+org.eclipse.emf.facet.custom.ui/debug/CustomizedTreeContentProvider=false

+org.eclipse.emf.facet.custom.ui/debug/CustomizedLabelProvider/font=false

+org.eclipse.emf.facet.custom.ui/debug/CustomizedLabelProvider/color=false
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.custom.ui/.settings/.api_filters b/org.eclipse.modisco.facet.custom.ui/.settings/.api_filters
index 6ebef87..7e24a24 100644
--- a/org.eclipse.modisco.facet.custom.ui/.settings/.api_filters
+++ b/org.eclipse.modisco.facet.custom.ui/.settings/.api_filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<component id="org.eclipse.modisco.facet.custom.ui" version="2">

+<component id="org.eclipse.emf.facet.custom.ui" version="2">

     <resource path="META-INF/MANIFEST.MF">

         <filter comment="Only internal APIs have been modified." id="924844039">

             <message_arguments>

@@ -8,32 +8,32 @@
             </message_arguments>

         </filter>

     </resource>

-    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.modisco.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialogListener">

+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialogListener">

         <filter comment="Only internal API have be modified" id="305324134">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialogListener"/>

-                <message_argument value="org.eclipse.modisco.facet.custom.ui_0.2.0"/>

+                <message_argument value="org.eclipse.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialogListener"/>

+                <message_argument value="org.eclipse.emf.facet.custom.ui_0.2.0"/>

             </message_arguments>

         </filter>

     </resource>

-    <resource path="src/org/eclipse/modisco/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialog.java" type="org.eclipse.modisco.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialog">

+    <resource path="src/org/eclipse/modisco/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialog.java" type="org.eclipse.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialog">

         <filter comment="This is an internal API." id="405901410">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialog"/>

+                <message_argument value="org.eclipse.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialog"/>

                 <message_argument value="pressOk()"/>

             </message_arguments>

         </filter>

     </resource>

-    <resource path="src/org/eclipse/modisco/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialogFactory.java" type="org.eclipse.modisco.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialogFactory">

+    <resource path="src/org/eclipse/modisco/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialogFactory.java" type="org.eclipse.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialogFactory">

         <filter comment="This an insternal API." id="405901410">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialogFactory"/>

+                <message_argument value="org.eclipse.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialogFactory"/>

                 <message_argument value="createLoadCustomizationDialog(Shell, List&lt;Customization&gt;, List&lt;Customization&gt;, ILoadCustomizationsDialogListener)"/>

             </message_arguments>

         </filter>

         <filter comment="This is an internal API" id="405901410">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialogFactory"/>

+                <message_argument value="org.eclipse.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialogFactory"/>

                 <message_argument value="createLoadCustomizationDialog(Shell, List&lt;Customization&gt;, List&lt;Customization&gt;, List&lt;Customization&gt;, ILoadCustomizationsDialogListener, String)"/>

             </message_arguments>

         </filter>

diff --git a/org.eclipse.modisco.facet.custom.ui/OSGI-INF/component.xml b/org.eclipse.modisco.facet.custom.ui/OSGI-INF/component.xml
index e52e02d..036b686 100644
--- a/org.eclipse.modisco.facet.custom.ui/OSGI-INF/component.xml
+++ b/org.eclipse.modisco.facet.custom.ui/OSGI-INF/component.xml
@@ -13,9 +13,9 @@
         Unknown - initial API and implementation

  -->
 
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.modisco.facet.custom.ui">

-   <implementation class="org.eclipse.modisco.facet.custom.ui.internal.DefaultCustomOverride"/>

+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.emf.facet.custom.ui">

+   <implementation class="org.eclipse.emf.facet.custom.ui.internal.DefaultCustomOverride"/>

    <service>

-      <provide interface="org.eclipse.modisco.facet.custom.ui.ICustomOverride"/>

+      <provide interface="org.eclipse.emf.facet.custom.ui.ICustomOverride"/>

    </service>

 </scr:component>

diff --git a/org.eclipse.modisco.facet.custom.ui/resources/customproperties.efacet b/org.eclipse.modisco.facet.custom.ui/resources/customproperties.efacet
index 19523dc..f3cd9f8 100644
--- a/org.eclipse.modisco.facet.custom.ui/resources/customproperties.efacet
+++ b/org.eclipse.modisco.facet.custom.ui/resources/customproperties.efacet
@@ -17,28 +17,28 @@
       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.LabelQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.LabelQuery"/>

     </facetOperations>

     <facetOperations name="image" lowerBound="1">

       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/modisco/facet/custom/0.2.incubation/custom_primitive_types#//Image"/>

       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.ImageQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.ImageQuery"/>

     </facetOperations>

     <facetOperations name="fontName" lowerBound="1">

       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.FontNameQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.FontNameQuery"/>

     </facetOperations>

     <facetOperations name="fontSize" lowerBound="1">

       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>

       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.FontSizeQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.FontSizeQuery"/>

     </facetOperations>

     <facetOperations name="isBold" lowerBound="1">

       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>

@@ -59,14 +59,14 @@
       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.BackgroundQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.BackgroundQuery"/>

     </facetOperations>

     <facetOperations name="foreground" lowerBound="1">

       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/modisco/facet/custom/0.2.incubation/custom_primitive_types#//Color"/>

       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.ForegroundQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.ForegroundQuery"/>

     </facetOperations>

     <facetOperations name="isUnderlined" lowerBound="1">

       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>

@@ -136,14 +136,14 @@
       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.SelectionQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.SelectionQuery"/>

     </facetOperations>

     <facetOperations name="children" upperBound="-1">

       <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>

       <eParameters name="eStructuralFeature">

         <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.ChildrenQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.ChildrenQuery"/>

     </facetOperations>

   </eClassifiers>

   <eClassifiers xsi:type="efacet:Facet" name="CustomizedToolTipEObject">

@@ -153,7 +153,7 @@
       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.ToolTipTextQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.ToolTipTextQuery"/>

     </facetOperations>

     <facetOperations name="image" lowerBound="1">

       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/modisco/facet/custom/0.2.incubation/custom_primitive_types#//Image"/>

@@ -167,14 +167,14 @@
       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.FontNameQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.FontNameQuery"/>

     </facetOperations>

     <facetOperations name="fontSize" lowerBound="1">

       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>

       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.FontSizeQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.FontSizeQuery"/>

     </facetOperations>

     <facetOperations name="isBold" lowerBound="1">

       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>

@@ -195,14 +195,14 @@
       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.ToolTipBackgroundQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.ToolTipBackgroundQuery"/>

     </facetOperations>

     <facetOperations name="foreground" lowerBound="1">

       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/modisco/facet/custom/0.2.incubation/custom_primitive_types#//Color"/>

       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.ForegroundQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.ForegroundQuery"/>

     </facetOperations>

     <facetOperations name="topLeftOverlay" lowerBound="1">

       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/modisco/facet/custom/0.2.incubation/custom_primitive_types#//Image"/>

@@ -251,28 +251,28 @@
       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.ToolTipDelayQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.ToolTipDelayQuery"/>

     </facetOperations>

     <facetOperations name="timeDisplayed" lowerBound="1">

       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>

       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.ToolTipDelayQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.ToolTipDelayQuery"/>

     </facetOperations>

     <facetOperations name="alignment" lowerBound="1">

       <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/modisco/facet/custom/0.2.incubation/custom_primitive_types#//Alignment"/>

       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.ToolTipAlignmentQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.ToolTipAlignmentQuery"/>

     </facetOperations>

     <facetOperations name="shadow" lowerBound="1">

       <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/modisco/facet/custom/0.2.incubation/custom_primitive_types#//Shadow"/>

       <eParameters name="eStructuralFeature">

       	<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

       </eParameters>

-      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.modisco.facet.custom.ui.internal.query.ToolTipShadowQuery"/>

+      <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.custom.ui.internal.query.ToolTipShadowQuery"/>

     </facetOperations>

   </eClassifiers>

 </efacet:FacetSet>

diff --git a/org.eclipse.modisco.facet.efacet.core/.options b/org.eclipse.modisco.facet.efacet.core/.options
index 077afdb..a6b54cf 100644
--- a/org.eclipse.modisco.facet.efacet.core/.options
+++ b/org.eclipse.modisco.facet.efacet.core/.options
@@ -1,2 +1,2 @@
-org.eclipse.modisco.facet.efacet.core/debug=false

-org.eclipse.modisco.facet.efacet.core/debug/FacetManagerContext=false

+org.eclipse.emf.facet.efacet.core/debug=false

+org.eclipse.emf.facet.efacet.core/debug/FacetManagerContext=false

diff --git a/org.eclipse.modisco.facet.efacet.core/schema/internal.resolver.exsd b/org.eclipse.modisco.facet.efacet.core/schema/internal.resolver.exsd
index c9e70c0..f926b88 100644
--- a/org.eclipse.modisco.facet.efacet.core/schema/internal.resolver.exsd
+++ b/org.eclipse.modisco.facet.efacet.core/schema/internal.resolver.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.modisco.facet.efacet.core" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.emf.facet.efacet.core" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.modisco.facet.efacet.core" id="internal.resolver" name="Resolver"/>

+         <meta.schema plugin="org.eclipse.emf.facet.efacet.core" id="internal.resolver" name="Resolver"/>

       </appinfo>

       <documentation>

          This is an internal extension point. It must only be used by EMF Facet&apos;s components.

@@ -57,7 +57,7 @@
                   

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.modisco.facet.efacet.core.internal.exported.IResolver"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.emf.facet.efacet.core.internal.exported.IResolver"/>

                </appinfo>

             </annotation>

          </attribute>

@@ -79,9 +79,9 @@
       </appinfo>

       <documentation>

             &lt;extension

-         point=&quot;org.eclipse.modisco.facet.efacet.core.internal.resolver&quot;&gt;

+         point=&quot;org.eclipse.emf.facet.efacet.core.internal.resolver&quot;&gt;

       &lt;resolver

-            class=&quot;org.eclipse.modisco.facet.aggregate.metamodel.notgenerated.internal.Resolver&quot;&gt;

+            class=&quot;org.eclipse.emf.facet.aggregate.metamodel.notgenerated.internal.Resolver&quot;&gt;

       &lt;/resolver&gt;

    &lt;/extension&gt;

       </documentation>

diff --git a/org.eclipse.modisco.facet.efacet.core/schema/org.eclipse.emf.facet.efacet.core.query.evaluatorregistration.exsd b/org.eclipse.modisco.facet.efacet.core/schema/org.eclipse.emf.facet.efacet.core.query.evaluatorregistration.exsd
index 294442c..b593a84 100644
--- a/org.eclipse.modisco.facet.efacet.core/schema/org.eclipse.emf.facet.efacet.core.query.evaluatorregistration.exsd
+++ b/org.eclipse.modisco.facet.efacet.core/schema/org.eclipse.emf.facet.efacet.core.query.evaluatorregistration.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.modisco.facet.efacet.core.query.evaluatorregistration" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.emf.facet.efacet.core.query.evaluatorregistration" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.modisco.facet.efacet.core.query.evaluatorregistration" id="evaluatorregistration" name="QueryEvaluatorRegistration"/>

+         <meta.schema plugin="org.eclipse.emf.facet.efacet.core.query.evaluatorregistration" id="evaluatorregistration" name="QueryEvaluatorRegistration"/>

       </appinfo>

       <documentation>

          Allow the registration of a queryEvaluatorFactory. 

@@ -56,7 +56,7 @@
                   

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.modisco.facet.efacet.core.query.IQueryEvaluatorFactory"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.emf.facet.efacet.core.query.IQueryEvaluatorFactory"/>

                </appinfo>

             </annotation>

          </attribute>

diff --git a/org.eclipse.modisco.facet.efacet.core/schema/queryImplementationRegistration.exsd b/org.eclipse.modisco.facet.efacet.core/schema/queryImplementationRegistration.exsd
index d73dcbc..5e4bdf2 100644
--- a/org.eclipse.modisco.facet.efacet.core/schema/queryImplementationRegistration.exsd
+++ b/org.eclipse.modisco.facet.efacet.core/schema/queryImplementationRegistration.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.modisco.facet.efacet.core" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.emf.facet.efacet.core" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.modisco.facet.efacet.core" id="queryImplementationRegistration" name="EMF Facet Query Implementation Registration"/>

+         <meta.schema plugin="org.eclipse.emf.facet.efacet.core" id="queryImplementationRegistration" name="EMF Facet Query Implementation Registration"/>

       </appinfo>

       <documentation>

          Used to register an IQueryImplementationFactory, that creates instances of IQueryImplementation. The IQueryImplementation provides an implementation for a given type of queries (e.g. Java queries, OCL queries, ...)

@@ -55,7 +55,7 @@
                   Provides an implementation for an IQueryImplementationFactory, which instantiates IQueryImplementation for a given type of queries.

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.modisco.facet.efacet.core.query.IQueryImplementationFactory"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.emf.facet.efacet.core.query.IQueryImplementationFactory"/>

                </appinfo>

             </annotation>

          </attribute>

@@ -77,9 +77,9 @@
       </appinfo>

       <documentation>

          &lt;pre&gt;

-   &lt;extension point=&quot;org.eclipse.modisco.facet.efacet.core.queryImplementationRegistration&quot;&gt;

+   &lt;extension point=&quot;org.eclipse.emf.facet.efacet.core.queryImplementationRegistration&quot;&gt;

       &lt;queryImplementationRegistration

-            class=&quot;org.eclipse.modisco.facet.efacet.core.tests.internal.DummyQueryEvaluatorFactory&quot;&gt;

+            class=&quot;org.eclipse.emf.facet.efacet.core.tests.internal.DummyQueryEvaluatorFactory&quot;&gt;

       &lt;/queryImplementationRegistration&gt;

    &lt;/extension&gt;

 &lt;/pre&gt;

@@ -95,7 +95,7 @@
          &lt;p&gt;

 See plug-ins:

 &lt;ul&gt;

-&lt;li&gt;org.eclipse.modisco.facet.query.java.core

+&lt;li&gt;org.eclipse.emf.facet.query.java.core

 &lt;/ul&gt;

 &lt;/p&gt;

       </documentation>

diff --git a/org.eclipse.modisco.facet.efacet.metamodel/.settings/.api_filters b/org.eclipse.modisco.facet.efacet.metamodel/.settings/.api_filters
index a647cbc..8eca464 100644
--- a/org.eclipse.modisco.facet.efacet.metamodel/.settings/.api_filters
+++ b/org.eclipse.modisco.facet.efacet.metamodel/.settings/.api_filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<component id="org.eclipse.modisco.facet.efacet.metamodel" version="2">

+<component id="org.eclipse.emf.facet.efacet.metamodel" version="2">

     <resource path="META-INF/MANIFEST.MF">

         <filter comment="This API break has been allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577" id="924844039">

             <message_arguments>

@@ -8,78 +8,78 @@
             </message_arguments>

         </filter>

     </resource>

-    <resource path="src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/Facet.java" type="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.Facet">

+    <resource path="src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/Facet.java" type="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet">

         <filter comment="This is an allowed (by modeling PMC) API break. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376576" id="403804204">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.Facet"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet"/>

                 <message_argument value="getExtendedFacets()"/>

             </message_arguments>

         </filter>

         <filter comment="This is an allowed (by modeling PMC) API break. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376576" id="405901410">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.Facet"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet"/>

                 <message_argument value="getExtendedFacet()"/>

             </message_arguments>

         </filter>

         <filter comment="This is an allowed (by modeling PMC) API break. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376576" id="405901410">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.Facet"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet"/>

                 <message_argument value="setExtendedFacet(Facet)"/>

             </message_arguments>

         </filter>

     </resource>

-    <resource path="src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java" type="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage$Literals">

+    <resource path="src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java" type="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage$Literals">

         <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

                 <message_argument value="EOBJECT_LITERAL_QUERY"/>

             </message_arguments>

         </filter>

         <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

                 <message_argument value="EOBJECT_LITERAL_QUERY__ELEMENT"/>

             </message_arguments>

         </filter>

         <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

                 <message_argument value="FLOAT_LITERAL_QUERY"/>

             </message_arguments>

         </filter>

         <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

                 <message_argument value="FLOAT_LITERAL_QUERY__VALUE"/>

             </message_arguments>

         </filter>

         <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

                 <message_argument value="INTEGER_LITERAL_QUERY"/>

             </message_arguments>

         </filter>

         <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

                 <message_argument value="INTEGER_LITERAL_QUERY__VALUE"/>

             </message_arguments>

         </filter>

         <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

                 <message_argument value="OPERATION_CALL_QUERY"/>

             </message_arguments>

         </filter>

         <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

                 <message_argument value="OPERATION_CALL_QUERY__ARGUMENTS"/>

             </message_arguments>

         </filter>

         <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>

                 <message_argument value="OPERATION_CALL_QUERY__OPERATION"/>

             </message_arguments>

         </filter>

diff --git a/org.eclipse.modisco.facet.efacet.ui/.settings/.api_filters b/org.eclipse.modisco.facet.efacet.ui/.settings/.api_filters
index 202d390..3c13d1a 100644
--- a/org.eclipse.modisco.facet.efacet.ui/.settings/.api_filters
+++ b/org.eclipse.modisco.facet.efacet.ui/.settings/.api_filters
@@ -1,72 +1,72 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<component id="org.eclipse.modisco.facet.efacet.ui" version="2">

-    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IETypedElementSelectionWidget.java" type="org.eclipse.modisco.facet.efacet.ui.internal.exported.widget.IETypedElementSelectionWidget">

+<component id="org.eclipse.emf.facet.efacet.ui" version="2">

+    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IETypedElementSelectionWidget.java" type="org.eclipse.emf.facet.efacet.ui.internal.exported.widget.IETypedElementSelectionWidget">

         <filter comment="These warnings are about internal API." id="305365105">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui.internal.exported.widget.IETypedElementSelectionWidget"/>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui_0.2.0"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui.internal.exported.widget.IETypedElementSelectionWidget"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui_0.2.0"/>

             </message_arguments>

         </filter>

     </resource>

-    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IETypedElementSelectionWidgetFactory.java" type="org.eclipse.modisco.facet.efacet.ui.internal.exported.widget.IETypedElementSelectionWidgetFactory">

+    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IETypedElementSelectionWidgetFactory.java" type="org.eclipse.emf.facet.efacet.ui.internal.exported.widget.IETypedElementSelectionWidgetFactory">

         <filter comment="These warnings are about internal API." id="305365105">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui.internal.exported.widget.IETypedElementSelectionWidgetFactory"/>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui_0.2.0"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui.internal.exported.widget.IETypedElementSelectionWidgetFactory"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui_0.2.0"/>

             </message_arguments>

         </filter>

         <filter comment="This is an internal API" id="405901410">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui.internal.exported.widget.IETypedElementSelectionWidgetFactory"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui.internal.exported.widget.IETypedElementSelectionWidgetFactory"/>

                 <message_argument value="createETypedElementSelectionWidget(int, boolean, Composite, ICustomizationManager)"/>

             </message_arguments>

         </filter>

     </resource>

-    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IFacetSetSelectionWidget.java" type="org.eclipse.modisco.facet.efacet.ui.internal.exported.widget.IFacetSetSelectionWidget">

+    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IFacetSetSelectionWidget.java" type="org.eclipse.emf.facet.efacet.ui.internal.exported.widget.IFacetSetSelectionWidget">

         <filter comment="These warnings are about internal API." id="305365105">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui.internal.exported.widget.IFacetSetSelectionWidget"/>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui_0.2.0"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui.internal.exported.widget.IFacetSetSelectionWidget"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui_0.2.0"/>

             </message_arguments>

         </filter>

     </resource>

-    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IFacetSetSelectionWidgetFactory.java" type="org.eclipse.modisco.facet.efacet.ui.internal.exported.widget.IFacetSetSelectionWidgetFactory">

+    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IFacetSetSelectionWidgetFactory.java" type="org.eclipse.emf.facet.efacet.ui.internal.exported.widget.IFacetSetSelectionWidgetFactory">

         <filter comment="These warnings are about internal API." id="305365105">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui.internal.exported.widget.IFacetSetSelectionWidgetFactory"/>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui_0.2.0"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui.internal.exported.widget.IFacetSetSelectionWidgetFactory"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui_0.2.0"/>

             </message_arguments>

         </filter>

     </resource>

-    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ICreateFacetInFacetSetWizard2.java" type="org.eclipse.modisco.facet.efacet.ui.internal.exported.wizard.ICreateFacetInFacetSetWizard2">

+    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ICreateFacetInFacetSetWizard2.java" type="org.eclipse.emf.facet.efacet.ui.internal.exported.wizard.ICreateFacetInFacetSetWizard2">

         <filter comment="These warnings are about internal API." id="305365105">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui.internal.exported.wizard.ICreateFacetInFacetSetWizard2"/>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui_0.2.0"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui.internal.exported.wizard.ICreateFacetInFacetSetWizard2"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui_0.2.0"/>

             </message_arguments>

         </filter>

     </resource>

-    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ICreateFacetSetWizard.java" type="org.eclipse.modisco.facet.efacet.ui.internal.exported.wizard.ICreateFacetSetWizard">

+    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ICreateFacetSetWizard.java" type="org.eclipse.emf.facet.efacet.ui.internal.exported.wizard.ICreateFacetSetWizard">

         <filter comment="These warnings are about internal API." id="305365105">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui.internal.exported.wizard.ICreateFacetSetWizard"/>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui_0.2.0"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui.internal.exported.wizard.ICreateFacetSetWizard"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui_0.2.0"/>

             </message_arguments>

         </filter>

     </resource>

-    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/IFacetChildrenWizard2.java" type="org.eclipse.modisco.facet.efacet.ui.internal.exported.wizard.IFacetChildrenWizard2">

+    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/IFacetChildrenWizard2.java" type="org.eclipse.emf.facet.efacet.ui.internal.exported.wizard.IFacetChildrenWizard2">

         <filter comment="These warnings are about internal API." id="305365105">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui.internal.exported.wizard.IFacetChildrenWizard2"/>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui_0.2.0"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui.internal.exported.wizard.IFacetChildrenWizard2"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui_0.2.0"/>

             </message_arguments>

         </filter>

     </resource>

-    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ISelectETypeWizard.java" type="org.eclipse.modisco.facet.efacet.ui.internal.exported.wizard.ISelectETypeWizard">

+    <resource path="src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ISelectETypeWizard.java" type="org.eclipse.emf.facet.efacet.ui.internal.exported.wizard.ISelectETypeWizard">

         <filter comment="These warnings are about internal API." id="305365105">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui.internal.exported.wizard.ISelectETypeWizard"/>

-                <message_argument value="org.eclipse.modisco.facet.efacet.ui_0.2.0"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui.internal.exported.wizard.ISelectETypeWizard"/>

+                <message_argument value="org.eclipse.emf.facet.efacet.ui_0.2.0"/>

             </message_arguments>

         </filter>

     </resource>

diff --git a/org.eclipse.modisco.facet.efacet.ui/schema/eTypedElementResultDisplay.exsd b/org.eclipse.modisco.facet.efacet.ui/schema/eTypedElementResultDisplay.exsd
index e03f636..0086d21 100644
--- a/org.eclipse.modisco.facet.efacet.ui/schema/eTypedElementResultDisplay.exsd
+++ b/org.eclipse.modisco.facet.efacet.ui/schema/eTypedElementResultDisplay.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.modisco.facet.infra.query.ui" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.emf.facet.infra.query.ui" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.modisco.facet.infra.query.ui" id="queryResultDisplay" name="Display the results of a model query"/>

+         <meta.schema plugin="org.eclipse.emf.facet.infra.query.ui" id="queryResultDisplay" name="Display the results of a model query"/>

       </appinfo>

       <documentation>

          Use this extension point to provide a view or editor that can display the results of a model query.

@@ -60,7 +60,7 @@
                   Implemented by a view or editor that wants to be used to display the results of a model query.

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.modisco.facet.efacet.ui.IETypedElementResultDisplayer"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.emf.facet.efacet.ui.IETypedElementResultDisplayer"/>

                </appinfo>

             </annotation>

          </attribute>

@@ -83,7 +83,7 @@
          <meta.section type="implementation"/>

       </appinfo>

       <documentation>

-         See plugin &quot;org.eclipse.modisco.facet.infra.browser&quot;.

+         See plugin &quot;org.eclipse.emf.facet.infra.browser&quot;.

       </documentation>

    </annotation>

 

diff --git a/org.eclipse.modisco.facet.efacet.ui/schema/queryFactoryWizardPageRegistration.exsd b/org.eclipse.modisco.facet.efacet.ui/schema/queryFactoryWizardPageRegistration.exsd
index f428cc0..541efca 100644
--- a/org.eclipse.modisco.facet.efacet.ui/schema/queryFactoryWizardPageRegistration.exsd
+++ b/org.eclipse.modisco.facet.efacet.ui/schema/queryFactoryWizardPageRegistration.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.modisco.facet.efacet.ui" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.emf.facet.efacet.ui" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.modisco.facet.efacet.ui" id="queryFactoryWizardPageRegistration" name="Query Factory Wizard Page Registration"/>

+         <meta.schema plugin="org.eclipse.emf.facet.efacet.ui" id="queryFactoryWizardPageRegistration" name="Query Factory Wizard Page Registration"/>

       </appinfo>

       <documentation>

          This extension point aims at registering a wizard page for the creation of a query.

@@ -63,7 +63,7 @@
                   

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.modisco.facet.efacet.ui.internal.exported.wizard.IQueryCreationPagePart"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.emf.facet.efacet.ui.internal.exported.wizard.IQueryCreationPagePart"/>

                </appinfo>

             </annotation>

          </attribute>

diff --git a/org.eclipse.modisco.facet.util.core/.settings/.api_filters b/org.eclipse.modisco.facet.util.core/.settings/.api_filters
index 569cc00..e08d84e 100644
--- a/org.eclipse.modisco.facet.util.core/.settings/.api_filters
+++ b/org.eclipse.modisco.facet.util.core/.settings/.api_filters
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<component id="org.eclipse.modisco.facet.util.core" version="2">

-    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.modisco.facet.util.core.internal.exported.BuildPropertiesUtils">

+<component id="org.eclipse.emf.facet.util.core" version="2">

+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.facet.util.core.internal.exported.BuildPropertiesUtils">

         <filter comment="Only internal API have been changed." id="305324134">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.util.core.internal.exported.BuildPropertiesUtils"/>

-                <message_argument value="org.eclipse.modisco.facet.util.core_0.4.0"/>

+                <message_argument value="org.eclipse.emf.facet.util.core.internal.exported.BuildPropertiesUtils"/>

+                <message_argument value="org.eclipse.emf.facet.util.core_0.4.0"/>

             </message_arguments>

         </filter>

     </resource>

-    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.modisco.facet.util.core.internal.exported.PluginUtils">

+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.facet.util.core.internal.exported.PluginUtils">

         <filter comment="Only internal API have been changed." id="305324134">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.util.core.internal.exported.PluginUtils"/>

-                <message_argument value="org.eclipse.modisco.facet.util.core_0.4.0"/>

+                <message_argument value="org.eclipse.emf.facet.util.core.internal.exported.PluginUtils"/>

+                <message_argument value="org.eclipse.emf.facet.util.core_0.4.0"/>

             </message_arguments>

         </filter>

     </resource>

diff --git a/org.eclipse.modisco.facet.util.emf.core/schema/catalogmanager.exsd b/org.eclipse.modisco.facet.util.emf.core/schema/catalogmanager.exsd
index cee9f83..1505278 100644
--- a/org.eclipse.modisco.facet.util.emf.core/schema/catalogmanager.exsd
+++ b/org.eclipse.modisco.facet.util.emf.core/schema/catalogmanager.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.modisco.facet.util.emf.core" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.emf.facet.util.emf.core" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.modisco.facet.util.emf.core" id="catalogmanager" name="EMF Facet Catalog Manager"/>

+         <meta.schema plugin="org.eclipse.emf.facet.util.emf.core" id="catalogmanager" name="EMF Facet Catalog Manager"/>

       </appinfo>

       <documentation>

          Allows the registration of a ICatalogManager

@@ -55,7 +55,7 @@
                   The class that implements the catalog.

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.modisco.facet.util.emf.core.ICatalogManager"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.emf.facet.util.emf.core.ICatalogManager"/>

                </appinfo>

             </annotation>

          </attribute>

diff --git a/org.eclipse.modisco.facet.util.emf.core/schema/modelViewer.exsd b/org.eclipse.modisco.facet.util.emf.core/schema/modelViewer.exsd
index 4b0d065..cf4e3af 100644
--- a/org.eclipse.modisco.facet.util.emf.core/schema/modelViewer.exsd
+++ b/org.eclipse.modisco.facet.util.emf.core/schema/modelViewer.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.modisco.facet.util.emf.core" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.emf.facet.util.emf.core" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.modisco.facet.util.emf.core" id="modelViewer" name="Model Viewer"/>

+         <meta.schema plugin="org.eclipse.emf.facet.util.emf.core" id="modelViewer" name="Model Viewer"/>

       </appinfo>

       <documentation>

          A model viewer for an EPackage, EObject and/or Resource can be declared with this extension point.

@@ -62,7 +62,7 @@
                   A class that implements IEPackageBrowserOpener.

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.modisco.facet.util.emf.ui.IEPackageBrowserOpener"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.emf.facet.util.emf.ui.IEPackageBrowserOpener"/>

                </appinfo>

             </annotation>

          </attribute>

@@ -82,7 +82,7 @@
                   A class that implements IEObjectBrowserOpener.

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.modisco.facet.util.emf.ui.IEObjectBrowserOpener"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.emf.facet.util.emf.ui.IEObjectBrowserOpener"/>

                </appinfo>

             </annotation>

          </attribute>

@@ -102,7 +102,7 @@
                   A class that implements IResourceBrowserOpener.

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.modisco.facet.util.emf.ui.IResourceBrowserOpener"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.emf.facet.util.emf.ui.IResourceBrowserOpener"/>

                </appinfo>

             </annotation>

          </attribute>

@@ -126,7 +126,7 @@
          For example, the MoDisco model browser is registered like this in &lt;strong&gt;org.eclipse.modisco.infra.browser&lt;/strong&gt;:

 &lt;pre&gt;

   &lt;extension

-        point=&quot;org.eclipse.modisco.facet.util.emf.core.modelViewer&quot;&gt;

+        point=&quot;org.eclipse.emf.facet.util.emf.core.modelViewer&quot;&gt;

      &lt;resourceViewer

            class=&quot;org.eclipse.modisco.infra.browser.opener.BrowserOpener&quot;&gt;

      &lt;/resourceViewer&gt;

diff --git a/org.eclipse.modisco.facet.util.emf.core/schema/org.eclipse.emf.facet.util.emf.core.modeldeclaration.exsd b/org.eclipse.modisco.facet.util.emf.core/schema/org.eclipse.emf.facet.util.emf.core.modeldeclaration.exsd
index 5fc80b0..bd8679d 100644
--- a/org.eclipse.modisco.facet.util.emf.core/schema/org.eclipse.emf.facet.util.emf.core.modeldeclaration.exsd
+++ b/org.eclipse.modisco.facet.util.emf.core/schema/org.eclipse.emf.facet.util.emf.core.modeldeclaration.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.modisco.facet.util.emf.core" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.emf.facet.util.emf.core" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.modisco.facet.util.emf.core" id="org.eclipse.modisco.facet.util.emf.core.modeldeclaration" name="modeldeclaration"/>

+         <meta.schema plugin="org.eclipse.emf.facet.util.emf.core" id="org.eclipse.emf.facet.util.emf.core.modeldeclaration" name="modeldeclaration"/>

       </appinfo>

       <documentation>

          Allows the registration of an EMF model.

diff --git a/org.eclipse.modisco.facet.util.emf.core/schema/serialization.exsd b/org.eclipse.modisco.facet.util.emf.core/schema/serialization.exsd
index 776e858..3fc46e6 100644
--- a/org.eclipse.modisco.facet.util.emf.core/schema/serialization.exsd
+++ b/org.eclipse.modisco.facet.util.emf.core/schema/serialization.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.modisco.facet.widgets.celleditors" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.emf.facet.widgets.celleditors" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appInfo>

-         <meta.schema plugin="org.eclipse.modisco.facet.widgets.celleditors" id="serialization" name="Serialization"/>

+         <meta.schema plugin="org.eclipse.emf.facet.widgets.celleditors" id="serialization" name="Serialization"/>

       </appInfo>

       <documentation>

          This extension point is used to specify an implementation for serializing specific types.

@@ -60,7 +60,7 @@
                   A class that implements the interface ISerializer to provide an implementation for the serialization of a type.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.modisco.facet.util.emf.core.ISerializer"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.emf.facet.util.emf.core.ISerializer"/>

                </appInfo>

             </annotation>

          </attribute>

@@ -84,7 +84,7 @@
          &lt;p&gt;

 A serializer can be registered like this:

 &lt;pre&gt;

-   &lt;extension point=&quot;org.eclipse.modisco.facet.util.emf.core.serialization&quot;&gt;

+   &lt;extension point=&quot;org.eclipse.emf.facet.util.emf.core.serialization&quot;&gt;

       &lt;serializer class=&quot;com.example.MyTypeSerializer&quot;/&gt;

    &lt;/extension&gt;

 &lt;/pre&gt;

@@ -113,7 +113,7 @@
          <meta.section type="implementation"/>

       </appInfo>

       <documentation>

-         &lt;p&gt;See default serializers registered in plug-in &quot;org.eclipse.modisco.facet.util.emf.core&quot;, defined in package &quot;org.eclipse.modisco.facet.util.emf.core.serialization&quot;.&lt;/p&gt;

+         &lt;p&gt;See default serializers registered in plug-in &quot;org.eclipse.emf.facet.util.emf.core&quot;, defined in package &quot;org.eclipse.emf.facet.util.emf.core.serialization&quot;.&lt;/p&gt;

       </documentation>

    </annotation>

 

diff --git a/org.eclipse.modisco.facet.util.emf.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.util.emf.ui/OSGI-INF/l10n/bundle.properties
index 2df9c3e..35669ed 100644
--- a/org.eclipse.modisco.facet.util.emf.ui/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.util.emf.ui/OSGI-INF/l10n/bundle.properties
@@ -20,5 +20,5 @@
 page.name = Default Browser

 Bundle-Vendor = Eclipse Modeling Project

 Bundle-Name = MoDisco Facet U.I. Utilities for EMF

-modisco.facet.category.name = MoDisco Facet

+emf.facet.category.name = MoDisco Facet

 openmodel.command.name = Open Model From EMF Registry
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.util.emf.ui/plugin.xml b/org.eclipse.modisco.facet.util.emf.ui/plugin.xml
index 9b8423e..cd8d11e 100644
--- a/org.eclipse.modisco.facet.util.emf.ui/plugin.xml
+++ b/org.eclipse.modisco.facet.util.emf.ui/plugin.xml
@@ -30,7 +30,7 @@
          point="org.eclipse.ui.commands">

       <category

             id="org.eclipse.modisco.facet.util.emf.ui.category"

-            name="%modisco.facet.category.name">

+            name="%emf.facet.category.name">

       </category>

       <command

             categoryId="org.eclipse.modisco.facet.util.emf.ui.category"

diff --git a/org.eclipse.modisco.facet.util.jface.ui/.options b/org.eclipse.modisco.facet.util.jface.ui/.options
index d6045e9..5ee3f48 100644
--- a/org.eclipse.modisco.facet.util.jface.ui/.options
+++ b/org.eclipse.modisco.facet.util.jface.ui/.options
@@ -7,5 +7,5 @@
 #
 # Contributors:
 #    Thomas Cicognani (Soft-Maint) - Bug 424416 - Plug-in for JFace Utilities
-org.eclipse.modisco.facet.util.jface.ui.ui/debug=false
-org.eclipse.modisco.facet.util.jface.ui.ui/debug/ImageProvider=false
\ No newline at end of file
+org.eclipse.emf.facet.util.jface.ui.ui/debug=false
+org.eclipse.emf.facet.util.jface.ui.ui/debug/ImageProvider=false
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.util.swt/.options b/org.eclipse.modisco.facet.util.swt/.options
index efb3204..8f928ca 100644
--- a/org.eclipse.modisco.facet.util.swt/.options
+++ b/org.eclipse.modisco.facet.util.swt/.options
@@ -7,5 +7,5 @@
 #
 # Contributors:
 #    Gregoire Dupe (Mia-Software) - Bug 423611 - ImageProvider doesn't use singleton instance
-org.eclipse.modisco.facet.util.swt/debug=false
-org.eclipse.modisco.facet.util.swt/debug/ImageProvider=false
\ No newline at end of file
+org.eclipse.emf.facet.util.swt/debug=false
+org.eclipse.emf.facet.util.swt/debug/ImageProvider=false
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.util.ui/.options b/org.eclipse.modisco.facet.util.ui/.options
index dca7c5f..7e4b1b3 100644
--- a/org.eclipse.modisco.facet.util.ui/.options
+++ b/org.eclipse.modisco.facet.util.ui/.options
@@ -9,8 +9,8 @@
 # Contributors:

 #      Alban Ménager (Soft-Maint) - Bug 387470 - [EFacet][Custom] Editors

 ###############################################################################

-org.eclipse.modisco.facet.util.ui/debug=false

-org.eclipse.modisco.facet.util.ui/debug/SelectEPackageWizardPage=false

-org.eclipse.modisco.facet.util.ui/debug/SelectEClassifierWizardPage=false

-org.eclipse.modisco.facet.util.ui/debug/SelectETypeWizardImpl=false

-org.eclipse.modisco.facet.util.ui/debug/FilteredElementSelectionComposite=false

+org.eclipse.emf.facet.util.ui/debug=false

+org.eclipse.emf.facet.util.ui/debug/SelectEPackageWizardPage=false

+org.eclipse.emf.facet.util.ui/debug/SelectEClassifierWizardPage=false

+org.eclipse.emf.facet.util.ui/debug/SelectETypeWizardImpl=false

+org.eclipse.emf.facet.util.ui/debug/FilteredElementSelectionComposite=false

diff --git a/org.eclipse.modisco.facet.util.ui/.settings/.api_filters b/org.eclipse.modisco.facet.util.ui/.settings/.api_filters
index 57669f4..755f7d4 100644
--- a/org.eclipse.modisco.facet.util.ui/.settings/.api_filters
+++ b/org.eclipse.modisco.facet.util.ui/.settings/.api_filters
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<component id="org.eclipse.modisco.facet.util.ui" version="2">

-    <resource path="src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IQuestionDialogFactory.java" type="org.eclipse.modisco.facet.util.ui.internal.exported.dialog.IQuestionDialogFactory">

+<component id="org.eclipse.emf.facet.util.ui" version="2">

+    <resource path="src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IQuestionDialogFactory.java" type="org.eclipse.emf.facet.util.ui.internal.exported.dialog.IQuestionDialogFactory">

         <filter comment="This is an internal API." id="403804204">

             <message_arguments>

-                <message_argument value="org.eclipse.modisco.facet.util.ui.internal.exported.dialog.IQuestionDialogFactory"/>

+                <message_argument value="org.eclipse.emf.facet.util.ui.internal.exported.dialog.IQuestionDialogFactory"/>

                 <message_argument value="createQuestionDialog(Shell, String, String, IDialogCallback&lt;Boolean&gt;)"/>

             </message_arguments>

         </filter>

diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/org.eclipse.modisco.facet.widgets.celleditors.ecore.modelcelleditors b/org.eclipse.modisco.facet.widgets.celleditors.ecore/org.eclipse.modisco.facet.widgets.celleditors.ecore.modelcelleditors
index 79dcf07..b634217 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors.ecore/org.eclipse.modisco.facet.widgets.celleditors.ecore.modelcelleditors
+++ b/org.eclipse.modisco.facet.widgets.celleditors.ecore/org.eclipse.modisco.facet.widgets.celleditors.ecore.modelcelleditors
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <modelCellEditor:ModelCellEditorDeclarations xmi:version="2.0" 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" xmlns:modelCellEditor="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/modelCellEditor">

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="float_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EFloatCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="float_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EFloatCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="floatObject_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EFloatCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="floatObject_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EFloatCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EFloatObject"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="multiString_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EStringMultiCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="multiString_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EStringMultiCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="char_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.ECharCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="char_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.ECharCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EChar"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="charObject_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.ECharCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="charObject_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.ECharCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//ECharacterObject"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="boolean_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EBooleanCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="boolean_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EBooleanCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="booleanObject_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EBooleanCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="booleanObject_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EBooleanCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="double_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EDoubleCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="double_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EDoubleCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="doubleObject_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EDoubleCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="doubleObject_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EDoubleCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="int_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EIntCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="int_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EIntCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="intObject_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EIntCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="intObject_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EIntCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="long_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.ELongCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="long_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.ELongCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//ELong"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="longObject_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.ELongCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="longObject_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.ELongCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//ELongObject"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="bigInteger_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EBigIntegerCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="bigInteger_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EBigIntegerCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBigInteger"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="bigDecimal_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EBigDecimalCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="bigDecimal_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EBigDecimalCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="byte_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EByteCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="byte_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EByteCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EByte"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="byteObject_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EByteCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="byteObject_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EByteCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EByteObject"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="short_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EShortCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="short_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EShortCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EShort"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="shortObject_cell" basicCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.ecore.EShortCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="shortObject_cell" basicCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.ecore.EShortCellEditor">

     <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EShortObject"/>

   </modelCellEditors>

 </modelCellEditor:ModelCellEditorDeclarations>

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.genmodel b/org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.genmodel
index b59caa4..213ba66 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.genmodel
+++ b/org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.genmodel
@@ -5,7 +5,7 @@
     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"

-    editPluginClass="org.eclipse.modisco.facet.widgets.celleditors.edit.CelleditorsEditPlugin"

+    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"

     importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/org.eclipse.modisco.facet.widgets.celleditors.core.modelcelleditors b/org.eclipse.modisco.facet.widgets.celleditors/org.eclipse.modisco.facet.widgets.celleditors.core.modelcelleditors
index 64a0d5d..5701494 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/org.eclipse.modisco.facet.widgets.celleditors.core.modelcelleditors
+++ b/org.eclipse.modisco.facet.widgets.celleditors/org.eclipse.modisco.facet.widgets.celleditors.core.modelcelleditors
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <modelCellEditor:ModelCellEditorDeclarations xmi:version="2.0" 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" xmlns:modelCellEditor="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/modelCellEditor">

-  <modelCellEditors xsi:type="modelCellEditor:UnaryReferenceCellEditor" cellId="unaryref_cell" unaryReferenceCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.internal.core.UnaryReferenceCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:UnaryReferenceCellEditor" cellId="unaryref_cell" unaryReferenceCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.internal.core.UnaryReferenceCellEditor">

     <cellType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:NaryFeatureCellEditor" cellId="naryref_cell" naryFeatureCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.internal.core.NaryReferenceCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:NaryFeatureCellEditor" cellId="naryref_cell" naryFeatureCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.internal.core.NaryReferenceCellEditor">

     <cellType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

   </modelCellEditors>

-  <modelCellEditors xsi:type="modelCellEditor:NaryFeatureCellEditor" cellId="naryattr_cell" naryFeatureCellEditorImpl="org.eclipse.modisco.facet.widgets.celleditors.internal.core.NaryAttributeCellEditor">

+  <modelCellEditors xsi:type="modelCellEditor:NaryFeatureCellEditor" cellId="naryattr_cell" naryFeatureCellEditorImpl="org.eclipse.emf.facet.widgets.celleditors.internal.core.NaryAttributeCellEditor">

     <cellType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EDataType"/>

   </modelCellEditors>

 </modelCellEditor:ModelCellEditorDeclarations>

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/schema/celleditors.exsd b/org.eclipse.modisco.facet.widgets.celleditors/schema/celleditors.exsd
index be38c5b..181f4b2 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/schema/celleditors.exsd
+++ b/org.eclipse.modisco.facet.widgets.celleditors/schema/celleditors.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.modisco.facet.widgets.celleditors" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.emf.facet.widgets.celleditors" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appInfo>

-         <meta.schema plugin="org.eclipse.modisco.facet.widgets.celleditors" id="celleditors" name="Model Cell Editors"/>

+         <meta.schema plugin="org.eclipse.emf.facet.widgets.celleditors" id="celleditors" name="Model Cell Editors"/>

       </appInfo>

       <documentation>

          Use this extension point to register new cell editors.

@@ -78,8 +78,8 @@
       </appInfo>

       <documentation>

          &lt;pre&gt;

-&lt;extension point=&quot;org.eclipse.modisco.facet.widgets.celleditors.celleditors&quot;&gt;

-  &lt;cellEditorsModel path=&quot;org.eclipse.modisco.facet.widgets.celleditors.core.modelcelleditors&quot;/&gt;

+&lt;extension point=&quot;org.eclipse.emf.facet.widgets.celleditors.celleditors&quot;&gt;

+  &lt;cellEditorsModel path=&quot;org.eclipse.emf.facet.widgets.celleditors.core.modelcelleditors&quot;/&gt;

 &lt;/extension&gt;

 &lt;/pre&gt;

       </documentation>

@@ -99,7 +99,7 @@
          <meta.section type="implementation"/>

       </appInfo>

       <documentation>

-         Default cell editors can be found in plug-in org.eclipse.modisco.facet.widgets.celleditors.

+         Default cell editors can be found in plug-in org.eclipse.emf.facet.widgets.celleditors.

       </documentation>

    </annotation>

 

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/schema/commandFactories.exsd b/org.eclipse.modisco.facet.widgets.celleditors/schema/commandFactories.exsd
index d95fd1e..83dfa34 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/schema/commandFactories.exsd
+++ b/org.eclipse.modisco.facet.widgets.celleditors/schema/commandFactories.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.modisco.facet.widgets.celleditors" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.emf.facet.widgets.celleditors" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appInfo>

-         <meta.schema plugin="org.eclipse.modisco.facet.widgets.celleditors" id="commandFactories" name="Command Factories"/>

+         <meta.schema plugin="org.eclipse.emf.facet.widgets.celleditors" id="commandFactories" name="Command Factories"/>

       </appInfo>

       <documentation>

          Use this extension point to specify a Command factory that must be used when creating emf.edit Commands for a specific editing domain.

@@ -55,7 +55,7 @@
                   The implementation class of a Command factory.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.modisco.facet.widgets.celleditors.ICommandFactory"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.emf.facet.widgets.celleditors.ICommandFactory"/>

                </appInfo>

             </annotation>

          </attribute>

@@ -77,7 +77,7 @@
       </appInfo>

       <documentation>

          &lt;pre&gt;

-   &lt;extension point=&quot;org.eclipse.modisco.facet.widgets.celleditors.commandFactories&quot;&gt;

+   &lt;extension point=&quot;org.eclipse.emf.facet.widgets.celleditors.commandFactories&quot;&gt;

       &lt;commandFactory class=&quot;com.example.MyCommandFactory&quot;/&gt;

    &lt;/extension&gt;

 &lt;/pre&gt;

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/schema/compositeEditorFactories.exsd b/org.eclipse.modisco.facet.widgets.celleditors/schema/compositeEditorFactories.exsd
index 073b3e2..9450ca5 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/schema/compositeEditorFactories.exsd
+++ b/org.eclipse.modisco.facet.widgets.celleditors/schema/compositeEditorFactories.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.modisco.facet.widget.celleditors" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.emf.facet.widget.celleditors" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.modisco.facet.widget.celleditors" id="compositeEditorFactories" name="Composite cell editor factories"/>

+         <meta.schema plugin="org.eclipse.emf.facet.widget.celleditors" id="compositeEditorFactories" name="Composite cell editor factories"/>

       </appinfo>

       <documentation>

          Use this extension point to provide new composite cell editors factories, that are used to find the right cell editor composite to use for a given type. Each factory handles a single type.

@@ -60,7 +60,7 @@
                   A factory implementation to create composite cell editors for a specific type handled by the factory. The factory must implement CompositeEditorFactory.

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.modisco.facet.widgets.celleditors.ICompositeEditorFactory"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.emf.facet.widgets.celleditors.ICompositeEditorFactory"/>

                </appinfo>

             </annotation>

          </attribute>

@@ -82,9 +82,9 @@
       </appinfo>

       <documentation>

          &lt;pre&gt;

-   &lt;extension point=&quot;org.eclipse.modisco.facet.widgets.celleditors.compositeEditorFactories&quot;&gt;

-      &lt;compositeEditorFactory class=&quot;org.eclipse.modisco.facet.widgets.celleditors.core.composite.factories.CoreIResourceCompositeFactory&quot;/&gt;

-      &lt;compositeEditorFactory class=&quot;org.eclipse.modisco.facet.widgets.celleditors.core.composite.factories.CoreIFileCompositeFactory&quot;/&gt;

+   &lt;extension point=&quot;org.eclipse.emf.facet.widgets.celleditors.compositeEditorFactories&quot;&gt;

+      &lt;compositeEditorFactory class=&quot;org.eclipse.emf.facet.widgets.celleditors.core.composite.factories.CoreIResourceCompositeFactory&quot;/&gt;

+      &lt;compositeEditorFactory class=&quot;org.eclipse.emf.facet.widgets.celleditors.core.composite.factories.CoreIFileCompositeFactory&quot;/&gt;

    &lt;/extension&gt;

 &lt;/pre&gt;

       </documentation>

@@ -96,7 +96,7 @@
       </appinfo>

       <documentation>

          &lt;p&gt;

-Composite cell editor factories must implement &lt;tt&gt; org.eclipse.modisco.facet.widgets.celleditors.core.composite.CompositeEditorFactory&amp;lt;T&amp;gt;&lt;/tt&gt;

+Composite cell editor factories must implement &lt;tt&gt; org.eclipse.emf.facet.widgets.celleditors.core.composite.CompositeEditorFactory&amp;lt;T&amp;gt;&lt;/tt&gt;

 &lt;/p&gt;

 

 

@@ -110,8 +110,8 @@
       <documentation>

          &lt;p&gt;

 Look at cell editor implementations in the following packages:&lt;ul&gt;

-&lt;li&gt;org.eclipse.modisco.facet.widgets.celleditors.core.composite.factories

-&lt;li&gt;org.eclipse.modisco.facet.widgets.celleditors.ecore.composite

+&lt;li&gt;org.eclipse.emf.facet.widgets.celleditors.core.composite.factories

+&lt;li&gt;org.eclipse.emf.facet.widgets.celleditors.ecore.composite

 &lt;/ul&gt;

 &lt;/p&gt;

       </documentation>

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 3c03d25..ed46447 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.modisco.facet.util.emf.core/model/serialization.genmodel#//serialization">

+    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">

   <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.genmodel b/org.eclipse.modisco.infra.discovery/model/discovery.genmodel
index 901602c..adb4132 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.modisco.facet.util.emf.core/model/serialization.genmodel#//serialization">

+    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">

   <foreignModel>discovery.ecore</foreignModel>

   <genPackages prefix="Discovery" basePackage="org.eclipse.modisco.infra" disposableProviderFactory="true"

       ecorePackage="discovery.ecore#/">