[553310] Residual EMF Facet renames
diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/BuildPropertiesUtils.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/BuildPropertiesUtils.java
index 8e9cc6f..411400f 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/BuildPropertiesUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/BuildPropertiesUtils.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    Laurent Pichierri (Soft-Maint) - Bug 371204 - Compatibility with Helios (copied from org.eclipse.emf.facet.util.core.internal.BuildPropertiesUtils.getBuildModel(IPluginModelBase))

+ *    Laurent Pichierri (Soft-Maint) - Bug 371204 - Compatibility with Helios (copied from org.eclipse.modisco.facet.util.core.internal.BuildPropertiesUtils.getBuildModel(IPluginModelBase))

  *    Gregoire Dupe (Mia-Software) - Bug 382359 - Compatibility with Helios

  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.common.core.internal.utils;

@@ -45,7 +45,7 @@
 	 *         does not exist

 	 * @throws CoreException

 	 */

-	//Copied from org.eclipse.emf.facet.util.core.internal.BuildPropertiesUtils.getBuildModel(IPluginModelBase) (EPL)

+	//Copied from org.eclipse.modisco.facet.util.core.internal.BuildPropertiesUtils.getBuildModel(IPluginModelBase) (EPL)

 	public static IBuildModel getBuildModel(final IPluginModelBase model) throws CoreException {

 		IProject project = model.getUnderlyingResource().getProject();

 		IPluginModelBase pluginModelBase = PluginRegistry.findModel(project);

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/logging/MoDiscoLogger.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/logging/MoDiscoLogger.java
index bd56051..4c26946 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/logging/MoDiscoLogger.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/logging/MoDiscoLogger.java
@@ -24,7 +24,7 @@
  * Helper for logging using Eclipse API

  *

  * @author fgiquel

- * @deprecated Replaced by org.eclipse.emf.facet.util.core.Logger,

+ * @deprecated Replaced by org.eclipse.modisco.facet.util.core.Logger,

  *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470725

  */

 @Deprecated

diff --git a/org.eclipse.modisco.facet.common.core/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.common.core/OSGI-INF/l10n/bundle.properties
index 73fcd98..1acef56 100644
--- a/org.eclipse.modisco.facet.common.core/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.common.core/OSGI-INF/l10n/bundle.properties
@@ -11,6 +11,6 @@
 ###############################################################################

 #Properties file for org.eclipse.modisco.facet.common.core

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet Common Core

+Bundle-Name = MoDisco Facet Common Core

 extension-point.name = catalogManager

 extension-point.name.0 = modeldeclaration
\ No newline at end of file
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 eadf24a..b557dde 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
@@ -10,8 +10,8 @@
 #	  Grégoire Dupé (Mia-Software) - Bug 388422 - [Table] Queries for InstanciationMethod needs to have 2 parameters

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

 #Properties file for org.eclipse.modisco.facet.common.ui

-page.name = EMF Facet

+page.name = MoDisco Facet

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet Common UI

-category.name = EMF Facet

-emf.facet.examples = EMF Facet Examples
\ No newline at end of file
+Bundle-Name = MoDisco Facet Common UI

+category.name = MoDisco Facet

+emf.facet.examples = MoDisco Facet Examples
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Activator.java b/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Activator.java
index fbf84e4..0039e63 100644
--- a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Activator.java
+++ b/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Activator.java
@@ -19,7 +19,7 @@
  */

 public class Activator extends AbstractUIPlugin {

 

-	public static final String PLUGIN_ID = "org.eclipse.emf.facet.common.ui"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.modisco.facet.common.ui"; //$NON-NLS-1$

 

 	private static Activator plugin;

 

diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Messages.java b/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Messages.java
index 751ae7a..f0c6cfc 100644
--- a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Messages.java
+++ b/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Messages.java
@@ -13,7 +13,7 @@
 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.emf.facet.common.ui.internal.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.modisco.facet.common.ui.internal.messages"; //$NON-NLS-1$

 	public static String ElementsView_refreshJobTitle;

 	static {

 		// initialize resource bundle

diff --git a/org.eclipse.modisco.facet.custom.core/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.custom.core/OSGI-INF/l10n/bundle.properties
index 5d14780..6f37211 100644
--- a/org.eclipse.modisco.facet.custom.core/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.custom.core/OSGI-INF/l10n/bundle.properties
@@ -11,4 +11,4 @@
 

 #Properties file for org.eclipse.modisco.facet.custom.core

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet Customization Core

+Bundle-Name = MoDisco Facet Customization Core

diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationCatalogManager.java b/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationCatalogManager.java
index 949b32e..d2b2898 100644
--- a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationCatalogManager.java
+++ b/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationCatalogManager.java
@@ -31,7 +31,7 @@
 

 /**

  * Customization catalog implementation using the catalog manager features provided by the plug-in

- * org.eclipse.emf.facet.util.emf.core

+ * org.eclipse.modisco.facet.util.emf.core

  * 

  * @author Grégoire Dupé

  * 

diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationPropertiesCatalogManager.java b/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationPropertiesCatalogManager.java
index 04063d3..51df15f 100644
--- a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationPropertiesCatalogManager.java
+++ b/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationPropertiesCatalogManager.java
@@ -31,7 +31,7 @@
 

 /**

  * Customization catalog implementation using the catalog manager features

- * provided by the plug-in org.eclipse.emf.facet.util.emf.core

+ * provided by the plug-in org.eclipse.modisco.facet.util.emf.core

  * 

  * @author Gregoire Dupe

  * 

diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationsDelegatingList.java b/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationsDelegatingList.java
index f18ac31..f564611 100644
--- a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationsDelegatingList.java
+++ b/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationsDelegatingList.java
@@ -9,7 +9,7 @@
  *    Nicolas Bros (Mia-Software) - Bug 374758 - [Table] repair the table

  *    Gregoire Dupe (Mia-Software) - Bug 372626 - Aggregates

  *    Thomas Cicognani (Soft-Maint) - Bug 420192 - UnsupportedOperationException in a usefull method 

- *    Thomas Cicognani (Soft-Maint) - Bug 435882 - org.eclipse.emf.facet.custom.core.internal.CustomizationsDelegatingList not fully implemented

+ *    Thomas Cicognani (Soft-Maint) - Bug 435882 - org.eclipse.modisco.facet.custom.core.internal.CustomizationsDelegatingList not fully implemented

  *    Thomas Cicognani (Soft-Maint) - Bug 441317 - Clearing a CustomizationsDelegatingList doesn't notify listeners

  *    Grégoire Dupé (Mia-Software) - Bug 476141 - Facet manger can fail with ConcurrentModificationException

  *******************************************************************************/

diff --git a/org.eclipse.modisco.facet.custom.metamodel/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.custom.metamodel/OSGI-INF/l10n/bundle.properties
index 66b124c..ba328ce 100644
--- a/org.eclipse.modisco.facet.custom.metamodel/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.custom.metamodel/OSGI-INF/l10n/bundle.properties
@@ -8,5 +8,5 @@
 #Contributors:

 #     Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model

 

-pluginName = EMF Facet Customization Meta-Model

+pluginName = MoDisco Facet Customization Meta-Model

 providerName = Eclipse Modeling Project

diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/CustomptPackage.java b/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/CustomptPackage.java
index f1fe6b3..bfa492f 100644
--- a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/CustomptPackage.java
+++ b/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/CustomptPackage.java
@@ -131,7 +131,7 @@
 	 * <!-- end-user-doc -->

 	 * @return the meta object for data type '<em>Image</em>'.

 	 * @see org.eclipse.modisco.facet.custom.metamodel.custompt.IImage

-	 * @model instanceClass="org.eclipse.emf.facet.custom.metamodel.custompt.IImage"

+	 * @model instanceClass="org.eclipse.modisco.facet.custom.metamodel.custompt.IImage"

 	 * @generated

 	 */

 	EDataType getImage();

@@ -142,7 +142,7 @@
 	 * <!-- end-user-doc -->

 	 * @return the meta object for data type '<em>Color</em>'.

 	 * @see org.eclipse.modisco.facet.custom.metamodel.custompt.IColor

-	 * @model instanceClass="org.eclipse.emf.facet.custom.metamodel.custompt.IColor"

+	 * @model instanceClass="org.eclipse.modisco.facet.custom.metamodel.custompt.IColor"

 	 * @generated

 	 */

 	EDataType getColor();

diff --git a/org.eclipse.modisco.facet.custom.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.custom.ui/OSGI-INF/l10n/bundle.properties
index 4ca86e3..2bcc6c9 100644
--- a/org.eclipse.modisco.facet.custom.ui/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.custom.ui/OSGI-INF/l10n/bundle.properties
@@ -9,5 +9,5 @@
 #     Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model

 #Properties file for org.eclipse.modisco.facet.custom.ui

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet Customization UI

+Bundle-Name = MoDisco Facet Customization UI

 view.customizations = Customizations
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Activator.java b/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Activator.java
index 3ff39fc..ad0d3f3 100644
--- a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Activator.java
+++ b/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Activator.java
@@ -20,7 +20,7 @@
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.emf.facet.custom.ui"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.modisco.facet.custom.ui"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelProvider.java b/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelProvider.java
index d45058b..eec0c49 100644
--- a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelProvider.java
+++ b/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelProvider.java
@@ -9,7 +9,7 @@
  *  Contributors:

  *  	Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model

  *      Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

- *      Nicolas Bros (Mia-Software) - Bug 372198 - resource leak in org.eclipse.emf.facet.custom.ui.internal.CustomizedLabelProvider

+ *      Nicolas Bros (Mia-Software) - Bug 372198 - resource leak in org.eclipse.modisco.facet.custom.ui.internal.CustomizedLabelProvider

  *      Vincent Lorenzo (CEA-LIST) - Bug 372644 - Create Customizable tooltips for the TreeViewer using a CustomizableLabelProvider

  *      Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning

  *      Nicolas Bros (Mia-Software) - Bug 374941 - To be able to customize overlay icons on EClass

diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Messages.java b/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Messages.java
index c67ca08..18154a8 100644
--- a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Messages.java
+++ b/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Messages.java
@@ -17,7 +17,7 @@
 import org.eclipse.osgi.util.NLS;

 

 public final class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.emf.facet.custom.ui.internal.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.modisco.facet.custom.ui.internal.messages"; //$NON-NLS-1$

 	public static String CustomizationsCatalogView_title;

 	public static String CustomizationsView_allQuerySets;

 	public static String CustomizationsView_jobName_RefreshCustomizationsView;

diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandler.java b/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandler.java
index aaf25b1..c9047c7 100644
--- a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandler.java
+++ b/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandler.java
@@ -79,7 +79,7 @@
 	/**

 	 * 

 	 * @deprecated Must be replaced by

-	 *             org.eclipse.emf.facet.custom.ui.internal.PropertiesHandler

+	 *             org.eclipse.modisco.facet.custom.ui.internal.PropertiesHandler

 	 *             .PropertiesHandler(ICustomizationManager)

 	 */

 	@Deprecated

diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandlerFactory.java b/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandlerFactory.java
index 19b6c58..8a93c1f 100644
--- a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandlerFactory.java
+++ b/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandlerFactory.java
@@ -27,7 +27,7 @@
 

 	/**

 	 * @deprecated must be replaced by

-	 *             org.eclipse.emf.facet.custom.ui.internal.PropertiesHandlerFactory

+	 *             org.eclipse.modisco.facet.custom.ui.internal.PropertiesHandlerFactory

 	 *             .createIContentPropertiesHandler(ICustomizationManager)

 	 */

 	@Deprecated

diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/CustomizationUIConstants.java b/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/CustomizationUIConstants.java
index cc0c48d..01ae99d 100644
--- a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/CustomizationUIConstants.java
+++ b/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/CustomizationUIConstants.java
@@ -15,7 +15,7 @@
  */

 public final class CustomizationUIConstants {

 

-	private static final String CATALOG_VIEW_ID = "org.eclipse.emf.facet.custom.ui.view.catalog"; //$NON-NLS-1$

+	private static final String CATALOG_VIEW_ID = "org.eclipse.modisco.facet.custom.ui.view.catalog"; //$NON-NLS-1$

 

 	private CustomizationUIConstants() {

 		// utility class

diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/LabelQuery.java b/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/LabelQuery.java
index 09be9b0..2ee81da 100644
--- a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/LabelQuery.java
+++ b/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/LabelQuery.java
@@ -91,7 +91,7 @@
 	 * @return a default name based on a string feature of the given

 	 *         {@link EObject}

 	 */

-	// from org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils

+	// from org.eclipse.modisco.facet.infra.common.core.internal.utils.ModelUtils

 	public static String getDefaultName(final EObject eObject) {

 		String result = ""; //$NON-NLS-1$

 		// find a feature that can be used as a name

@@ -111,8 +111,8 @@
 	 *            a name

 	 * @return an EStructuralFeature

 	 */

-	// Copied from org.eclipse.emf.edit.provider.ReflectiveItemProvider to org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils

-	// Copied from org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils

+	// Copied from org.eclipse.emf.edit.provider.ReflectiveItemProvider to org.eclipse.modisco.facet.infra.common.core.internal.utils.ModelUtils

+	// Copied from org.eclipse.modisco.facet.infra.common.core.internal.utils.ModelUtils

 	private static EStructuralFeature getLabelFeature(final EClass eClass) {

 		EAttribute result = null;

 		for (final EAttribute eAttribute : eClass.getEAllAttributes()) {

diff --git a/org.eclipse.modisco.facet.efacet.core/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.efacet.core/OSGI-INF/l10n/bundle.properties
index 2a8da3b..a2d01b1 100644
--- a/org.eclipse.modisco.facet.efacet.core/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.efacet.core/OSGI-INF/l10n/bundle.properties
@@ -12,6 +12,6 @@
 ###########################################################################

 #Properties file for org.eclipse.modisco.facet.efacet.core

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet Core

+Bundle-Name = MoDisco Facet Core

 queryEvaluatorRegistration.extension-point.name = QueryEvaluatorRegistration

 derivedTypedElementImplementationRegistration.extension-point.name = Derived Typed Element Evaluator Registration
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/FacetUtils.java b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/FacetUtils.java
index 925f6ef..13251e7 100644
--- a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/FacetUtils.java
+++ b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/FacetUtils.java
@@ -405,7 +405,7 @@
 	}

 

 	// Moved from

-	// org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetSetImpl

+	// org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetSetImpl

 	public static EPackage getExtendedEPackage(final FacetSet facetSet) {

 		final List<Facet> facets = FacetUtils.getFacets(facetSet);

 		EPackage result = null;

@@ -426,7 +426,7 @@
 	}

 

 	// Copied (and refactored) from

-	// org.eclipse.emf.facet.efacet.core.internal.FacetManager

+	// org.eclipse.modisco.facet.efacet.core.internal.FacetManager

 	public static <T extends ETypedElement> Set<T> getETypedElements(

 			final EObject eObject, final Class<T> classs,

 			final IFacetManager facetManager) throws FacetManagerException {

@@ -439,7 +439,7 @@
 	}

 

 	// Copied (and refactored) from

-	// org.eclipse.emf.facet.efacet.core.internal.FacetManager

+	// org.eclipse.modisco.facet.efacet.core.internal.FacetManager

 	private static <T extends ETypedElement> Set<T> getETypedElements(

 			final EObject eObject, final FacetSet facetSet,

 			final Class<T> classs, final IFacetManager manager)

@@ -491,7 +491,7 @@
 	}

 

 	// Copied (and refactored) from

-	// org.eclipse.emf.facet.efacet.core.internal.FacetManager

+	// org.eclipse.modisco.facet.efacet.core.internal.FacetManager

 	private static List<ETypedElement> getAllETypedElements(

 			final Facet facet) {

 		final List<ETypedElement> structFeatures = new LinkedList<ETypedElement>();

@@ -563,7 +563,7 @@
 	 * 

 	 */

 	// Copied from

-	// org.eclipse.emf.facet.efacet.core.internal.FacetManagerContext

+	// org.eclipse.modisco.facet.efacet.core.internal.FacetManagerContext

 	// * Contributors:

 	// * Olivier Remaud (Soft-Maint) - Bug 361794 - [Restructuring] EMF Facet

 	// customization meta-model

diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/DerivedTypedElementException.java b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/DerivedTypedElementException.java
index daabe80..d1538c3 100644
--- a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/DerivedTypedElementException.java
+++ b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/DerivedTypedElementException.java
@@ -21,7 +21,7 @@
 public class DerivedTypedElementException extends Exception {

 

 	// This class is a copy of :

-	// org.eclipse.emf.facet.infra.query.core.exception.ModelQueryException

+	// org.eclipse.modisco.facet.infra.query.core.exception.ModelQueryException

 

 	private static final long serialVersionUID = -3203874059325745157L;

 

diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetActions2Impl.java b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetActions2Impl.java
index 34ecade..0a91da5 100644
--- a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetActions2Impl.java
+++ b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetActions2Impl.java
@@ -9,7 +9,7 @@
  * Contributors:

  * 	Nicolas Guyomar (Mia-Software) - Bug 338813 - [EMF Facet Framework] basic Facet actions

  *  Nicolas Bros (Mia-Software) - Bug 361612 - New core for new version of the Facet metamodel

- *  Gregoire Dupe (Mia-Software) - Bug 362087 - [Deprecated] org.eclipse.emf.facet.util.emf.core.ICatalogSetManager

+ *  Gregoire Dupe (Mia-Software) - Bug 362087 - [Deprecated] org.eclipse.modisco.facet.util.emf.core.ICatalogSetManager

  */

 package org.eclipse.modisco.facet.efacet.core.internal;

 

diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerContext.java b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerContext.java
index 0f1d16d..6e394ff 100644
--- a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerContext.java
+++ b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerContext.java
@@ -66,7 +66,7 @@
  */

 class FacetManagerContext implements List<FacetSet> {

 

-	private static final String SILENT_OPTION = "org.eclipse.emf.facet.efacet.core.internal.FacetManagerContext.getOverrideCandidateFeatures.silent"; //$NON-NLS-1$

+	private static final String SILENT_OPTION = "org.eclipse.modisco.facet.efacet.core.internal.FacetManagerContext.getOverrideCandidateFeatures.silent"; //$NON-NLS-1$

 	private static final boolean SILENT = Boolean

 			.getBoolean(FacetManagerContext.SILENT_OPTION);

 	private static final boolean DEBUG = DebugUtils.getDebugStatus(Activator.getDefault());

diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/Messages.java b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/Messages.java
index 121a351..7172383 100644
--- a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/Messages.java
+++ b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/Messages.java
@@ -15,7 +15,7 @@
 

 @SuppressWarnings("PMD")

 public final class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.emf.facet.efacet.core.internal.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.modisco.facet.efacet.core.internal.messages"; //$NON-NLS-1$

 	public static String EFacetCatalogManager_FacetSetCatalogName;

 	public static String EFacetCatalogManager_QuerySetCatalogName;

 	static {

diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/ResolverManager.java b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/ResolverManager.java
index 8b29b26..6f5f245 100644
--- a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/ResolverManager.java
+++ b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/ResolverManager.java
@@ -25,7 +25,7 @@
 public class ResolverManager implements IResolverManager {

 

 	private static final String ATT_NAME = "class"; //$NON-NLS-1$

-	private static final String EXT_POINT_ID = "org.eclipse.emf.facet.efacet.core.internal.resolver"; //$NON-NLS-1$

+	private static final String EXT_POINT_ID = "org.eclipse.modisco.facet.efacet.core.internal.resolver"; //$NON-NLS-1$

 	private final List<IResolver> resolvers = new ArrayList<IResolver>();

 

 	public ResolverManager() {

diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/DerivedTypedElementEvaluationException.java b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/DerivedTypedElementEvaluationException.java
index 48ca8c6..82998a7 100644
--- a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/DerivedTypedElementEvaluationException.java
+++ b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/DerivedTypedElementEvaluationException.java
@@ -21,7 +21,7 @@
  */

 public class DerivedTypedElementEvaluationException extends DerivedTypedElementException {

 	// This class is a copy of

-	// org.eclipse.emf.facet.infra.query.core.ModelQueryExecutionException

+	// org.eclipse.modisco.facet.infra.query.core.ModelQueryExecutionException

 

 	private static final long serialVersionUID = -8464252257666617685L;

 

diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exported/IResolver.java b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exported/IResolver.java
index 6a0754a..43cb381 100644
--- a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exported/IResolver.java
+++ b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exported/IResolver.java
@@ -15,7 +15,7 @@
 

 /**

  * The interface has to be implemented to contribute to the extension point

- * 'org.eclipse.emf.facet.efacet.core.internal.resolver'.

+ * 'org.eclipse.modisco.facet.efacet.core.internal.resolver'.

  */

 public interface IResolver {

 

diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IsOneOfQueryImplementation.java b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IsOneOfQueryImplementation.java
index ebdaa32..c8e4c19 100644
--- a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IsOneOfQueryImplementation.java
+++ b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IsOneOfQueryImplementation.java
@@ -27,7 +27,7 @@
 public class IsOneOfQueryImplementation implements IQueryImplementation {

 

 	// This class is a modified copy of :

-	// org.eclipse.emf.facet.infra.query.core.java.internal.JavaModelQueryAdapter

+	// org.eclipse.modisco.facet.infra.query.core.java.internal.JavaModelQueryAdapter

 

 	private boolean checkResultType = false;

 

diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NavigationQueryImplementation.java b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NavigationQueryImplementation.java
index 8f3cd8e..a80b435 100644
--- a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NavigationQueryImplementation.java
+++ b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NavigationQueryImplementation.java
@@ -32,7 +32,7 @@
 public class NavigationQueryImplementation implements IQueryImplementation {

 

 	// This class is a modified copy of :

-	// org.eclipse.emf.facet.infra.query.core.java.internal.JavaModelQueryAdapter

+	// org.eclipse.modisco.facet.infra.query.core.java.internal.JavaModelQueryAdapter

 

 	private boolean checkResultType = false;

 

diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryImplementationFactoryRegistry.java b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryImplementationFactoryRegistry.java
index 6c3f6b4..02573b6 100644
--- a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryImplementationFactoryRegistry.java
+++ b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryImplementationFactoryRegistry.java
@@ -31,7 +31,7 @@
 import org.osgi.framework.Bundle;

 

 public class QueryImplementationFactoryRegistry {

-	private static final String EXT_ID = "org.eclipse.emf.facet.efacet.core.queryImplementationRegistration"; //$NON-NLS-1$

+	private static final String EXT_ID = "org.eclipse.modisco.facet.efacet.core.queryImplementationRegistration"; //$NON-NLS-1$

 	private static final String CLASS = "class"; //$NON-NLS-1$

 	public static final QueryImplementationFactoryRegistry INSTANCE = new QueryImplementationFactoryRegistry();

 

diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryUtils.java b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryUtils.java
index a6e4814..1bf4a63 100644
--- a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryUtils.java
+++ b/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryUtils.java
@@ -55,7 +55,7 @@
 	}

 

 	// Moved from

-	// org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.impl.QueryImpl

+	// org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.extensible.impl.QueryImpl

 	public static EClassifier getReturnType(final Query query) {

 		EClassifier result = null;

 		final DerivedTypedElement owningDTE = QueryUtils

@@ -67,7 +67,7 @@
 	}

 

 	// Moved from

-	// org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.impl.QueryImpl

+	// org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.extensible.impl.QueryImpl

 	public static EClassifier getSourceType(final Query query) {

 		EClassifier result = null;

 		final DerivedTypedElement owningDTE = QueryUtils

@@ -87,7 +87,7 @@
 	}

 

 	// Moved from

-	// org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.impl.QueryImpl

+	// org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.extensible.impl.QueryImpl

 	public static DerivedTypedElement getOwningDerivedTypedElement(

 			final Query query) {

 		DerivedTypedElement result = null;

@@ -108,7 +108,7 @@
 	}

 

 	// Moved from

-	// org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.impl.QueryImpl

+	// org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.extensible.impl.QueryImpl

 	public static boolean isMany(final Query query) {

 		boolean result = false;

 		final DerivedTypedElement owningDTE = QueryUtils

diff --git a/org.eclipse.modisco.facet.efacet.edit.core/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.efacet.edit.core/OSGI-INF/l10n/bundle.properties
index 0b65295..9348df2 100644
--- a/org.eclipse.modisco.facet.efacet.edit.core/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.efacet.edit.core/OSGI-INF/l10n/bundle.properties
@@ -11,4 +11,4 @@
 #Properties file for org.eclipse.modisco.facet.efacet.edit.core

 

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet Edit Core
\ No newline at end of file
+Bundle-Name = MoDisco Facet Edit Core
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/Messages.java b/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/Messages.java
index 04e65e7..9ce8db5 100644
--- a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/Messages.java
+++ b/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/Messages.java
@@ -14,7 +14,7 @@
 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.emf.facet.efacet.edit.core.internal.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.modisco.facet.efacet.edit.core.internal.messages"; //$NON-NLS-1$

 	public static String FacetAddAllCommand_Descriptor;

 	public static String FacetAddAllCommand_Label;

 	public static String FacetAddCommand_Description;

diff --git a/org.eclipse.modisco.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties
index cf26ace..6346d9f 100644
--- a/org.eclipse.modisco.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties
@@ -10,4 +10,4 @@
 # 	Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values. 

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

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet EFacet Model
\ No newline at end of file
+Bundle-Name = MoDisco Facet EFacet Model
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementResult.java b/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementResult.java
index 4bfb745..9383263 100644
--- a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementResult.java
+++ b/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementResult.java
@@ -125,7 +125,7 @@
 	 * @return the value of the '<em>Exception</em>' attribute.

 	 * @see #setException(Throwable)

 	 * @see org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.runtime.RuntimePackage#getETypedElementResult_Exception()

-	 * @model dataType="org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.JavaException" transient="true"

+	 * @model dataType="org.eclipse.modisco.facet.efacet.metamodel.v0_2_0.efacet.runtime.JavaException" transient="true"

 	 * @generated

 	 */

 	Throwable getException();

diff --git a/org.eclipse.modisco.facet.efacet.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.efacet.ui/OSGI-INF/l10n/bundle.properties
index 30c85b3..35a6601 100644
--- a/org.eclipse.modisco.facet.efacet.ui/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.efacet.ui/OSGI-INF/l10n/bundle.properties
@@ -7,21 +7,21 @@
 #  http://www.eclipse.org/legal/epl-v10.html

 # 

 #  Contributors:

-#  	Nicolas Guyomar (Mia-Software) - Bug 349546 - EMF Facet facetSet editor

+#  	Nicolas Guyomar (Mia-Software) - Bug 349546 - MoDisco Facet facetSet editor

 #   Gregoire Dupe (Mia-Software) - Bug 364325 - [Restructuring] The user must be able to navigate into a model using the Facet.

 #   Gregoire Dupe (Mia-Software) - Bug 441051 - Reusable customization and facet loading dialogs

 #   Jonathan Pepin (Soft-Maint) - Bug 463907 - Command for load and save Facet serialization

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

 #Properties file for org.eclipse.modisco.facet.efacet.ui

-Bundle-Name = EMF Facet EFacet UI

+Bundle-Name = MoDisco Facet EFacet UI

 Bundle-Vendor = Eclipse Modeling Project

 

-category.name = EMF Facet

+category.name = MoDisco Facet

 wizard.name = Create a FacetSet 0.1 (Deprecated)

 wizard.description = Create a new Facet model

 extension-point.name = Query Factory Wizard Page Registration

 

-menu.label = EMF Facet Commands

+menu.label = MoDisco Facet Commands

 category.name = Facet commands

 command.name = Create Facet in a FacetSet

 command.name.0 = Add Facet Attribute

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayer.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayer.java
index 96dc966..f29c589 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayer.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayer.java
@@ -20,7 +20,7 @@
  * Implemented by a view or editor that wants to be used to display the results

  * of a model query.

  */

-//Copied from org.eclipse.emf.facet.infra.query.ui.views.queryExecution.QueryResultDisplayer

+//Copied from org.eclipse.modisco.facet.infra.query.ui.views.queryExecution.QueryResultDisplayer

 public interface IETypedElementResultDisplayer {

 	void displayETypedElementResults(final List<ETypedElementResult> result, EditingDomain editingDomain);

 

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayerOpener.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayerOpener.java
index 124074d..f70b3da 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayerOpener.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayerOpener.java
@@ -18,9 +18,9 @@
 

 

 /**

- * This method must be implemented and referenced by the extension point org.eclipse.emf.facet.efacet.ui.displayeropener

+ * This method must be implemented and referenced by the extension point org.eclipse.modisco.facet.efacet.ui.displayeropener

  * 

- * This is a new version of the org.eclipse.emf.facet.infra.query.ui.views.queryExecution.QueryResultDisplayer.

+ * This is a new version of the org.eclipse.modisco.facet.infra.query.ui.views.queryExecution.QueryResultDisplayer.

  * @author Gregoire Dupe

  *

  */

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Activator.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Activator.java
index 2c7a2aa..5978e2b 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Activator.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Activator.java
@@ -20,7 +20,7 @@
  */

 public class Activator extends AbstractUIPlugin {

 

-	public static final String PLUGIN_ID = "org.eclipse.emf.facet.efacet.ui"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.modisco.facet.efacet.ui"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IQueryCreationPagePart2.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IQueryCreationPagePart2.java
index 584e4c4..9e3a7ad 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IQueryCreationPagePart2.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IQueryCreationPagePart2.java
@@ -119,7 +119,7 @@
 	public Query performFinish();

 

 	/**

-	 * This method is called by the {@link org.eclipse.emf.facet.efacet.ui.internal.wizards.pages.CreateQueryWizardPage}.

+	 * This method is called by the {@link org.eclipse.modisco.facet.efacet.ui.internal.wizards.pages.CreateQueryWizardPage}.

 	 * 

 	 * @param parent

 	 *            the Wizard's composite to be completed with specific widget for this {@link Query} creation.

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/ImageProvider.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/ImageProvider.java
index c7888be..b88afc1 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/ImageProvider.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/ImageProvider.java
@@ -23,7 +23,7 @@
  * @author Grégoire Dupé (Mia-Software)

  */

 @Deprecated

-//Copied from org.eclipse.emf.facet.infra.query.ui.ImageProvider

+//Copied from org.eclipse.modisco.facet.infra.query.ui.ImageProvider

 public final class ImageProvider {

 	//	private static final String MODEL_QUERY = "icons/modelQuery.png"; //$NON-NLS-1$

 	private static final String REMOVE = "icons/remove.gif"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Messages.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Messages.java
index af1cb04..f097647 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Messages.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Messages.java
@@ -9,8 +9,8 @@
  * Contributors:

  * 	  Nicolas Guyomar (Mia-Software) - Bug 349546 - EMF Facet facetSet editor

  *    Nicolas Bros (Mia-Software) - Bug 370442 - rewrite the Facet loading dialog for v0.2

- *    Grégoire Dupé (Mia-Software) - copied from org.eclipse.emf.facet.infra.query.ui.Messages

- *    Nicolas Bros (Mia-Software) - copied from org.eclipse.emf.facet.infra.query.ui.Messages

+ *    Grégoire Dupé (Mia-Software) - copied from org.eclipse.modisco.facet.infra.query.ui.Messages

+ *    Nicolas Bros (Mia-Software) - copied from org.eclipse.modisco.facet.infra.query.ui.Messages

  *    Gregoire Dupe (Mia-Software) - Bug 364325 - [Restructuring] The user must be able to navigate into a model using the Facet.

  *    Nicolas Bros (Mia-Software) - Bug 372732 - [Facet] Rewrite the catalog views for 0.2

  *    Nicolas Bros (Mia-Software) - Bug 372865 - FacetSet selection dialog

@@ -24,7 +24,7 @@
 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.emf.facet.efacet.ui.internal.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.modisco.facet.efacet.ui.internal.messages"; //$NON-NLS-1$

 

 	public static String Enter_a_nsUri;

 	public static String Please_enter_nsUri;

@@ -138,7 +138,7 @@
 	public static String JavaQueryWizardPage_has_side_effect;

 	public static String JavaQueryWizardPage_Query_name;

 	

-	//Begin copied from org.eclipse.emf.facet.infra.query.ui.Messages

+	//Begin copied from org.eclipse.modisco.facet.infra.query.ui.Messages

 	public static String QueryExecutionView_0;

 	public static String QueryExecutionView_1;

 	public static String QueryExecutionView_classpathWarning;

@@ -162,7 +162,7 @@
 	public static String QueryExecutionView_QueryException;

 	public static String QueryExecutionView_QueryReturnedNull;

 	public static String QueryExecutionView_SelectQueryToExecute;

-	//End copied from org.eclipse.emf.facet.infra.query.ui.Messages

+	//End copied from org.eclipse.modisco.facet.infra.query.ui.Messages

 	

 	static {

 		// initialize resource bundle

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/actions/LoadMetaModelResourceAction.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/actions/LoadMetaModelResourceAction.java
index b492ac5..0c64326 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/actions/LoadMetaModelResourceAction.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/actions/LoadMetaModelResourceAction.java
@@ -31,7 +31,7 @@
 import org.eclipse.ui.PlatformUI;

 import org.eclipse.ui.dialogs.ElementListSelectionDialog;

 

-// This class has been copied from org.eclipse.emf.facet.infra.facet.editor.presentation.LoadMetaModelResourceAction

+// This class has been copied from org.eclipse.modisco.facet.infra.facet.editor.presentation.LoadMetaModelResourceAction

 

 /**

  * @author Gregoire Dupe

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/EFacetUIConstants.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/EFacetUIConstants.java
index 132687b..efe1581 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/EFacetUIConstants.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/EFacetUIConstants.java
@@ -12,7 +12,7 @@
 

 public final class EFacetUIConstants {

 

-	private static final String CATALOG_VIEW_ID = "org.eclipse.emf.facet.efacet.ui.view.catalog"; //$NON-NLS-1$

+	private static final String CATALOG_VIEW_ID = "org.eclipse.modisco.facet.efacet.ui.view.catalog"; //$NON-NLS-1$

 

 	private EFacetUIConstants() {

 		// utility class

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/view/INavigationView.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/view/INavigationView.java
index 82f2c34..d92e031 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/view/INavigationView.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/view/INavigationView.java
@@ -106,7 +106,7 @@
 

 	/**

 	 * This method returns the list of {@link IETypedElementResultDisplayerOpener} which have

-	 * been resisted using the org.eclipse.emf.facet.efacet.ui.displayeropener extension point.

+	 * been resisted using the org.eclipse.modisco.facet.efacet.ui.displayeropener extension point.

 	 * 

 	 * @return a list of {@link IETypedElementResultDisplayerOpener}

 	 */

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/ContextPaneMenuManager.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/ContextPaneMenuManager.java
index 0643a79..0639c40 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/ContextPaneMenuManager.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/ContextPaneMenuManager.java
@@ -25,7 +25,7 @@
 import org.eclipse.swt.events.KeyEvent;

 

 @SuppressWarnings("synthetic-access")

-//Copied from org.eclipse.emf.facet.infra.query.ui.views.queryExecution.internal.ContextPaneMenuManager

+//Copied from org.eclipse.modisco.facet.infra.query.ui.views.queryExecution.internal.ContextPaneMenuManager

 public class ContextPaneMenuManager extends MenuManager implements IMenuListener {

 

 	private final EditableContext context;

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/DropAdapter.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/DropAdapter.java
index e27d07b..5cc60d8 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/DropAdapter.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/DropAdapter.java
@@ -27,7 +27,7 @@
  * transferred locally (i.e. through {@link LocalTransfer}), and calls the given

  * {@link DropAction} with the dropped {@link EObject}s.

  */

-//Copied from org.eclipse.emf.facet.infra.query.ui.views.queryExecution.internal.DropAdapter

+//Copied from org.eclipse.modisco.facet.infra.query.ui.views.queryExecution.internal.DropAdapter

 public class DropAdapter implements DropTargetListener {

 

 	private final DropAction dropAction;

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/EditableContext.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/EditableContext.java
index 94f04d7..86d2daf 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/EditableContext.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/EditableContext.java
@@ -14,7 +14,7 @@
 import org.eclipse.emf.ecore.EObject;

 

 /** An interface that supports editing the query context */

-//Copied from org.eclipse.emf.facet.infra.query.ui.views.queryExecution.internal.EditableContext

+//Copied from org.eclipse.modisco.facet.infra.query.ui.views.queryExecution.internal.EditableContext

 public interface EditableContext {

 	void add(EObject eObject);

 

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationView.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationView.java
index 4934f53..2fc7cb2 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationView.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationView.java
@@ -109,7 +109,7 @@
 import org.eclipse.ui.part.ViewPart;

 import org.eclipse.ui.part.WorkbenchPart;

 

-//Copied from org.eclipse.emf.facet.infra.query.ui.views.queryExecution.internal.QueryExecutionView

+//Copied from org.eclipse.modisco.facet.infra.query.ui.views.queryExecution.internal.QueryExecutionView

 public class NavigationView extends ViewPart implements INavigationView {

 

 	/**

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationViewFactory.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationViewFactory.java
index e9b24da..c8f914b 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationViewFactory.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationViewFactory.java
@@ -27,7 +27,7 @@
 

 public class NavigationViewFactory implements INavigationViewFactory {

 

-	public static final String VIEW_ID = "org.eclipse.emf.facet.efacet.ui.view.navigation"; //$NON-NLS-1$

+	public static final String VIEW_ID = "org.eclipse.modisco.facet.efacet.ui.view.navigation"; //$NON-NLS-1$

 

 	/*

 	 * FIXME gdupe> It would be better if that method would be able to throw an

diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/QueryResultDisplayersRegistry.java b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/QueryResultDisplayersRegistry.java
index ad2bb5c..56b996e 100644
--- a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/QueryResultDisplayersRegistry.java
+++ b/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/QueryResultDisplayersRegistry.java
@@ -27,7 +27,7 @@
  * The singleton registry of {@link IETypedElementResultDisplayer}s, which initializes

  * the registry by reading extensions when first accessed.

  */

-//Copied from org.eclipse.emf.facet.infra.query.ui.views.queryExecution.internal.QueryResultDisplayersRegistry

+//Copied from org.eclipse.modisco.facet.infra.query.ui.views.queryExecution.internal.QueryResultDisplayersRegistry

 public class QueryResultDisplayersRegistry extends AbstractRegistry {

 

 	private static final String EXTENSION_POINT_NAME = "eTypedElementResultDisplay"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.facet.feature/feature.xml b/org.eclipse.modisco.facet.feature/feature.xml
index dc683c4..39905e9 100644
--- a/org.eclipse.modisco.facet.feature/feature.xml
+++ b/org.eclipse.modisco.facet.feature/feature.xml
@@ -24,161 +24,161 @@
    </license>

 

    <plugin

-         id="org.eclipse.emf.facet.common.core"

+         id="org.eclipse.modisco.facet.common.core"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.common.ui"

+         id="org.eclipse.modisco.facet.common.ui"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.custom.core"

+         id="org.eclipse.modisco.facet.custom.core"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.custom.metamodel"

+         id="org.eclipse.modisco.facet.custom.metamodel"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.custom.ui"

+         id="org.eclipse.modisco.facet.custom.ui"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.efacet.core"

+         id="org.eclipse.modisco.facet.efacet.core"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.efacet.edit.core"

+         id="org.eclipse.modisco.facet.efacet.edit.core"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.efacet.metamodel"

+         id="org.eclipse.modisco.facet.efacet.metamodel"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.efacet.ui"

+         id="org.eclipse.modisco.facet.efacet.ui"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.query.java.core"

+         id="org.eclipse.modisco.facet.query.java.core"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.query.java.metamodel"

+         id="org.eclipse.modisco.facet.query.java.metamodel"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.util.core"

+         id="org.eclipse.modisco.facet.util.core"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.util.emf.catalog"

+         id="org.eclipse.modisco.facet.util.emf.catalog"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.util.emf.catalog.metamodel"

+         id="org.eclipse.modisco.facet.util.emf.catalog.metamodel"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.util.emf.core"

+         id="org.eclipse.modisco.facet.util.emf.core"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.util.emf.ui"

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

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.util.jface.ui"

+         id="org.eclipse.modisco.facet.util.jface.ui"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.util.pde.core"

+         id="org.eclipse.modisco.facet.util.pde.core"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.util.swt"

+         id="org.eclipse.modisco.facet.util.swt"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.util.ui"

+         id="org.eclipse.modisco.facet.util.ui"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.widgets"

+         id="org.eclipse.modisco.facet.widgets"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.widgets.celleditors"

+         id="org.eclipse.modisco.facet.widgets.celleditors"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.facet.widgets.celleditors.ecore"

+         id="org.eclipse.modisco.facet.widgets.celleditors.ecore"

          download-size="0"

          install-size="0"

          version="0.0.0"

diff --git a/org.eclipse.modisco.facet.query.java.core/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.query.java.core/OSGI-INF/l10n/bundle.properties
index cce97b5..1d6658e 100644
--- a/org.eclipse.modisco.facet.query.java.core/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.query.java.core/OSGI-INF/l10n/bundle.properties
@@ -7,8 +7,8 @@
 #  http://www.eclipse.org/legal/epl-v10.html

 # 

 #  Contributors:

-#  	Nicolas Guyomar (Mia-Software) - Bug 334615 - Java Query for EMF Facet

+#  	Nicolas Guyomar (Mia-Software) - Bug 334615 - Java Query for MoDisco Facet

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

 #Properties file for org.eclipse.modisco.facet.query.java.core

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet Java Query Core
\ No newline at end of file
+Bundle-Name = MoDisco Facet Java Query Core
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery2.java b/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery2.java
index d099049..cdd83a1 100644
--- a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery2.java
+++ b/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery2.java
@@ -28,7 +28,7 @@
  */

 public interface IJavaQuery2<T extends EObject, R> {

 	// This interface is a copy of

-	// org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery<T, R>

+	// org.eclipse.modisco.facet.infra.query.core.java.IJavaModelQuery<T, R>

 

 	/**

 	 * This method must be implemented by each sub class to implement query

diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery3.java b/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery3.java
index 48d46e7..c4c1522 100644
--- a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery3.java
+++ b/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery3.java
@@ -30,7 +30,7 @@
  */

 public interface IJavaQuery3<T extends EObject, R> {

 	// This interface is a copy of

-	// org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery<T, R>

+	// org.eclipse.modisco.facet.infra.query.core.java.IJavaModelQuery<T, R>

 

 	/**

 	 * This method must be implemented by each sub class to implement query

diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IParameterValueList2.java b/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IParameterValueList2.java
index 9046888..2ca32a9 100644
--- a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IParameterValueList2.java
+++ b/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IParameterValueList2.java
@@ -25,7 +25,7 @@
  */

 public interface IParameterValueList2 extends List<ParameterValue> {

 	// This interface is a rewrite of

-		// org.eclipse.emf.facet.infra.query.core.java.ParameterValueList

+		// org.eclipse.modisco.facet.infra.query.core.java.ParameterValueList

 

 		/**

 		 * Return the value of the parameter with the specified name.

diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/ParameterValueList2.java b/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/ParameterValueList2.java
index 8d9b49a..8022f0d 100644
--- a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/ParameterValueList2.java
+++ b/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/ParameterValueList2.java
@@ -24,7 +24,7 @@
 

 public class ParameterValueList2 extends ArrayList<ParameterValue> implements IParameterValueList2 {

 	// This class is a copy of

-	// org.eclipse.emf.facet.infra.query.core.java.ParameterValueList

+	// org.eclipse.modisco.facet.infra.query.core.java.ParameterValueList

 

 	private static final long serialVersionUID = 1L;

 

diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/evaluator/JavaQueryImplementation.java b/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/evaluator/JavaQueryImplementation.java
index 0b7ba85..9298543 100644
--- a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/evaluator/JavaQueryImplementation.java
+++ b/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/evaluator/JavaQueryImplementation.java
@@ -32,7 +32,7 @@
 public class JavaQueryImplementation implements IQueryImplementation {

 

 	// This class is a modified copy of :

-	// org.eclipse.emf.facet.infra.query.core.java.internal.JavaModelQueryAdapter

+	// org.eclipse.modisco.facet.infra.query.core.java.internal.JavaModelQueryAdapter

 

 	private final IJavaQuery2<EObject, ?> javaQuery2;

 	private final IJavaQuery3<EObject, ?> javaQuery3;

diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/plugin/Activator.java b/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/plugin/Activator.java
index 08a30ca..c0bb0fa 100644
--- a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/plugin/Activator.java
+++ b/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/plugin/Activator.java
@@ -19,7 +19,7 @@
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.emf.facet.query.java.core"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.modisco.facet.query.java.core"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/org.eclipse.modisco.facet.query.java.metamodel/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.query.java.metamodel/OSGI-INF/l10n/bundle.properties
index bceef9d..c620631 100644
--- a/org.eclipse.modisco.facet.query.java.metamodel/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.query.java.metamodel/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.modisco.facet.query.java.metamodel

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet Java Query Metamodel

+Bundle-Name = MoDisco Facet Java Query Metamodel

diff --git a/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/internal/Activator.java b/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/internal/Activator.java
index 2b00b56..6e61ab4 100644
--- a/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/internal/Activator.java
+++ b/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/internal/Activator.java
@@ -7,7 +7,7 @@
 public class Activator extends Plugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.emf.facet.query.java.metamodel"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.modisco.facet.query.java.metamodel"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/org.eclipse.modisco.facet.util.core/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.util.core/OSGI-INF/l10n/bundle.properties
index eb6192a..f615cd9 100644
--- a/org.eclipse.modisco.facet.util.core/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.util.core/OSGI-INF/l10n/bundle.properties
@@ -11,4 +11,4 @@
 ###########################################################################

 #Properties file for org.eclipse.modisco.facet.util.core

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet's Common Utils
\ No newline at end of file
+Bundle-Name = MoDisco Facet's Common Utils
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/DebugUtils.java b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/DebugUtils.java
index 5b504ac..9be9df0 100644
--- a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/DebugUtils.java
+++ b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/DebugUtils.java
@@ -8,7 +8,7 @@
  *

  * Contributors:

  *    Grégoire Dupé (Mia-Software) - Bug 366804 - [Restructuring] Table widget upgrade

- *    Grégoire Dupé - Bug 365843 - [Unit Test Failure][0.2/3.8][0.2/4.2] org.eclipse.emf.facet.widgets.nattable.tests.swtbot.Bug344925Test.testBug344925

+ *    Grégoire Dupé - Bug 365843 - [Unit Test Failure][0.2/3.8][0.2/4.2] org.eclipse.modisco.facet.widgets.nattable.tests.swtbot.Bug344925Test.testBug344925

  *    Grégoire Dupé - Bug 367613 - Table widget refactoring

  *    Grégoire Dupé (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

  *    Grégoire Dupé (Mia-Software) - Bug 373078 - API Cleaning

diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/Logger.java b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/Logger.java
index 05a6c53..0d3ff59 100644
--- a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/Logger.java
+++ b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/Logger.java
@@ -8,8 +8,8 @@
  * Contributors:

  *    Fabien Giquel (Mia-Software) - initial API and implementation

  *    Nicolas Bros (Mia-Software)

- *    Nicolas Bros (Mia-Software) - Bug 339657 - Move Logger to org.eclipse.emf.facet.util.core

- *    Nicolas Bros (Mia-Software) - Bug 340031 - NPE in org.eclipse.emf.facet.util.core.Logger#log

+ *    Nicolas Bros (Mia-Software) - Bug 339657 - Move Logger to org.eclipse.modisco.facet.util.core

+ *    Nicolas Bros (Mia-Software) - Bug 340031 - NPE in org.eclipse.modisco.facet.util.core.Logger#log

  *    Grégoire Dupé (Mia-Software) - Bug 483451 - Logger and DebugUtils : Add "String.format" API

  *******************************************************************************/

 package org.eclipse.modisco.facet.util.core;

diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Activator.java b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Activator.java
index 11df62c..9ac0552 100644
--- a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Activator.java
+++ b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Activator.java
@@ -8,7 +8,7 @@
  * 

  * Contributors:

  * 	 Gregoire Dupe (Mia-Software) - Bug 338811 - A model registration method in the interface ICatalogSetManager

- *   Nicolas Bros (Mia-Software) - Bug 340031 - NPE in org.eclipse.emf.facet.util.core.Logger#log

+ *   Nicolas Bros (Mia-Software) - Bug 340031 - NPE in org.eclipse.modisco.facet.util.core.Logger#log

  *   Nicolas Guyomar (Mia-Software) - Bug 340339 - Need some Utils class for Folder/File/Project management

  */

 package org.eclipse.modisco.facet.util.core.internal;

@@ -18,7 +18,7 @@
 

 public class Activator extends Plugin {

 

-	public static final String PLUGIN_ID = "org.eclipse.emf.facet.util.core"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.modisco.facet.util.core"; //$NON-NLS-1$

 	private static BundleContext context;

 	private static Activator plugin;

 

diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Messages.java b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Messages.java
index 657cadf..d440f79 100644
--- a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Messages.java
+++ b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Messages.java
@@ -15,7 +15,7 @@
 import org.eclipse.osgi.util.NLS;

 

 public final class Messages extends NLS {

-	private static String BUNDLE_NAME = "org.eclipse.emf.facet.util.core.internal.messages"; //$NON-NLS-1$

+	private static String BUNDLE_NAME = "org.eclipse.modisco.facet.util.core.internal.messages"; //$NON-NLS-1$

 	public static String AbstractRegistry_id;

 	public static String AbstractRegistry_colon;

 	public static String AbstractRegistry_requiredAttributeNotDefined;

diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/AbstractRegistry.java b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/AbstractRegistry.java
index 99a2ea5..b124c60 100644
--- a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/AbstractRegistry.java
+++ b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/AbstractRegistry.java
@@ -31,7 +31,7 @@
  * @since 0.2

  */

 public abstract class AbstractRegistry {

-// copy of org.eclipse.emf.facet.infra.common.core.internal.extensions.AbstractRegistry

+// copy of org.eclipse.modisco.facet.infra.common.core.internal.extensions.AbstractRegistry

 	/**

 	 * Initialize the registry by reading the extension point to discover

 	 * extensions. This method calls

diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FileUtils.java b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FileUtils.java
index b009397..eb9b302 100644
--- a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FileUtils.java
+++ b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FileUtils.java
@@ -10,7 +10,7 @@
  *    Nicolas Guyomar (Mia-Software) - Bug 340339 - Need some Utils class for Folder/File/Project management

  *    Nicolas Guyomar (Mia-Software) - Bug 342451 - To be able to edit derived facet attributes and derived facet references in a table

  *    Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning

- *    Thomas Cicognani (Soft-Maint) - Bug 398079 - org.eclipse.emf.facet.util.core.internal.exported.FileUtils.copyFolderFromBundle 

+ *    Thomas Cicognani (Soft-Maint) - Bug 398079 - org.eclipse.modisco.facet.util.core.internal.exported.FileUtils.copyFolderFromBundle 

  *******************************************************************************/

 package org.eclipse.modisco.facet.util.core.internal.exported;

 

@@ -36,7 +36,7 @@
  */

 public final class FileUtils {

 

-	// This class has been copied from org.eclipse.emf.facet.infra.common.core.internal.utils.FileUtils

+	// This class has been copied from org.eclipse.modisco.facet.infra.common.core.internal.utils.FileUtils

 

 	private static final int COPY_BUFFER_SIZE = 512 * 1024;

 

diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FolderUtils.java b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FolderUtils.java
index 6bf882d..7c9e781 100644
--- a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FolderUtils.java
+++ b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FolderUtils.java
@@ -27,7 +27,7 @@
  */

 public final class FolderUtils {

 

-	// This class has been copied from org.eclipse.emf.facet.infra.common.core.internal.utils.FolderUtils

+	// This class has been copied from org.eclipse.modisco.facet.infra.common.core.internal.utils.FolderUtils

 

 	private FolderUtils() {

 		// prevent instantiation

diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/IFilter.java b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/IFilter.java
index c3c5671..7d00981 100644
--- a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/IFilter.java
+++ b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/IFilter.java
@@ -17,7 +17,7 @@
  * @since 0.2

  */

 public interface IFilter<T> {

-	// This class has been copied from org.eclipse.emf.facet.infra.common.core.internal.utils.IFilter

+	// This class has been copied from org.eclipse.modisco.facet.infra.common.core.internal.utils.IFilter

 	

 	/**

 	 * @param object

diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/StringUtils.java b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/StringUtils.java
index b47475a..57050a6 100644
--- a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/StringUtils.java
+++ b/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/StringUtils.java
@@ -23,7 +23,7 @@
  * @author Gabriel Barbier

  * @since 0.2

  */

-// Copied from org.eclipse.emf.facet.infra.common.core.internal.utils.StringUtils

+// Copied from org.eclipse.modisco.facet.infra.common.core.internal.utils.StringUtils

 public final class StringUtils {

 	public static final String ELLIPSIS = Messages.StringUtils_ellipsis;

 	private static final int TRUNCATE_AFTER = 150;

diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.util.emf.catalog.metamodel/OSGI-INF/l10n/bundle.properties
index caf5de6..630d445 100644
--- a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.util.emf.catalog.metamodel/OSGI-INF/l10n/bundle.properties
@@ -7,4 +7,4 @@
 # Contributors:

 #    Grégoire Dupé (Mia-Software) - Bug 477657 - The catalog manager should be able to manage workspace model

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet Catalog Meta-Model
\ No newline at end of file
+Bundle-Name = MoDisco Facet Catalog Meta-Model
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.util.emf.catalog/OSGI-INF/l10n/bundle.properties
index e384b88..7e96ee8 100644
--- a/org.eclipse.modisco.facet.util.emf.catalog/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.util.emf.catalog/OSGI-INF/l10n/bundle.properties
@@ -10,4 +10,4 @@
 ###############################################################################

 #Properties file for org.eclipse.modisco.facet.core

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet Catalog Metamodel
\ No newline at end of file
+Bundle-Name = MoDisco Facet Catalog Metamodel
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.util.emf.core/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.util.emf.core/OSGI-INF/l10n/bundle.properties
index 6dbc8ba..f312fd5 100644
--- a/org.eclipse.modisco.facet.util.emf.core/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.util.emf.core/OSGI-INF/l10n/bundle.properties
@@ -13,7 +13,7 @@
 ###############################################################################

 #Properties file for org.eclipse.modisco.facet.util.emf.core

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Utils

+Bundle-Name = MoDisco Facet Utils

 extension-point.name = catalogManager

 extension-point.name.0 = modeldeclaration

 

diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/EmfDebugUtils.java b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/EmfDebugUtils.java
index 938f4dd..9501b5a 100644
--- a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/EmfDebugUtils.java
+++ b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/EmfDebugUtils.java
@@ -8,8 +8,8 @@
  *

  * Contributors:

  *    Gregoire Dupe (Mia-Software) - Bug 366804 - [Restructuring] Table widget upgrade

- *    Grégoire Dupé (Mia-Software) - Bug 365843 - [Unit Test Failure][0.2/3.8][0.2/4.2] org.eclipse.emf.facet.widgets.nattable.tests.swtbot.Bug344925Test.testBug344925

- *    Grégoire Dupé (Mia-Software) - Bug 367700 - [Unit Test Failure][0.2/3.8] org.eclipse.emf.facet.widgets.table.tests.internal.v0_2.swtbot.NatTableUITests.testOpenLoadCustomizationDialog

+ *    Grégoire Dupé (Mia-Software) - Bug 365843 - [Unit Test Failure][0.2/3.8][0.2/4.2] org.eclipse.modisco.facet.widgets.nattable.tests.swtbot.Bug344925Test.testBug344925

+ *    Grégoire Dupé (Mia-Software) - Bug 367700 - [Unit Test Failure][0.2/3.8] org.eclipse.modisco.facet.widgets.table.tests.internal.v0_2.swtbot.NatTableUITests.testOpenLoadCustomizationDialog

  *    Grégoire Dupé (Mia-Software) - Bug 373078 - API Cleaning

  *******************************************************************************/

 package org.eclipse.modisco.facet.util.emf.core;
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogSetManager2.java b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogSetManager2.java
index 7222428..7620063 100644
--- a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogSetManager2.java
+++ b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogSetManager2.java
@@ -9,7 +9,7 @@
  * Contributors:

  * 	 Grégoire Dupé (Mia-Software) - Bug 334000 Simple catalog manager

  *   Nicolas Guyomar (Mia-Software) - Bug 334000 Simple catalog manager

- *   Nicolas Guyomar (Mia-Software) - Bug 334529 ICatalogManager should be exposed in org.eclipse.emf.facet.common.core

+ *   Nicolas Guyomar (Mia-Software) - Bug 334529 ICatalogManager should be exposed in org.eclipse.modisco.facet.common.core

  *   Nicolas Guyomar (Mia-Software) - Bug 338811 - A model registration method in the interface ICatalogSetManager

  *   Grégoire Dupé (Mia-Software) - Bug 362084 - Get the instance of a catalog manager

  */

diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEObjectBrowserOpener.java b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEObjectBrowserOpener.java
index c92edcb..f901ae5 100644
--- a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEObjectBrowserOpener.java
+++ b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEObjectBrowserOpener.java
@@ -17,7 +17,7 @@
 /**

  * This class is used to register a Browser (typically an Eclipse editor or view), that can be

  * opened from a given EObject. The registration is done through the

- * "org.eclipse.emf.facet.util.emf.core.modelViewer" extension point.

+ * "org.eclipse.modisco.facet.util.emf.core.modelViewer" extension point.

  */

 public interface IEObjectBrowserOpener {

 

diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEPackageBrowserOpener.java b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEPackageBrowserOpener.java
index f2636fb..69a0e5e 100644
--- a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEPackageBrowserOpener.java
+++ b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEPackageBrowserOpener.java
@@ -17,7 +17,7 @@
 /**

  * This class is used to register a Browser (typically an Eclipse editor or view), that can be

  * opened from a given EPackage. The registration is done through the

- * "org.eclipse.emf.facet.util.emf.core.modelViewer" extension point.

+ * "org.eclipse.modisco.facet.util.emf.core.modelViewer" extension point.

  */

 public interface IEPackageBrowserOpener {

 

diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IResourceBrowserOpener.java b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IResourceBrowserOpener.java
index 93fc59c..e6f19d0 100644
--- a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IResourceBrowserOpener.java
+++ b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IResourceBrowserOpener.java
@@ -17,7 +17,7 @@
 /**

  * This class is used to register a Browser (typically an Eclipse editor or view), that can be

  * opened from a given EMF Resource. The registration is done through the

- * "org.eclipse.emf.facet.util.emf.core.modelViewer" extension point.

+ * "org.eclipse.modisco.facet.util.emf.core.modelViewer" extension point.

  */

 public interface IResourceBrowserOpener {

 

diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ModelUtils.java b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ModelUtils.java
index df3f0b8..abb3186 100644
--- a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ModelUtils.java
+++ b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ModelUtils.java
@@ -66,7 +66,7 @@
 	 * Computes a list of {@link EObject}s from the same {@link ResourceSet} as

 	 * <code>source</code> that can be assigned to the given feature.

 	 */

-	//Copied from org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils.computeAssignableElements(EStructuralFeature, EObject)

+	//Copied from org.eclipse.modisco.facet.infra.common.core.internal.utils.ModelUtils.computeAssignableElements(EStructuralFeature, EObject)

 	public static List<EObject> computeAssignableElements(final EStructuralFeature feature,

 			final EObject source) {

 		EClassifier eType = feature.getEType();

@@ -104,7 +104,7 @@
 	 *            the metaclass whose subclasses must be found

 	 * @return all the subclasses

 	 */

-	//Copied from org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils.allSubClasses(final EClass context)

+	//Copied from org.eclipse.modisco.facet.infra.common.core.internal.utils.ModelUtils.allSubClasses(final EClass context)

 	public static List<EClass> allSubClasses(final EClass context) {

 		List<EClass> result = new ArrayList<EClass>();

 		// Set<Resource> resources = new HashSet<Resource>();

@@ -128,13 +128,13 @@
 		return result;

 	}

 	

-	//Copied from org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils.isSuperTypeOf(final EClass self, final EClass typeDeclaration)

+	//Copied from org.eclipse.modisco.facet.infra.common.core.internal.utils.ModelUtils.isSuperTypeOf(final EClass self, final EClass typeDeclaration)

 	public static boolean isSuperTypeOf(final EClass self, final EClass typeDeclaration) {

 		return typeDeclaration.getEAllSuperTypes().contains(self);

 	}

 	

 	/** @return the qualified name of the given metaclass */

-	//Copied from org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils.getMetaclassQualifiedName(final EClassifier eClass)

+	//Copied from org.eclipse.modisco.facet.infra.common.core.internal.utils.ModelUtils.getMetaclassQualifiedName(final EClassifier eClass)

 	public static String getMetaclassQualifiedName(final EClassifier eClass) {

 		final ArrayList<String> qualifiedNameParts = new ArrayList<String>();

 		final StringBuilder builder = new StringBuilder();

@@ -160,7 +160,7 @@
 	 * 

 	 * @return a name for the given element

 	 */

-	//Copied from org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils.getName(EObject)

+	//Copied from org.eclipse.modisco.facet.infra.common.core.internal.utils.ModelUtils.getName(EObject)

 	public static String getName(final EObject eObject) {

 		IItemLabelProvider itemLabelProvider = (IItemLabelProvider) new ComposedAdapterFactory(

 				ComposedAdapterFactory.Descriptor.Registry.INSTANCE).adapt(eObject, IItemLabelProvider.class);

@@ -174,7 +174,7 @@
 	 * @return a default name based on a string feature of the given

 	 *         {@link EObject}

 	 */

-	//Copied from org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils.getDefaultName(EObject)

+	//Copied from org.eclipse.modisco.facet.infra.common.core.internal.utils.ModelUtils.getDefaultName(EObject)

 	public static String getDefaultName(final EObject eObject) {

 		// find a feature that can be used as a name

 		final EStructuralFeature feature = ModelUtils.getLabelFeature(eObject.eClass());

@@ -188,7 +188,7 @@
 	}

 	

 	//Copied from ReflectiveItemProvider class

-	//Copied from org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils.getLabelFeature(EClass)

+	//Copied from org.eclipse.modisco.facet.infra.common.core.internal.utils.ModelUtils.getLabelFeature(EClass)

 	private static EStructuralFeature getLabelFeature(final EClass eClass) {

 		EAttribute result = null;

 		for (final EAttribute eAttribute : eClass.getEAllAttributes()) {

diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/exception/DebugRuntimeException.java b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/exception/DebugRuntimeException.java
index 9012df7..d3646dc 100644
--- a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/exception/DebugRuntimeException.java
+++ b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/exception/DebugRuntimeException.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *    Grégoire Dupé - Bug 365843 - [Unit Test Failure][0.2/3.8][0.2/4.2]org.eclipse.emf.facet.widgets.nattable.tests.swtbot.Bug344925Test.testBug344925

+ *    Grégoire Dupé - Bug 365843 - [Unit Test Failure][0.2/3.8][0.2/4.2]org.eclipse.modisco.facet.widgets.nattable.tests.swtbot.Bug344925Test.testBug344925

  *    Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning

  *******************************************************************************/

 package org.eclipse.modisco.facet.util.emf.core.exception;

diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Activator.java b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Activator.java
index ff4c1b0..cb5c3ef 100644
--- a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Activator.java
+++ b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Activator.java
@@ -17,7 +17,7 @@
 

 public class Activator extends Plugin {

 

-	public static final String PLUGIN_ID = "org.eclipse.emf.facet.util.emf.core"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.modisco.facet.util.emf.core"; //$NON-NLS-1$

 

 	private static BundleContext context;

 	private static Activator plugin;

diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Messages.java b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Messages.java
index 8e5a4b5..8d0e998 100644
--- a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Messages.java
+++ b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Messages.java
@@ -14,7 +14,7 @@
 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.emf.facet.util.emf.core.internal.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.modisco.facet.util.emf.core.internal.messages"; //$NON-NLS-1$

 	public static String AddResourceContentCommand_Description;

 	public static String AddResourceContentCommand_Label;

 	public static String SetResourceContentCommand_Description;

diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/CatalogSetManager.java b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/CatalogSetManager.java
index f3a39da..b5551d0 100644
--- a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/CatalogSetManager.java
+++ b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/CatalogSetManager.java
@@ -9,12 +9,12 @@
  * Contributors:

  * 	  Grégoire Dupé (Mia-Software) - Bug 334000 Simple catalog manager

  *    Nicolas Guyomar (Mia-Software) - Bug 334000 Simple catalog manager

- *    Nicolas Guyomar (Mia-Software) - Bug 334529 - ICatalogManager should be exposed in org.eclipse.emf.facet.common.core

+ *    Nicolas Guyomar (Mia-Software) - Bug 334529 - ICatalogManager should be exposed in org.eclipse.modisco.facet.common.core

  *    Nicolas Guyomar (Mia-Software) - Bug 338811 - A model registration method in the interface ICatalogSetManager

  *    Grégoire Dupé (Mia-Software) - Bug 338811 - A model registration method in the interface ICatalogSetManager

  *    Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values.

  *    Grégoire Dupé (Mia-Software) - Bug 362084 - Get the instance of a catalog manager

- *    Grégoire Dupé (Mia-Software) - Bug 362087 - [Deprecated] org.eclipse.emf.facet.util.emf.core.ICatalogSetManager

+ *    Grégoire Dupé (Mia-Software) - Bug 362087 - [Deprecated] org.eclipse.modisco.facet.util.emf.core.ICatalogSetManager

  *    Grégoire Dupé (Mia-Software) - Bug 477657 - The catalog manager should be able to manage workspace model

  */

 package org.eclipse.modisco.facet.util.emf.core.internal.catalog;

@@ -52,8 +52,8 @@
 @Deprecated

 public class CatalogSetManager implements ICatalogSetManager2, Adapter {

 

-	private static final String CATALOG_MGR_EXTENSION_POINT_ID = "org.eclipse.emf.facet.util.emf.core.catalogmanager"; //$NON-NLS-1$

-	private static final String MODEL_DECLARATION_EXTENSION_POINT_ID = "org.eclipse.emf.facet.util.emf.core.modeldeclaration"; //$NON-NLS-1$

+	private static final String CATALOG_MGR_EXTENSION_POINT_ID = "org.eclipse.modisco.facet.util.emf.core.catalogmanager"; //$NON-NLS-1$

+	private static final String MODEL_DECLARATION_EXTENSION_POINT_ID = "org.eclipse.modisco.facet.util.emf.core.modeldeclaration"; //$NON-NLS-1$

 	private static final String CLASS = "class"; //$NON-NLS-1$

 	private static final String FILE = "file"; //$NON-NLS-1$

 

diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogManager.java b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogManager.java
index d79164d..887b4cf 100644
--- a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogManager.java
+++ b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogManager.java
@@ -44,7 +44,7 @@
 

 final class CatalogManager implements ICatalogManager, Adapter {

 

-	private static final String MODEL_DECL_EXT_PT = "org.eclipse.emf.facet.util.emf.core.modeldeclaration"; //$NON-NLS-1$

+	private static final String MODEL_DECL_EXT_PT = "org.eclipse.modisco.facet.util.emf.core.modeldeclaration"; //$NON-NLS-1$

 	private static final String FILE = "file"; //$NON-NLS-1$

 	private final Map<Resource, Bundle> resourceToBundle = new HashMap<Resource, Bundle>();

 	private final ICatalogManagerConfiguration catalogMgrconfig;

diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/exported/ICommandFactory.java b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/exported/ICommandFactory.java
index e460640..291dfae 100644
--- a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/exported/ICommandFactory.java
+++ b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/exported/ICommandFactory.java
@@ -26,7 +26,7 @@
  * 

  * @since 0.2

  */

-// Copied from org.eclipse.emf.facet.widgets.celleditors.ICommandFactory

+// Copied from org.eclipse.modisco.facet.widgets.celleditors.ICommandFactory

 public interface ICommandFactory {

 	/**

 	 * Whether this command factory should be used for the given {@link EditingDomain}

diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/registry/BrowserRegistry.java b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/registry/BrowserRegistry.java
index 60bf9eb..a85589d 100644
--- a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/registry/BrowserRegistry.java
+++ b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/registry/BrowserRegistry.java
@@ -45,7 +45,7 @@
 	private final List<IEObjectBrowserOpener> eobjectBrowserOpeners;

 	private final List<IResourceBrowserOpener> resourceBrowserOpeners;

 

-	public static final String EXTENSION_POINT_MODEL_VIEWER_ID = "org.eclipse.emf.facet.util.emf.core.modelViewer"; //$NON-NLS-1$

+	public static final String EXTENSION_POINT_MODEL_VIEWER_ID = "org.eclipse.modisco.facet.util.emf.core.modelViewer"; //$NON-NLS-1$

 

 	public static final String CLASS = "class"; //$NON-NLS-1$

 

@@ -155,7 +155,7 @@
 			}

 		}

 		// By default return the first editor registered through the extension

-		// point org.eclipse.emf.facet.util.emf.core.modelViewer

+		// point org.eclipse.modisco.facet.util.emf.core.modelViewer

 		if (!this.epackageBrowserOpeners.isEmpty()) {

 			return this.epackageBrowserOpeners.get(0);

 		}

@@ -178,7 +178,7 @@
 			}

 		}

 		// By default return the first editor registered through the extension

-		// point org.eclipse.emf.facet.util.emf.core.modelViewer

+		// point org.eclipse.modisco.facet.util.emf.core.modelViewer

 		if (!this.eobjectBrowserOpeners.isEmpty()) {

 			return this.eobjectBrowserOpeners.get(0);

 		}

@@ -201,7 +201,7 @@
 			}

 		}

 		// By default return the first editor registered through the extension

-		// point org.eclipse.emf.facet.util.emf.core.modelViewer

+		// point org.eclipse.modisco.facet.util.emf.core.modelViewer

 		if (!this.resourceBrowserOpeners.isEmpty()) {

 			return this.resourceBrowserOpeners.get(0);

 		}

diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/SerializationRegistry.java b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/SerializationRegistry.java
index e5659f3..b62ab5d 100644
--- a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/SerializationRegistry.java
+++ b/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/SerializationRegistry.java
@@ -26,7 +26,7 @@
 /** Registry for the "serialization" extension point */

 public class SerializationRegistry extends AbstractRegistry implements ISerializationRegistry {

 

-	private static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.emf.facet.util.emf.core"; //$NON-NLS-1$

+	private static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.modisco.facet.util.emf.core"; //$NON-NLS-1$

 	private static final String EXTENSION_POINT_NAME = "serialization"; //$NON-NLS-1$

 

 	private static final String SERIALIZER_ELEMENT = "serializer"; //$NON-NLS-1$

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 b16054a..0ea8bf7 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
@@ -1,11 +1,11 @@
 #Properties file for org.eclipse.modisco.facet.util.emf.ui

-category.name = EMF Facet

+category.name = MoDisco Facet

 view.name = EPackage Registry

-actionSet.label = EMF Facet Model Browser Actions

+actionSet.label = MoDisco Facet Model Browser Actions

 action.label = Open EPackage

 action.tooltip = Open a model from the EMF EPackage registry

 page.name = Default Browser

 Bundle-Vendor = Eclipse Modeling Project

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

-emf.facet.category.name = EMF Facet

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

+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/src/org/eclipse/modisco/facet/util/emf/ui/internal/Activator.java b/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Activator.java
index d9eb4b6..71ddb7e 100644
--- a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Activator.java
+++ b/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Activator.java
@@ -20,7 +20,7 @@
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.emf.facet.util.emf.ui"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.modisco.facet.util.emf.ui"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Messages.java b/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Messages.java
index 0bd31cb..47ed8e8 100644
--- a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Messages.java
+++ b/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Messages.java
@@ -17,7 +17,7 @@
 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.emf.facet.util.emf.ui.internal.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.modisco.facet.util.emf.ui.internal.messages"; //$NON-NLS-1$

 	public static String CreateInstanceDialog_selectNewInstanceEClass;

 	public static String PackageRegistryView_initializing;

 	public static String PackageRegistryView_copyNsURI;

diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/view/PackageRegistryView.java b/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/view/PackageRegistryView.java
index d82d905..33956c0 100644
--- a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/view/PackageRegistryView.java
+++ b/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/view/PackageRegistryView.java
@@ -57,7 +57,7 @@
 

 	private static final int COLUMN_WIDTH = 200;

 

-	private static final String DEBUG_ID = "org.eclipse.emf.facet.infra.common.ui/debug/PackageRegistryView/event_debug"; //$NON-NLS-1$

+	private static final String DEBUG_ID = "org.eclipse.modisco.facet.infra.common.ui/debug/PackageRegistryView/event_debug"; //$NON-NLS-1$

 	private static final boolean DEBUG = Activator.getDefault().isDebugging()

 			&& new Boolean(Platform.getDebugOption(PackageRegistryView.DEBUG_ID)).booleanValue();

 

diff --git a/org.eclipse.modisco.facet.util.jface.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.util.jface.ui/OSGI-INF/l10n/bundle.properties
index b6d814e..7c32d20 100644
--- a/org.eclipse.modisco.facet.util.jface.ui/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.util.jface.ui/OSGI-INF/l10n/bundle.properties
@@ -10,4 +10,4 @@
 ###############################################################################

 #Properties file for org.eclipse.modisco.facet.util.jface.ui.ui

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet JFace Utilities UI
\ No newline at end of file
+Bundle-Name = MoDisco Facet JFace Utilities UI
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.util.pde.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.facet.util.pde.core/META-INF/MANIFEST.MF
index 91ae8ad..5250ecb 100644
--- a/org.eclipse.modisco.facet.util.pde.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.facet.util.pde.core/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: EMF Facet PDE Core Utils
+Bundle-Name: MoDisco Facet PDE Core Utils
 Bundle-SymbolicName: org.eclipse.modisco.facet.util.pde.core
 Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.modisco.facet.util.pde.core.internal.Activator
diff --git a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/Activator.java b/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/Activator.java
index 6bbbd15..e758cb7 100644
--- a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/Activator.java
+++ b/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/Activator.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  * 

  * Contributors:

- *    Gregoire Dupe (Mia-Software) - Bug 417789 - org.eclipse.emf.facet.util.core should not so much dependencies

+ *    Gregoire Dupe (Mia-Software) - Bug 417789 - org.eclipse.modisco.facet.util.core should not so much dependencies

  */

  package org.eclipse.modisco.facet.util.pde.core.internal;

 

diff --git a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/BuildPropertiesUtils.java b/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/BuildPropertiesUtils.java
index 4b2b41c..b8731b6 100644
--- a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/BuildPropertiesUtils.java
+++ b/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/BuildPropertiesUtils.java
@@ -7,10 +7,10 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    Nicolas Bros (Mia-Software) - Bug 339991 - don't use internal APIs in org.eclipse.emf.facet.util.core.internal.BuildPropertiesUtils

+ *    Nicolas Bros (Mia-Software) - Bug 339991 - don't use internal APIs in org.eclipse.modisco.facet.util.core.internal.BuildPropertiesUtils

  *    Laurent Pichierri (Soft-Maint) - Bug 371204 - Compatibility with Helios

  *    Gregoire Dupe (Mia-Software) - Bug 371204 - Compatibility with Helios

- *    Gregoire Dupe (Mia-Software) - Bug 417789 - org.eclipse.emf.facet.util.core should not so much dependencies

+ *    Gregoire Dupe (Mia-Software) - Bug 417789 - org.eclipse.modisco.facet.util.core should not so much dependencies

  *******************************************************************************/

 package org.eclipse.modisco.facet.util.pde.core.internal;

 

@@ -34,7 +34,7 @@
 

 public final class BuildPropertiesUtils {

 

-	// This class has been copied from org.eclipse.emf.facet.infra.common.core.internal.utils.BuildPropertiesUtils

+	// This class has been copied from org.eclipse.modisco.facet.infra.common.core.internal.utils.BuildPropertiesUtils

 	

 	private BuildPropertiesUtils() {

 		// utilities class

diff --git a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/PluginUtils.java b/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/PluginUtils.java
index 6ebf35d..0acf0a7 100644
--- a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/PluginUtils.java
+++ b/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/PluginUtils.java
@@ -86,7 +86,7 @@
 public final class PluginUtils {

 

 	// This class has been copied from

-	// org.eclipse.emf.facet.infra.common.core.internal.utils.PluginUtils

+	// org.eclipse.modisco.facet.infra.common.core.internal.utils.PluginUtils

 

 	private PluginUtils() {

 		// utilities class

diff --git a/org.eclipse.modisco.facet.util.swt/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.util.swt/OSGI-INF/l10n/bundle.properties
index ae4e7d2..7de8475 100644
--- a/org.eclipse.modisco.facet.util.swt/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.util.swt/OSGI-INF/l10n/bundle.properties
@@ -10,4 +10,4 @@
 ###############################################################################

 #Properties file for org.eclipse.modisco.facet.util.swt

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet SWT Utilities

+Bundle-Name = MoDisco Facet SWT Utilities

diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/Activator.java b/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/Activator.java
index c31056d..3e280c2 100644
--- a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/Activator.java
+++ b/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/Activator.java
@@ -17,7 +17,7 @@
 public class Activator extends Plugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.emf.facet.util.swt"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.modisco.facet.util.swt"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/SWTTestUtils.java b/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/SWTTestUtils.java
index 668818b..9d3ef72 100644
--- a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/SWTTestUtils.java
+++ b/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/SWTTestUtils.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - Bug 372865 - FacetSet selection dialog

- *    Grégoire Dupé (Mia-Software) - Bug 470191 - [Unit Test Failure] org.eclipse.emf.facet.aggregate.tests.internal.CustomizationsCatalogViewTests.testCustomizationsView

+ *    Grégoire Dupé (Mia-Software) - Bug 470191 - [Unit Test Failure] org.eclipse.modisco.facet.aggregate.tests.internal.CustomizationsCatalogViewTests.testCustomizationsView

  *******************************************************************************/

 package org.eclipse.modisco.facet.util.swt.internal.exported;
 
diff --git a/org.eclipse.modisco.facet.util.tests.swtbot/META-INF/MANIFEST.MF b/org.eclipse.modisco.facet.util.tests.swtbot/META-INF/MANIFEST.MF
index ea713b1..0eacfc5 100644
--- a/org.eclipse.modisco.facet.util.tests.swtbot/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.facet.util.tests.swtbot/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: EMF Facet Util for SwtBot
+Bundle-Name: MoDisco Facet Util for SwtBot
 Bundle-SymbolicName: org.eclipse.modisco.facet.util.tests.swtbot
 Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.modisco.facet.util.tests.swtbot.internal.Activator
diff --git a/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/Activator.java b/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/Activator.java
index 19a5470..4c595d1 100644
--- a/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/Activator.java
+++ b/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/Activator.java
@@ -19,7 +19,7 @@
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.emf.facet.tests.util.swtbot"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.modisco.facet.tests.util.swtbot"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/exported/SWTBotUtils.java b/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/exported/SWTBotUtils.java
index 6c65bf0..649bf53 100644
--- a/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/exported/SWTBotUtils.java
+++ b/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/exported/SWTBotUtils.java
@@ -8,7 +8,7 @@
  * Contributors:

  *   Nicolas Guyomar (Mia-Software) - Bug 343811 - EMF Facet Regression : Created elements in a table are not serialized

  *   Nicolas Guyomar (Mia-Software) - Bug 342154 - EMF Facet API should be covered with Unit tests

- *   Gregoire Dupe (Mia-Software) - Bug 368030 - [Unit Test Failure] org.eclipse.emf.facet.widgets.table.tests.internal.v0_1.swtbot.NatTableUITests.testAddQueryColumn

+ *   Gregoire Dupe (Mia-Software) - Bug 368030 - [Unit Test Failure] org.eclipse.modisco.facet.widgets.table.tests.internal.v0_1.swtbot.NatTableUITests.testAddQueryColumn

  *   Gregoire Dupe (Mia-Software) - Bug 382109 - [Unit Test Failure] Timeout after: 5000 ms.: Timed out waiting for Shell {Resource - } to close

  *******************************************************************************/

 package org.eclipse.modisco.facet.util.tests.swtbot.internal.exported;

diff --git a/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/exported/ScreenShotUtils.java b/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/exported/ScreenShotUtils.java
index 1ce40f9..a96db72 100644
--- a/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/exported/ScreenShotUtils.java
+++ b/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/exported/ScreenShotUtils.java
@@ -6,9 +6,9 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *   Gregoire Dupe (Mia-Software) - Bug 367700 - [Unit Test Failure][0.2/3.8] org.eclipse.emf.facet.widgets.table.tests.internal.v0_2.swtbot.NatTableUITests.testOpenLoadCustomizationDialog

- *   Gregoire Dupe (Mia-Software) - Bug 368006 - [Unit Test Failure][0.2/3.8] org.eclipse.emf.facet.widgets.table.tests.internal.v0_2.swtbot.TableEditabilityTest.testSingleLineStringEditability

- *   Gregoire Dupe (Mia-Software) - Bug 368030 - [Unit Test Failure] org.eclipse.emf.facet.widgets.table.tests.internal.v0_1.swtbot.NatTableUITests.testAddQueryColumn

+ *   Gregoire Dupe (Mia-Software) - Bug 367700 - [Unit Test Failure][0.2/3.8] org.eclipse.modisco.facet.widgets.table.tests.internal.v0_2.swtbot.NatTableUITests.testOpenLoadCustomizationDialog

+ *   Gregoire Dupe (Mia-Software) - Bug 368006 - [Unit Test Failure][0.2/3.8] org.eclipse.modisco.facet.widgets.table.tests.internal.v0_2.swtbot.TableEditabilityTest.testSingleLineStringEditability

+ *   Gregoire Dupe (Mia-Software) - Bug 368030 - [Unit Test Failure] org.eclipse.modisco.facet.widgets.table.tests.internal.v0_1.swtbot.NatTableUITests.testAddQueryColumn

  *******************************************************************************/

 package org.eclipse.modisco.facet.util.tests.swtbot.internal.exported;

 

diff --git a/org.eclipse.modisco.facet.util.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.util.ui/OSGI-INF/l10n/bundle.properties
index 528b237..2058298 100644
--- a/org.eclipse.modisco.facet.util.ui/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.util.ui/OSGI-INF/l10n/bundle.properties
@@ -8,4 +8,4 @@
 #    Grégoire Dupé (Mia-Software) - Bug 367153 - synchronization utilities

 #Properties file for org.eclipse.modisco.facet.util.ui

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet UI Utilities
\ No newline at end of file
+Bundle-Name = MoDisco Facet UI Utilities
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/Messages.java b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/Messages.java
index 36b4c2f..7e0e23f 100644
--- a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/Messages.java
+++ b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/Messages.java
@@ -15,7 +15,7 @@
 import org.eclipse.osgi.util.NLS;

 

 public final class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.emf.facet.util.ui.internal.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.modisco.facet.util.ui.internal.messages"; //$NON-NLS-1$

 	public static String FilteredElementSelectionControl_type_filter_text;

 	public static String QuestionDialog_yes;

 	public static String QuestionDialog_no;

diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractExceptionFreeRunnable.java b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractExceptionFreeRunnable.java
index c9097c9..ff12e33 100644
--- a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractExceptionFreeRunnable.java
+++ b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractExceptionFreeRunnable.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *    Gr�goire Dup� (Mia-Software) - Bug 365808 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.emf.facet.widgets.nattable.tests.NatTableAPITests

+ *    Gr�goire Dup� (Mia-Software) - Bug 365808 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.modisco.facet.widgets.nattable.tests.NatTableAPITests

  *    Gr�goire Dup� (Mia-Software) - Bug 367153 - synchronization utilities

  *******************************************************************************/

 package org.eclipse.modisco.facet.util.ui.internal.exported.displaysync;

diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidExceptionFreeRunnable.java b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidExceptionFreeRunnable.java
index a04508e..8ad4574 100644
--- a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidExceptionFreeRunnable.java
+++ b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidExceptionFreeRunnable.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *    Gr�goire Dup� (Mia-Software) - Bug 365808 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.emf.facet.widgets.nattable.tests.NatTableAPITests

+ *    Gr�goire Dup� (Mia-Software) - Bug 365808 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.modisco.facet.widgets.nattable.tests.NatTableAPITests

  *    Gr�goire Dup� (Mia-Software) - Bug 367153 - synchronization utilities

  *******************************************************************************/

 package org.eclipse.modisco.facet.util.ui.internal.exported.displaysync;

diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidRunnable.java b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidRunnable.java
index c2471b3..c53408f 100644
--- a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidRunnable.java
+++ b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidRunnable.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *    Gr�goire Dup� (Mia-Software) - Bug 365808 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.emf.facet.widgets.nattable.tests.NatTableAPITests

+ *    Gr�goire Dup� (Mia-Software) - Bug 365808 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.modisco.facet.widgets.nattable.tests.NatTableAPITests

  *    Gr�goire Dup� (Mia-Software) - Bug 367153 - synchronization utilities

  *******************************************************************************/

 package org.eclipse.modisco.facet.util.ui.internal.exported.displaysync;

diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/DisplaySyncRuntimeException.java b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/DisplaySyncRuntimeException.java
index 27a0d40..c2dc967 100644
--- a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/DisplaySyncRuntimeException.java
+++ b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/DisplaySyncRuntimeException.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *    Gr�goire Dup� (Mia-Software) - Bug 365808 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.emf.facet.widgets.nattable.tests.NatTableAPITests

+ *    Gr�goire Dup� (Mia-Software) - Bug 365808 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.modisco.facet.widgets.nattable.tests.NatTableAPITests

  *    Gr�goire Dup� (Mia-Software) - Bug 367153 - synchronization utilities

  *******************************************************************************/

 package org.eclipse.modisco.facet.util.ui.internal.exported.displaysync;

diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/IRunnable.java b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/IRunnable.java
index 07dba85..2529b98 100644
--- a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/IRunnable.java
+++ b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/IRunnable.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *    Gr�goire Dup� (Mia-Software) - Bug 365808 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.emf.facet.widgets.nattable.tests.NatTableAPITests

+ *    Gr�goire Dup� (Mia-Software) - Bug 365808 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.modisco.facet.widgets.nattable.tests.NatTableAPITests

  *    Gr�goire Dup� (Mia-Software) - Bug 367153 - synchronization utilities

  *******************************************************************************/

 package org.eclipse.modisco.facet.util.ui.internal.exported.displaysync;

diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedComposite.java b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedComposite.java
index 70e9b53..8ef3271 100644
--- a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedComposite.java
+++ b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedComposite.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *    Grégoire Dupé (Mia-Software) - Bug 365808 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.emf.facet.widgets.nattable.tests.NatTableAPITests

+ *    Grégoire Dupé (Mia-Software) - Bug 365808 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.modisco.facet.widgets.nattable.tests.NatTableAPITests

  *    Grégoire Dupé (Mia-Software) - Bug 367153 - synchronization utilities

  *    Nicolas Bros (Mia-Software) - Bug 370442 - rewrite the Facet loading dialog for v0.2

  *    Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedObject.java b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedObject.java
index cbd56c4..3a0e5bf 100644
--- a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedObject.java
+++ b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedObject.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *    Grégoire Dupé (Mia-Software) - Bug 365808 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.emf.facet.widgets.nattable.tests.NatTableAPITests

+ *    Grégoire Dupé (Mia-Software) - Bug 365808 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.modisco.facet.widgets.nattable.tests.NatTableAPITests

  *    Grégoire Dupé (Mia-Software) - Bug 367153 - synchronization utilities

  *    Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

  *    Grégoire Dupé (Mia-Software) - Bug 387470 - [EFacet][Custom] Editors

diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/composite/FilteredElementSelectionComposite.java b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/composite/FilteredElementSelectionComposite.java
index db19899..0a97b88 100644
--- a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/composite/FilteredElementSelectionComposite.java
+++ b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/composite/FilteredElementSelectionComposite.java
@@ -79,7 +79,7 @@
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.emf.facet.util.ui.internal.exported.util.composite.

+	 * @see org.eclipse.modisco.facet.util.ui.internal.exported.util.composite.

 	 * IFilteredElementSelectionComposite#setElements(java.lang.Object[])

 	 */

 	public void setElements(final Object[] elements) {

@@ -122,7 +122,7 @@
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.emf.facet.util.ui.internal.exported.util.composite.

+	 * @see org.eclipse.modisco.facet.util.ui.internal.exported.util.composite.

 	 * IFilteredElementSelectionComposite#getFirstSelectedElement()

 	 */

 	public Object getFirstSelectedElement() {

@@ -137,7 +137,7 @@
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.emf.facet.util.ui.internal.exported.util.composite.

+	 * @see org.eclipse.modisco.facet.util.ui.internal.exported.util.composite.

 	 * IFilteredElementSelectionComposite#getSelectedElements()

 	 */

 	public Object[] getSelectedElements() {

@@ -151,7 +151,7 @@
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.emf.facet.util.ui.internal.exported.util.composite.

+	 * @see org.eclipse.modisco.facet.util.ui.internal.exported.util.composite.

 	 * IFilteredElementSelectionComposite#getFilteredList()

 	 */

 	public FilteredList getFilteredList() {

@@ -161,7 +161,7 @@
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.emf.facet.util.ui.internal.exported.util.composite.

+	 * @see org.eclipse.modisco.facet.util.ui.internal.exported.util.composite.

 	 * IFilteredElementSelectionComposite#getFilterText()

 	 */

 	public Text getFilterText() {

diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractCommandWidget.java b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractCommandWidget.java
index 5e44749..93102fc 100644
--- a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractCommandWidget.java
+++ b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractCommandWidget.java
@@ -53,7 +53,7 @@
 	}

 

 	/* (non-Javadoc)

-	 * @see org.eclipse.emf.facet.util.ui.internal.exported.util.widget.command.ICommandWidget#getCommand()

+	 * @see org.eclipse.modisco.facet.util.ui.internal.exported.util.widget.command.ICommandWidget#getCommand()

 	 */

 	public abstract Object getCommand();

 

diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractGetOrCreateFilteredElementCommandWidget.java b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractGetOrCreateFilteredElementCommandWidget.java
index 6ceae25..89beb35 100644
--- a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractGetOrCreateFilteredElementCommandWidget.java
+++ b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractGetOrCreateFilteredElementCommandWidget.java
@@ -104,7 +104,7 @@
 	}

 

 	/* (non-Javadoc)

-	 * @see org.eclipse.emf.facet.util.ui.internal.exported.util.widget.command.IGetOrCreateFilteredElementCommmandWidget#getElementSelected()

+	 * @see org.eclipse.modisco.facet.util.ui.internal.exported.util.widget.command.IGetOrCreateFilteredElementCommmandWidget#getElementSelected()

 	 */

 	public T getElementSelected() {

 		T result = null;

@@ -118,7 +118,7 @@
 	}

 

 	/* (non-Javadoc)

-	 * @see org.eclipse.emf.facet.util.ui.internal.exported.util.widget.command.IGetOrCreateFilteredElementCommmandWidget#selectElement(T)

+	 * @see org.eclipse.modisco.facet.util.ui.internal.exported.util.widget.command.IGetOrCreateFilteredElementCommmandWidget#selectElement(T)

 	 */

 	public void selectElement(final T element) {

 		Object[] selectionsParam = new Object[1];

@@ -138,7 +138,7 @@
 	}

 

 	/* (non-Javadoc)

-	 * @see org.eclipse.emf.facet.util.ui.internal.exported.util.widget.command.IGetOrCreateFilteredElementCommmandWidget#pressNewButton()

+	 * @see org.eclipse.modisco.facet.util.ui.internal.exported.util.widget.command.IGetOrCreateFilteredElementCommmandWidget#pressNewButton()

 	 */

 	public IDialog<W> pressNewButton() {

 		return new SynchronizedAbstractDialog<W>(

diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithWizardButtonWidget.java b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithWizardButtonWidget.java
index 475e16d..cb0c1c0 100644
--- a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithWizardButtonWidget.java
+++ b/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithWizardButtonWidget.java
@@ -45,7 +45,7 @@
 				// TODO The wizard closing events must be cached by the use of

 				// call back pattern. The use of this pattern must be done in

 				// the subclass of this class, like in

-				// org.eclipse.emf.facet.util.ui.internal.exported.util.widget.component.getorcreate.AbstractGetOrCreateElementWithWizardButtonWidget<ETypedElement>

+				// org.eclipse.modisco.facet.util.ui.internal.exported.util.widget.component.getorcreate.AbstractGetOrCreateElementWithWizardButtonWidget<ETypedElement>

 				// The following if statement and the methods 'onWizardCommited'

 				// 'onWizardCanceled' must be removed (replaced by the use of

 				// call backs)

diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.widgets.celleditors.ecore/OSGI-INF/l10n/bundle.properties
index 33a4bc8..8a3feb8 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors.ecore/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.widgets.celleditors.ecore/OSGI-INF/l10n/bundle.properties
@@ -11,4 +11,4 @@
 ###############################################################################

 #Properties file for org.eclipse.modisco.facet.widgets.celleditors.ecore

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet Cell Editors
\ No newline at end of file
+Bundle-Name = MoDisco Facet Cell Editors
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Activator.java b/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Activator.java
index 304fd6e..741d222 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Activator.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Activator.java
@@ -19,7 +19,7 @@
  */

 public class Activator extends AbstractUIPlugin {

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.emf.facet.widgets.celleditors"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.modisco.facet.widgets.celleditors"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Messages.java b/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Messages.java
index a975e2d..f5557b0 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Messages.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Messages.java
@@ -14,7 +14,7 @@
 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.emf.facet.widgets.celleditors.ecore.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.modisco.facet.widgets.celleditors.ecore.messages"; //$NON-NLS-1$

 	public static String MultiLineDialog_enterAValue;

 	static {

 		// initialize resource bundle

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/plugin.properties b/org.eclipse.modisco.facet.widgets.celleditors/plugin.properties
index 1f879c2..0593c50 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/plugin.properties
+++ b/org.eclipse.modisco.facet.widgets.celleditors/plugin.properties
@@ -10,10 +10,10 @@
 #     Nicolas Guyomar (Mia-Software) - Bug 339899 - everything must be externalized before UI freeze

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

 

-pluginName = Celleditors Model

+pluginName = MoDisco Facet Celleditors Model

 providerName = Eclipse Modeling Project

 

-celleditors.content-type.name = EMFFacet Model Cell Editors

+celleditors.content-type.name = MoDisco Facet Model Cell Editors

 celleditors.extension-point.name = Model Cell Editors

 compositeEditors.extension-point.name = Composite Cell Editor Factories

 command.factories.extension-point.name = Command Factories
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICellEditorsRegistry.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICellEditorsRegistry.java
index 83e2027..9f3c884 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICellEditorsRegistry.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICellEditorsRegistry.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- * 	Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ * 	Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *  Nicolas Bros (Mia-Software) - Bug 339855 - ModelCellEditor class should not be exposed

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors;

@@ -32,7 +32,7 @@
 	/**

 	 * Returns a cell editor to edit a single value of the given type, or <code>null</code> if none

 	 * was found. Custom cell editors override the default ones (from

-	 * "org.eclipse.emf.facet.widgets.celleditors").

+	 * "org.eclipse.modisco.facet.widgets.celleditors").

 	 * 

 	 * @param type

 	 *            the type for which to get a cell editor

@@ -43,7 +43,7 @@
 	/**

 	 * Returns a cell editor to edit a list of values of the given type, or <code>null</code> if

 	 * none was found. Custom cell editors override the default ones (from

-	 * "org.eclipse.emf.facet.widgets.celleditors").

+	 * "org.eclipse.modisco.facet.widgets.celleditors").

 	 * 

 	 * @param type

 	 *            the type for which to get a cell editor

@@ -54,7 +54,7 @@
 	/**

 	 * Returns a cell editor to edit a single value of the given type, or <code>null</code> if none

 	 * was found. Custom cell editors override the default ones (from

-	 * "org.eclipse.emf.facet.widgets.celleditors").

+	 * "org.eclipse.modisco.facet.widgets.celleditors").

 	 * 

 	 * @param type

 	 *            the type for which to get a cell editor

@@ -69,7 +69,7 @@
 	/**

 	 * Returns a cell editor to edit a list of values of the given type, or <code>null</code> if

 	 * none was found. Custom cell editors override the default ones (from

-	 * "org.eclipse.emf.facet.widgets.celleditors").

+	 * "org.eclipse.modisco.facet.widgets.celleditors").

 	 * 

 	 * @param type

 	 *            the type for which to get a cell editor

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactoriesRegistry.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactoriesRegistry.java
index 3bb8ec5..72d629f 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactoriesRegistry.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactoriesRegistry.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors;

 

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactory.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactory.java
index 8fb0517..cfa06af 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactory.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactory.java
@@ -24,7 +24,7 @@
 		org.eclipse.modisco.facet.util.emf.core.internal.exported.ICommandFactory {

 

 	// The content of this interface ha been moved to

-	// org.eclipse.emf.facet.util.emf.core.internal.exported.ICommandFactory to

+	// org.eclipse.modisco.facet.util.emf.core.internal.exported.ICommandFactory to

 	// solve a cyclic

-	// dependency issue (with the plug-in org.eclipse.emf.facet.custom.ui)

+	// dependency issue (with the plug-in org.eclipse.modisco.facet.custom.ui)

 }

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditorContainer.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditorContainer.java
index 40feae0..8f782cf 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditorContainer.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditorContainer.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors;

 

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/core/composite/registry/ICompositeEditorFactoriesRegistry.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/core/composite/registry/ICompositeEditorFactoriesRegistry.java
index ce071ad..0ad78bf 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/core/composite/registry/ICompositeEditorFactoriesRegistry.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/core/composite/registry/ICompositeEditorFactoriesRegistry.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning 

+ *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.modisco.facet.widgets.celleditors API cleaning 

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors.core.composite.registry;

 

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Activator.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Activator.java
index b7d2cb9..e5a0ccc 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Activator.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Activator.java
@@ -8,7 +8,7 @@
  *

  * Contributors:

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

- *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *****************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors.internal;

 

@@ -20,7 +20,7 @@
  */

 public class Activator extends AbstractUIPlugin {

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.emf.facet.widgets.celleditors"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.modisco.facet.widgets.celleditors"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CellEditorsRegistry.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CellEditorsRegistry.java
index 3aa934b..b2cc8e0 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CellEditorsRegistry.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CellEditorsRegistry.java
@@ -9,7 +9,7 @@
  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

  *    Nicolas Bros (Mia-Software) - Bug 338437 - compositeEditors extension point cannot be used to register user types

- *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *    Nicolas Bros (Mia-Software) - Bug 339855 - ModelCellEditor class should not be exposed

  *    Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

  *******************************************************************************/

@@ -45,7 +45,7 @@
 /** Registry for the "loadingDepth" extension point */

 public class CellEditorsRegistry extends AbstractRegistry implements ICellEditorsRegistry {

 

-	private static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.emf.facet.widgets.celleditors"; //$NON-NLS-1$

+	private static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.modisco.facet.widgets.celleditors"; //$NON-NLS-1$

 	private static final String EXTENSION_POINT_NAME = "celleditors"; //$NON-NLS-1$

 

 	private static final String CELL_EDITORS_MODEL_ELEMENT = "cellEditorsModel"; //$NON-NLS-1$

@@ -79,7 +79,7 @@
 	/**

 	 * Returns a cell editor wrapper for the given type, or <code>null</code> if none was found.

 	 * Custom cell editors override the default ones (from

-	 * "org.eclipse.emf.facet.widgets.celleditors").

+	 * "org.eclipse.modisco.facet.widgets.celleditors").

 	 * 

 	 * @param type

 	 *            the type for which to get a cell editor wrapper

@@ -94,7 +94,7 @@
 	/**

 	 * Returns a cell editor to edit a single value of the given type, or <code>null</code> if none

 	 * was found. Custom cell editors override the default ones (from

-	 * "org.eclipse.emf.facet.widgets.celleditors").

+	 * "org.eclipse.modisco.facet.widgets.celleditors").

 	 * 

 	 * @param type

 	 *            the type for which to get a cell editor

@@ -111,7 +111,7 @@
 	/**

 	 * Returns a cell editor wrapper to edit a list of values of the given type, or

 	 * <code>null</code> if none was found. Custom cell editors override the default ones (from

-	 * "org.eclipse.emf.facet.widgets.celleditors").

+	 * "org.eclipse.modisco.facet.widgets.celleditors").

 	 * 

 	 * @param type

 	 *            the type for which to get a cell editor

@@ -147,7 +147,7 @@
 

 	/**

 	 * Returns a cell editor for the given type, or <code>null</code> if none was found. Custom cell

-	 * editors override the default ones (from "org.eclipse.emf.facet.widgets.celleditors").

+	 * editors override the default ones (from "org.eclipse.modisco.facet.widgets.celleditors").

 	 * 

 	 * @param type

 	 *            the type for which to get a cell editor

@@ -195,9 +195,9 @@
 				boolean skippedDefault = false;

 				for (ModelCellEditor cellEditor : cellEditors) {

 					// lower priority for

-					// org.eclipse.emf.facet.widgets.celleditors.*

+					// org.eclipse.modisco.facet.widgets.celleditors.*

 					if (cellEditor.getBundleName().startsWith(

-							"org.eclipse.emf.facet.widgets.celleditors")) { //$NON-NLS-1$

+							"org.eclipse.modisco.facet.widgets.celleditors")) { //$NON-NLS-1$

 						if (skippedDefault) {

 							Logger.logError(

 									"Several default cell editors are defined in EMF Facet for type: " //$NON-NLS-1$

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CommandFactoriesRegistry.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CommandFactoriesRegistry.java
index 9438c1e..28248ca 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CommandFactoriesRegistry.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CommandFactoriesRegistry.java
@@ -8,7 +8,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *    Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors.internal;

@@ -27,7 +27,7 @@
 /** Registry for the "loadingDepth" extension point */

 public class CommandFactoriesRegistry extends AbstractRegistry implements ICommandFactoriesRegistry {

 

-	private static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.emf.facet.widgets.celleditors"; //$NON-NLS-1$

+	private static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.modisco.facet.widgets.celleditors"; //$NON-NLS-1$

 	private static final String EXTENSION_POINT_NAME = "commandFactories"; //$NON-NLS-1$

 

 	private static final String COMMAND_FACTORY_ELEMENT = "commandFactory"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/DefaultCommandFactory.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/DefaultCommandFactory.java
index abf56b9..99494fc 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/DefaultCommandFactory.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/DefaultCommandFactory.java
@@ -8,7 +8,7 @@
  *

  * Contributors:

  *   Nicolas Bros (Mia-Software) - initial API and implementation

- *   Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *   Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors.internal;

 

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Messages.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Messages.java
index eee4eb0..42073f7 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Messages.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Messages.java
@@ -8,14 +8,14 @@
  *

  * Contributors:

  *   Nicolas Bros (Mia-Software) - initial API and implementation

- *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *****************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors.internal;

 

 import org.eclipse.osgi.util.NLS;

 

 public final class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.emf.facet.widgets.celleditors.internal.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.modisco.facet.widgets.celleditors.internal.messages"; //$NON-NLS-1$

 	public static String CoreIFileComposite_mustSelectFile;

 	public static String CoreIFileComposite_selectFile;

 	public static String NaryAttributeEditingDialog_add;

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ModelCellEditorContainer.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ModelCellEditorContainer.java
index 2c2d358..82c7e6f 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ModelCellEditorContainer.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ModelCellEditorContainer.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors.internal;

 

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/composite/registries/CompositeEditorFactoriesRegistry.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/composite/registries/CompositeEditorFactoriesRegistry.java
index 7f031a6..2cf0f6b 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/composite/registries/CompositeEditorFactoriesRegistry.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/composite/registries/CompositeEditorFactoriesRegistry.java
@@ -9,7 +9,7 @@
  *    Fabien Giquel (Mia-Software) - initial API and implementation

  *    Nicolas Bros (Mia-Software) - Bug 338437 - compositeEditors extension point cannot be used to register user types

  *    Nicolas Guyomar (Mia-Software) - Bug 338826 - CompositeEditorFactoriesRegistry.getCompositeEditorFactory() should be parameterized 

- *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *    Nicolas Bros (Mia-Software) - Bug 341369 - CompositeEditorFactoriesRegistry : inverted type comparison

  *    Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

  *******************************************************************************/

@@ -33,7 +33,7 @@
 

 	private static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$

 

-	private static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.emf.facet.widgets.celleditors"; //$NON-NLS-1$

+	private static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.modisco.facet.widgets.celleditors"; //$NON-NLS-1$

 	private static final String EXTENSION_POINT_NAME = "compositeEditorFactories"; //$NON-NLS-1$

 	private final List<ICompositeEditorFactory<?>> compositeFactories;

 

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/EEnumCellEditor.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/EEnumCellEditor.java
index 58f12cb..ae286f4 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/EEnumCellEditor.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/EEnumCellEditor.java
@@ -8,7 +8,7 @@
  *

  * Contributors:

  *   Gregoire Dupe (Mia-Software) - initial API and implementation

- *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *   Nicolas Bros (Mia-Software) - Bug 334539 - [celleditors] change listener

  *   Gregoire Dupe (Mia-Software) - Bug 344563 - NPE with Enum Editor

  *****************************************************************************/

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryAttributeCellEditor.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryAttributeCellEditor.java
index 3d7e3e7..f3a7779 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryAttributeCellEditor.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryAttributeCellEditor.java
@@ -8,7 +8,7 @@
  *

  * Contributors:

  *   Nicolas Bros (Mia-Software) - initial API and implementation

- *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *   Nicolas Guyomar (Mia-Software) - Bug 342451 - To be able to edit derived facet attributes and derived facet references in a table

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors.internal.core;

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryReferenceCellEditor.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryReferenceCellEditor.java
index 285f68e..acc9e75 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryReferenceCellEditor.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryReferenceCellEditor.java
@@ -8,7 +8,7 @@
  *

  * Contributors:

  *   Nicolas Bros (Mia-Software) - initial API and implementation

- *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *   Nicolas Guyomar (Mia-Software) - Bug 342451 - To be able to edit derived facet attributes and derived facet references in a table

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors.internal.core;

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/UnaryReferenceCellEditor.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/UnaryReferenceCellEditor.java
index dfc5922..6c4a481 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/UnaryReferenceCellEditor.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/UnaryReferenceCellEditor.java
@@ -8,7 +8,7 @@
  *

  * Contributors:

  *   Nicolas Bros (Mia-Software) - initial API and implementation

- *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *   Nicolas Bros (Mia-Software) - Bug 334539 - [celleditors] change listener

  *   Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

  *****************************************************************************/

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/AbstractIResourceComposite.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/AbstractIResourceComposite.java
index ee35644..da57d87 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/AbstractIResourceComposite.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/AbstractIResourceComposite.java
@@ -8,7 +8,7 @@
  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

  *    Nicolas Guyomar (Mia-Software) - Bug 334546 - [celleditors] no border on Text field

- *    Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *    Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *    Nicolas Bros (Mia-Software) - Bug 334539 - [celleditors] change listener

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors.internal.core.composite;

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIFileComposite.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIFileComposite.java
index b0fe9db..3d92ca3 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIFileComposite.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIFileComposite.java
@@ -9,7 +9,7 @@
  *    Nicolas Bros (Mia-Software) - initial API and implementation

  *    Nicolas Guyomar (Mia-Software) - Bug 334546 - [celleditors] no border on Text field

  *    Nicolas Bros (Mia-Software) - Bug 338437 - compositeEditors extension point cannot be used to register user types

- *    Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *    Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors.internal.core.composite;

 

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIResourceComposite.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIResourceComposite.java
index 4e0c69e..0a987ef 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIResourceComposite.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIResourceComposite.java
@@ -8,7 +8,7 @@
  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

  *    Nicolas Guyomar (Mia-Software) - Bug 334546 - [celleditors] no border on Text field

- *    Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *    Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors.internal.core.composite;

 

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumComposite.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumComposite.java
index 105a3b9..76ec264 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumComposite.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumComposite.java
@@ -8,7 +8,7 @@
  *

  * Contributors:

  *   Gregoire Dupe (Mia-Software) - initial API and implementation

- *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *   Nicolas Bros (Mia-Software) - Bug 334539 - [celleditors] change listener

  *   Gregoire Dupe (Mia-Software) - Bug 344563 - NPE with Enum Editor

  *   Nicolas Guyomar (Mia-Software) - Bug 344563 - NPE with Enum Editor 

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumeratorComposite.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumeratorComposite.java
index 45b2638..ef23ec3 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumeratorComposite.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumeratorComposite.java
@@ -8,7 +8,7 @@
  *

  * Contributors:

  *   Gregoire Dupe (Mia-Software) - initial API and implementation

- *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *   Gregoire Dupe (Mia-Software) - Bug 344563 - NPE with Enum Editor

  *****************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors.internal.core.composite;

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/UnaryReferenceCellEditorComposite.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/UnaryReferenceCellEditorComposite.java
index 3662097..b9a220d 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/UnaryReferenceCellEditorComposite.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/UnaryReferenceCellEditorComposite.java
@@ -9,7 +9,7 @@
  * Contributors:

  *   Nicolas Bros (Mia-Software) - initial API and implementation

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

- *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *   Nicolas Bros (Mia-Software) - Bug 339664 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *   Nicolas Bros (Mia-Software) - Bug 334539 - [celleditors] change listener

  *   Grégoire Dupé (Mia-Software) - Bug 424122 - [Table] Images, fonts and colors are not shared between the instances of table

  *****************************************************************************/

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/ModelCellsEditingSupport.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/ModelCellsEditingSupport.java
index 793c647..b5dda34 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/ModelCellsEditingSupport.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/ModelCellsEditingSupport.java
@@ -8,7 +8,7 @@
  *

  * Contributors:

  *   Nicolas Bros (Mia-Software) - initial API and implementation

- *   Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *   Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *   Nicolas Bros (Mia-Software) - Bug 339855 - ModelCellEditor class should not be exposed

  *   Nicolas Guyomar (Mia-Software) - Bug 342451 - To be able to edit derived facet attributes and derived facet references in a table

  *******************************************************************************/

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryAttributeEditingDialog.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryAttributeEditingDialog.java
index df55637..c1a05af 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryAttributeEditingDialog.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryAttributeEditingDialog.java
@@ -8,7 +8,7 @@
  *

  * Contributors:

  *   Nicolas Bros (Mia-Software) - initial API and implementation

- *   Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *   Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *   Nicolas Guyomar (Mia-Software) - Bug 342451 - To be able to edit derived facet attributes and derived facet references in a table

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.celleditors.internal.ui;

diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryReferenceEditingDialog.java b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryReferenceEditingDialog.java
index f068427..0f90208 100644
--- a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryReferenceEditingDialog.java
+++ b/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryReferenceEditingDialog.java
@@ -8,7 +8,7 @@
  *

  * Contributors:

  *   Nicolas Bros (Mia-Software) - initial API and implementation

- *   Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning

+ *   Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.modisco.facet.widgets.celleditors API cleaning

  *   Nicolas Guyomar (Mia-Software) - Bug 342451 - To be able to edit derived facet attributes and derived facet references in a table

  *   Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

  *******************************************************************************/

diff --git a/org.eclipse.modisco.facet.widgets/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.facet.widgets/OSGI-INF/l10n/bundle.properties
index b415c31..99a2cfd 100644
--- a/org.eclipse.modisco.facet.widgets/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.facet.widgets/OSGI-INF/l10n/bundle.properties
@@ -10,4 +10,4 @@
 ###############################################################################

 #Properties file for org.eclipse.modisco.facet.widgets

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = EMF Facet Widgets
\ No newline at end of file
+Bundle-Name = MoDisco Facet Widgets
\ No newline at end of file
diff --git a/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/Activator.java b/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/Activator.java
index 3910948..ac41fb2 100644
--- a/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/Activator.java
+++ b/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/Activator.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    Nicolas Bros (Mia-Software) - Bug 339653 - org.eclipse.emf.facet.widgets API Cleaning

+ *    Nicolas Bros (Mia-Software) - Bug 339653 - org.eclipse.modisco.facet.widgets API Cleaning

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.internal;

 

@@ -20,7 +20,7 @@
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.emf.facet.widgets"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.modisco.facet.widgets"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/CustomizableLabelProvider.java b/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/CustomizableLabelProvider.java
index 9732493..318ef37 100644
--- a/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/CustomizableLabelProvider.java
+++ b/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/CustomizableLabelProvider.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    Nicolas Bros (Mia-Software) - Bug 339653 - org.eclipse.emf.facet.widgets API Cleaning

+ *    Nicolas Bros (Mia-Software) - Bug 339653 - org.eclipse.modisco.facet.widgets API Cleaning

  *    Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

  *******************************************************************************/

 

diff --git a/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/ImageProvider.java b/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/ImageProvider.java
index 402a71d..b13fc0d 100644
--- a/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/ImageProvider.java
+++ b/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/ImageProvider.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    Nicolas Bros (Mia-Software) - Bug 339653 - org.eclipse.emf.facet.widgets API Cleaning

+ *    Nicolas Bros (Mia-Software) - Bug 339653 - org.eclipse.modisco.facet.widgets API Cleaning

  *    Vincent Lorenzo (CEA-LIST) - bug 341192 - Add the method to get the image for Select Columns To Hide in the ImageManager

  *******************************************************************************/

 package org.eclipse.modisco.facet.widgets.internal;

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorShortcutUtils.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorShortcutUtils.java
index a7e26bf..395baa4 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorShortcutUtils.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorShortcutUtils.java
@@ -39,13 +39,13 @@
 			final ResourceSet resourceSet) {

 		final List<ICustomShortcut> shortcuts = new ArrayList<ICustomShortcut>();

 		addShortcut(resourceSet, shortcuts,

-				"platform:/plugin/org.eclipse.emf.facet.ecore.ui/custom/hideDerivedReferences.custom", //$NON-NLS-1$

+				"platform:/plugin/org.eclipse.modisco.facet.ecore.ui/custom/hideDerivedReferences.custom", //$NON-NLS-1$

 				Messages.TreeEditorShortcutUtils_CustomHideDerivedReferences);

 		addShortcut(resourceSet, shortcuts,

-				"platform:/plugin/org.eclipse.emf.facet.ecore.ui/custom/hideEmptyReferences.custom", //$NON-NLS-1$

+				"platform:/plugin/org.eclipse.modisco.facet.ecore.ui/custom/hideEmptyReferences.custom", //$NON-NLS-1$

 				Messages.TreeEditorShortcutUtils_CustomHideEmptyReferences);

 		addShortcut(resourceSet, shortcuts,

-				"platform:/plugin/org.eclipse.emf.facet.ecore.ui/custom/linksCount.custom", //$NON-NLS-1$

+				"platform:/plugin/org.eclipse.modisco.facet.ecore.ui/custom/linksCount.custom", //$NON-NLS-1$

 				Messages.TreeEditorShortcutUtils_CustomShowLinksCount);

 		return shortcuts;

 	}

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java
index 3acbe4e..e953720 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java
@@ -18,7 +18,7 @@
 

 /**

  * A default implementation of {@link IResourceEditorInput}. For editors that

- * can take a {@link Resource} as an input (supported by the EmfFacet model

+ * can take a {@link Resource} as an input (supported by the MoDisco Facet model

  * browser)

  */

 public class ResourceEditorInput implements IEditorInput {

diff --git a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestURIDialog.java b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestURIDialog.java
index b44d01c..85cf25f 100644
--- a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestURIDialog.java
+++ b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestURIDialog.java
@@ -86,7 +86,7 @@
 		SWTBotShell shell = TestURIDialog.bot.shell("Show View");

 		shell.activate();

 		TestURIDialog.bot.tree().setFocus();

-		TestURIDialog.bot.tree().expandNode("EMF Facet").select("EPackage Registry");

+		TestURIDialog.bot.tree().expandNode("MoDisco Facet").select("EPackage Registry");

 		TestURIDialog.bot.button("OK").click();

 

 		final SWTBotView view = TestURIDialog.bot.viewByTitle("EPackage Registry");

diff --git a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/utils/TestUtils.java b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/utils/TestUtils.java
index f562c89..7171eb8 100644
--- a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/utils/TestUtils.java
+++ b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/utils/TestUtils.java
@@ -466,7 +466,7 @@
 		bot.menu("Window").menu("Preferences").click();

 		SWTBotShell shell = bot.shell("Preferences");

 		shell.activate();

-		bot.tree().getTreeItem("EMF Facet").expand().getNode("Default Browser").select();

+		bot.tree().getTreeItem("MoDisco Facet").expand().getNode("Default Browser").select();

 

 		SWTBotCombo combo = bot

 				.comboBoxWithLabel("Default EPackage Model Viewer");

diff --git a/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/LaunchConfiguration.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/LaunchConfiguration.java
index 1ce01d7..760ee82 100644
--- a/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/LaunchConfiguration.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/LaunchConfiguration.java
@@ -48,7 +48,7 @@
 	 * @return the value of the '<em>Source</em>' attribute.

 	 * @see #setSource(Object)

 	 * @see org.eclipse.modisco.infra.discovery.launch.LaunchPackage#getLaunchConfiguration_Source()

-	 * @model dataType="org.eclipse.emf.facet.util.emf.core.serialization.model.serialization.ExtensibleSerializableJavaObject"

+	 * @model dataType="org.eclipse.modisco.facet.util.emf.core.serialization.model.serialization.ExtensibleSerializableJavaObject"

 	 * @generated

 	 */

 	Object getSource();

diff --git a/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/ParameterValue.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/ParameterValue.java
index 19cbd5e..8242e2b 100644
--- a/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/ParameterValue.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/ParameterValue.java
@@ -70,7 +70,7 @@
 	 * @return the value of the '<em>Value</em>' attribute.

 	 * @see #setValue(Object)

 	 * @see org.eclipse.modisco.infra.discovery.launch.LaunchPackage#getParameterValue_Value()

-	 * @model dataType="org.eclipse.emf.facet.util.emf.core.serialization.model.serialization.ExtensibleSerializableJavaObject"

+	 * @model dataType="org.eclipse.modisco.facet.util.emf.core.serialization.model.serialization.ExtensibleSerializableJavaObject"

 	 * @generated

 	 */

 	Object getValue();

diff --git a/org.eclipse.modisco.tests/Rerun org.eclipse.modisco.tests.BundleTest.launch b/org.eclipse.modisco.tests/Rerun org.eclipse.modisco.tests.BundleTest.launch
new file mode 100644
index 0000000..c5420e0
--- /dev/null
+++ b/org.eclipse.modisco.tests/Rerun org.eclipse.modisco.tests.BundleTest.launch
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

+<booleanAttribute key="append.args" value="true"/>

+<booleanAttribute key="askclear" value="false"/>

+<booleanAttribute key="automaticAdd" value="true"/>

+<booleanAttribute key="automaticValidate" value="false"/>

+<stringAttribute key="bootstrap" value=""/>

+<booleanAttribute key="clearConfig" value="true"/>

+<booleanAttribute key="clearws" value="true"/>

+<booleanAttribute key="clearwslog" value="false"/>

+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/MoDisco_AllTestsInUIThread"/>

+<booleanAttribute key="default" value="true"/>

+<booleanAttribute key="includeOptional" value="true"/>

+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

+<listEntry value="/org.eclipse.modisco.tests/src/org/eclipse/modisco/tests/AllTests.java"/>

+</listAttribute>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

+<listEntry value="1"/>

+</listAttribute>

+<mapAttribute key="org.eclipse.debug.core.environmentVariables">

+<mapEntry key="skip.long.junit.tests" value="false"/>

+</mapAttribute>

+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">

+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>

+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>

+</listAttribute>

+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.modisco.tests.BundleTest"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-debug options.debug -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.modisco.tests"/>

+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx1200m -DsuppressRawWhenUnchecked=true -XX:PermSize=128m -XX:MaxPermSize=512m"/>

+<stringAttribute key="pde.version" value="3.3"/>

+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>

+<booleanAttribute key="run_in_ui_thread" value="true"/>

+<booleanAttribute key="show_selected_only" value="false"/>

+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

+<booleanAttribute key="tracing" value="true"/>

+<booleanAttribute key="useCustomFeatures" value="false"/>

+<booleanAttribute key="useDefaultConfig" value="true"/>

+<booleanAttribute key="useDefaultConfigArea" value="true"/>

+<booleanAttribute key="useProduct" value="true"/>

+</launchConfiguration>

diff --git a/pom.xml b/pom.xml
index 50f9581..0cf9977 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,29 +15,30 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>org.eclipse.emf.facet.common.core</module>
-    <module>org.eclipse.emf.facet.common.ui</module>
-    <module>org.eclipse.emf.facet.custom.core</module>
-    <module>org.eclipse.emf.facet.custom.metamodel</module>
-    <module>org.eclipse.emf.facet.custom.ui</module>
-    <module>org.eclipse.emf.facet.efacet.core</module>
-    <module>org.eclipse.emf.facet.efacet.edit.core</module>
-    <module>org.eclipse.emf.facet.efacet.metamodel</module>
-    <module>org.eclipse.emf.facet.efacet.ui</module>
-    <module>org.eclipse.emf.facet.query.java.core</module>
-    <module>org.eclipse.emf.facet.query.java.metamodel</module>
-    <module>org.eclipse.emf.facet.util.core</module>
-    <module>org.eclipse.emf.facet.util.emf.catalog</module>
-    <module>org.eclipse.emf.facet.util.emf.catalog.metamodel</module>
-    <module>org.eclipse.emf.facet.util.emf.core</module>
-    <module>org.eclipse.emf.facet.util.emf.ui</module>
-    <module>org.eclipse.emf.facet.util.jface.ui</module>
-    <module>org.eclipse.emf.facet.util.pde.core</module>
-    <module>org.eclipse.emf.facet.util.swt</module>
-    <module>org.eclipse.emf.facet.util.ui</module>
-    <module>org.eclipse.emf.facet.widgets</module>
-    <module>org.eclipse.emf.facet.widgets.celleditors</module>
-    <module>org.eclipse.emf.facet.widgets.celleditors.ecore</module>
+    <module>org.eclipse.modisco.facet.common.core</module>
+    <module>org.eclipse.modisco.facet.common.ui</module>
+    <module>org.eclipse.modisco.facet.custom.core</module>
+    <module>org.eclipse.modisco.facet.custom.metamodel</module>
+    <module>org.eclipse.modisco.facet.custom.ui</module>
+    <module>org.eclipse.modisco.facet.efacet.core</module>
+    <module>org.eclipse.modisco.facet.efacet.edit.core</module>
+    <module>org.eclipse.modisco.facet.efacet.metamodel</module>
+    <module>org.eclipse.modisco.facet.efacet.ui</module>
+    <module>org.eclipse.modisco.facet.query.java.core</module>
+    <module>org.eclipse.modisco.facet.query.java.metamodel</module>
+    <module>org.eclipse.modisco.facet.util.core</module>
+    <module>org.eclipse.modisco.facet.util.emf.catalog</module>
+    <module>org.eclipse.modisco.facet.util.emf.catalog.metamodel</module>
+    <module>org.eclipse.modisco.facet.util.emf.core</module>
+    <module>org.eclipse.modisco.facet.util.emf.ui</module>
+    <module>org.eclipse.modisco.facet.util.jface.ui</module>
+    <module>org.eclipse.modisco.facet.util.pde.core</module>
+    <module>org.eclipse.modisco.facet.util.swt</module>
+    <module>org.eclipse.modisco.facet.util.ui</module>
+    <module>org.eclipse.modisco.facet.widgets</module>
+    <module>org.eclipse.modisco.facet.widgets.celleditors</module>
+    <module>org.eclipse.modisco.facet.widgets.celleditors.ecore</module>
+    
     <module>org.eclipse.gmt.modisco.examples</module>
     <module>org.eclipse.gmt.modisco.infra.browser</module>
     <module>org.eclipse.gmt.modisco.infra.browser.custom</module>