Bug 515707: [Expressions] Papyrus must provide a generic extensible way to create and interprete Expression

- remove EObject and EClass property views (they appeared in WelcomePage and in other location - rename EObjectBooleanExpressionsPackage into BooleanExpressions - update property view according to these changes Change-Id: Id8d67dde7a3d5f35b9bc1d11eeeba1eb25263a79 Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
author: Vincent Lorenzo 2017-04-26 19:17:44 +0000
committer: Gerrit Code Review @ Eclipse.org 2017-04-27 13:22:06 +0000
commit: 7fb01af04ab30c121a99aff3b039d882688bd985 (patch)
tree: b0e27fd8ca3cc25a51df51c663e22a8bd4d57ec1 /plugins/infra/emf/expressions
parent: 71d46ac5a8601a33b6ff65a425098d42b22cdda0 (diff)
download: org.eclipse.papyrus-7fb01af04ab30c121a99aff3b039d882688bd985.tar.gz
org.eclipse.papyrus-7fb01af04ab30c121a99aff3b039d882688bd985.tar.xz
org.eclipse.papyrus-7fb01af04ab30c121a99aff3b039d882688bd985.zip
79 files changed, 826 insertions, 846 deletions
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/META-INF/MANIFEST.MF b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/META-INF/MANIFEST.MF
index f7d6176fac5..10848ba9cda 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Activator: org.eclipse.papyrus.infra.emf.expressions.provider.Expressions
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.provider,
+Export-Package: org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider,
  org.eclipse.papyrus.infra.emf.expressions.provider
 Require-Bundle: org.eclipse.core.runtime;resolution:=optional;x-installation:=greedy,
  org.eclipse.papyrus.infra.emf.expressions;visibility:=reexport,
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/ExpressionCatalog.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/ExpressionCatalog.gif
deleted file mode 100755
index 9e665d5c780..00000000000
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/ExpressionCatalog.gif
+++ /dev/null
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/ReferenceBooleanExpression.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/ReferenceBooleanExpression.gif
deleted file mode 100755
index cb4a220557e..00000000000
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/ReferenceBooleanExpression.gif
+++ /dev/null
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/AndExpression.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/AndExpression.gif
index 14c010e608c..ea3ce792a71 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/AndExpression.gif
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/AndExpression.gif
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/LiteralFalseExpression.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/LiteralFalseExpression.gif
index 777e4784876..0499396d1fd 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/LiteralFalseExpression.gif
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/LiteralFalseExpression.gif
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/LiteralTrueExpression.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/LiteralTrueExpression.gif
index a62f68d0fc8..97e80807419 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/LiteralTrueExpression.gif
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/LiteralTrueExpression.gif
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/NotExpression.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/NotExpression.gif
index 1efdfc34c8f..608b40ef5f6 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/NotExpression.gif
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/NotExpression.gif
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/OrExpression.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/OrExpression.gif
index 08e1d0a2dc9..e5266fef517 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/OrExpression.gif
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/OrExpression.gif
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/ReferenceBooleanExpression.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/ReferenceBooleanExpression.gif
index cb4a220557e..2c6fddae558 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/ReferenceBooleanExpression.gif
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/custom_icons/full/obj16/ReferenceBooleanExpression.gif
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/AndExpression.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/AndExpression.gif
index 14c010e608c..ea3ce792a71 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/AndExpression.gif
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/AndExpression.gif
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/LiteralFalseExpression.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/LiteralFalseExpression.gif
index 777e4784876..0499396d1fd 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/LiteralFalseExpression.gif
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/LiteralFalseExpression.gif
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/LiteralTrueExpression.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/LiteralTrueExpression.gif
index a62f68d0fc8..97e80807419 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/LiteralTrueExpression.gif
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/LiteralTrueExpression.gif
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/NotExpression.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/NotExpression.gif
index 1efdfc34c8f..608b40ef5f6 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/NotExpression.gif
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/NotExpression.gif
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/OrExpression.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/OrExpression.gif
index 08e1d0a2dc9..e5266fef517 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/OrExpression.gif
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/OrExpression.gif
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/ReferenceBooleanExpression.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/ReferenceBooleanExpression.gif
index cb4a220557e..2c6fddae558 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/ReferenceBooleanExpression.gif
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/icons/full/obj16/ReferenceBooleanExpression.gif
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.properties b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.properties
index 2f814d8a533..29cf56c4b45 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.properties
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.properties
@@ -9,8 +9,8 @@
 # Contributors:
 # 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Expressions Edit Support
-providerName = www.example.org
+pluginName = Papyrus EMF Expressions Edit Support
+providerName = Eclipse Modeling Project
 
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} | {0}
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.xml b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.xml
index f002e683972..6f7621b933a 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.xml
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.xml
@@ -34,8 +34,8 @@
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <!-- @generated expressions -->
       <factory
-            uri="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"
-            class="org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.provider.EObjectBooleanExpressionsItemProviderAdapterFactory"
+            uri="http://www.eclipse.org/papyrus/expressions/booleanexpressions"
+            class="org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
                org.eclipse.emf.edit.provider.IStructuredItemContentProvider
@@ -43,4 +43,5 @@
                org.eclipse.emf.edit.provider.IItemLabelProvider
                org.eclipse.emf.edit.provider.IItemPropertySource"/>
    </extension>
+
 </plugin>
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/provider/AndExpressionItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AndExpressionItemProvider.java
index bbbbbfab540..53b7aba995c 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/provider/AndExpressionItemProvider.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AndExpressionItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.provider;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider;
 
 
 import java.util.Collection;
@@ -24,6 +24,7 @@ import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.EStructuralFeature;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -36,14 +37,12 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsFactory;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
-
-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -141,7 +140,7 @@ public class AndExpressionItemProvider
 				 getResourceLocator(),
 				 getString("_UI_AndExpression_referencedExpressions_feature"), //$NON-NLS-1$
 				 getString("_UI_PropertyDescriptor_description", "_UI_AndExpression_referencedExpressions_feature", "_UI_AndExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 EObjectBooleanExpressionsPackage.Literals.AND_EXPRESSION__REFERENCED_EXPRESSIONS,
+				 BooleanExpressionsPackage.Literals.AND_EXPRESSION__REFERENCED_EXPRESSIONS,
 				 true,
 				 false,
 				 true,
@@ -162,7 +161,7 @@ public class AndExpressionItemProvider
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(EObjectBooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS);
+			childrenFeatures.add(BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS);
 		}
 		return childrenFeatures;
 	}
@@ -228,11 +227,11 @@ public class AndExpressionItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AndExpression.class)) {
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__NAME:
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.AND_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS:
+			case BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -252,33 +251,33 @@ public class AndExpressionItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createOrExpression()));
+				(BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
+				 BooleanExpressionsFactory.eINSTANCE.createOrExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createAndExpression()));
+				(BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
+				 BooleanExpressionsFactory.eINSTANCE.createAndExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createNotExpression()));
+				(BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
+				 BooleanExpressionsFactory.eINSTANCE.createNotExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression()));
+				(BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
+				 BooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression()));
+				(BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
+				 BooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression()));
+				(BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
+				 BooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression()));
 	}
 
 	/**
@@ -289,7 +288,7 @@ public class AndExpressionItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return ExpressionsEditPlugin.INSTANCE;
+		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
 	}
 
 }
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/provider/EObjectBooleanExpressionsItemProviderAdapterFactory.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/BooleanExpressionsItemProviderAdapterFactory.java
index 005ecaccd6a..fb0de844946 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/provider/EObjectBooleanExpressionsItemProviderAdapterFactory.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/BooleanExpressionsItemProviderAdapterFactory.java
@@ -10,19 +10,26 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.provider;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
 
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+
 import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ChildCreationExtenderManager;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
 import org.eclipse.emf.edit.provider.IDisposable;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -31,7 +38,11 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.util.EObjectBooleanExpressionsAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
+
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.util.BooleanExpressionsAdapterFactory;
+
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -42,7 +53,7 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.util.
  * <!-- end-user-doc -->
  * @generated
  */
-public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObjectBooleanExpressionsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class BooleanExpressionsItemProviderAdapterFactory extends BooleanExpressionsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
@@ -60,6 +71,14 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
 
 	/**
+	 * This helps manage the child creation extenders.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(ExpressionsEditPlugin.INSTANCE, BooleanExpressionsPackage.eNS_URI);
+
+	/**
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -73,7 +92,7 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EObjectBooleanExpressionsItemProviderAdapterFactory() {
+	public BooleanExpressionsItemProviderAdapterFactory() {
 		supportedTypes.add(IEditingDomainItemProvider.class);
 		supportedTypes.add(IStructuredItemContentProvider.class);
 		supportedTypes.add(ITreeItemContentProvider.class);
@@ -82,7 +101,7 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -90,7 +109,7 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	protected OrExpressionItemProvider orExpressionItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -105,7 +124,7 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -113,7 +132,7 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	protected AndExpressionItemProvider andExpressionItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -128,7 +147,7 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -136,7 +155,7 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	protected NotExpressionItemProvider notExpressionItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -151,7 +170,7 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralTrueExpression} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralTrueExpression} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -159,7 +178,7 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	protected LiteralTrueExpressionItemProvider literalTrueExpressionItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralTrueExpression}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralTrueExpression}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -174,7 +193,7 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralFalseExpression} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralFalseExpression} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -182,7 +201,7 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	protected LiteralFalseExpressionItemProvider literalFalseExpressionItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralFalseExpression}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralFalseExpression}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -197,7 +216,7 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -205,7 +224,7 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	protected ReferenceBooleanExpressionItemProvider referenceBooleanExpressionItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -278,6 +297,33 @@ public class EObjectBooleanExpressionsItemProviderAdapterFactory extends EObject
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List<IChildCreationExtender> getChildCreationExtenders() {
+		return childCreationExtenderManager.getChildCreationExtenders();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
+		return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return childCreationExtenderManager;
+	}
+
+	/**
 	 * This adds a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/provider/LiteralFalseExpressionItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/LiteralFalseExpressionItemProvider.java
index 9d1260a0d06..db89733da7e 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/provider/LiteralFalseExpressionItemProvider.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/LiteralFalseExpressionItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.provider;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider;
 
 
 import java.util.Collection;
@@ -22,6 +22,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -34,13 +35,11 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralFalseExpression;
-
-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralFalseExpression;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralFalseExpression} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralFalseExpression} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -172,8 +171,8 @@ public class LiteralFalseExpressionItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(LiteralFalseExpression.class)) {
-			case EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__NAME:
-			case EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__DESCRIPTION:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
@@ -200,7 +199,7 @@ public class LiteralFalseExpressionItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return ExpressionsEditPlugin.INSTANCE;
+		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
 	}
 
 }
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/provider/LiteralTrueExpressionItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/LiteralTrueExpressionItemProvider.java
index c597382bcf7..d99b8149082 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/provider/LiteralTrueExpressionItemProvider.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/LiteralTrueExpressionItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.provider;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider;
 
 
 import java.util.Collection;
@@ -22,6 +22,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -34,13 +35,11 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralTrueExpression;
-
-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralTrueExpression;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralTrueExpression} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralTrueExpression} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -172,8 +171,8 @@ public class LiteralTrueExpressionItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(LiteralTrueExpression.class)) {
-			case EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__NAME:
-			case EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__DESCRIPTION:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
@@ -200,7 +199,7 @@ public class LiteralTrueExpressionItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return ExpressionsEditPlugin.INSTANCE;
+		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
 	}
 
 }
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/provider/NotExpressionItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/NotExpressionItemProvider.java
index 782c04f7daf..5c7af1b2430 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/provider/NotExpressionItemProvider.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/NotExpressionItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.provider;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider;
 
 
 import java.util.Collection;
@@ -24,6 +24,7 @@ import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.EStructuralFeature;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -36,14 +37,12 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsFactory;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression;
-
-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -141,7 +140,7 @@ public class NotExpressionItemProvider
 				 getResourceLocator(),
 				 getString("_UI_NotExpression_referencedExpression_feature"), //$NON-NLS-1$
 				 getString("_UI_PropertyDescriptor_description", "_UI_NotExpression_referencedExpression_feature", "_UI_NotExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 EObjectBooleanExpressionsPackage.Literals.NOT_EXPRESSION__REFERENCED_EXPRESSION,
+				 BooleanExpressionsPackage.Literals.NOT_EXPRESSION__REFERENCED_EXPRESSION,
 				 true,
 				 false,
 				 true,
@@ -162,7 +161,7 @@ public class NotExpressionItemProvider
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(EObjectBooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION);
+			childrenFeatures.add(BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION);
 		}
 		return childrenFeatures;
 	}
@@ -228,11 +227,11 @@ public class NotExpressionItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(NotExpression.class)) {
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__NAME:
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -252,33 +251,33 @@ public class NotExpressionItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createOrExpression()));
+				(BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
+				 BooleanExpressionsFactory.eINSTANCE.createOrExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createAndExpression()));
+				(BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
+				 BooleanExpressionsFactory.eINSTANCE.createAndExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createNotExpression()));
+				(BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
+				 BooleanExpressionsFactory.eINSTANCE.createNotExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression()));
+				(BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
+				 BooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression()));
+				(BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
+				 BooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression()));
+				(BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
+				 BooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression()));
 	}
 
 	/**
@@ -289,7 +288,7 @@ public class NotExpressionItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return ExpressionsEditPlugin.INSTANCE;
+		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
 	}
 
 }
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/provider/OrExpressionItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/OrExpressionItemProvider.java
index 9de0a42ebd6..4439a98442c 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/provider/OrExpressionItemProvider.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/OrExpressionItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.provider;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider;
 
 
 import java.util.Collection;
@@ -24,6 +24,7 @@ import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.EStructuralFeature;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -36,14 +37,12 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsFactory;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression;
-
-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -141,7 +140,7 @@ public class OrExpressionItemProvider
 				 getResourceLocator(),
 				 getString("_UI_OrExpression_referencedExpressions_feature"), //$NON-NLS-1$
 				 getString("_UI_PropertyDescriptor_description", "_UI_OrExpression_referencedExpressions_feature", "_UI_OrExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 EObjectBooleanExpressionsPackage.Literals.OR_EXPRESSION__REFERENCED_EXPRESSIONS,
+				 BooleanExpressionsPackage.Literals.OR_EXPRESSION__REFERENCED_EXPRESSIONS,
 				 true,
 				 false,
 				 true,
@@ -162,7 +161,7 @@ public class OrExpressionItemProvider
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(EObjectBooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS);
+			childrenFeatures.add(BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS);
 		}
 		return childrenFeatures;
 	}
@@ -228,11 +227,11 @@ public class OrExpressionItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(OrExpression.class)) {
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__NAME:
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.OR_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS:
+			case BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -252,33 +251,33 @@ public class OrExpressionItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createOrExpression()));
+				(BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
+				 BooleanExpressionsFactory.eINSTANCE.createOrExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createAndExpression()));
+				(BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
+				 BooleanExpressionsFactory.eINSTANCE.createAndExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createNotExpression()));
+				(BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
+				 BooleanExpressionsFactory.eINSTANCE.createNotExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression()));
+				(BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
+				 BooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression()));
+				(BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
+				 BooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(EObjectBooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression()));
+				(BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
+				 BooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression()));
 	}
 
 	/**
@@ -289,7 +288,7 @@ public class OrExpressionItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return ExpressionsEditPlugin.INSTANCE;
+		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
 	}
 
 }
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/provider/ReferenceBooleanExpressionItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/ReferenceBooleanExpressionItemProvider.java
index e7a62910c34..4877cdf59ec 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/provider/ReferenceBooleanExpressionItemProvider.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/ReferenceBooleanExpressionItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.provider;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider;
 
 
 import java.util.Collection;
@@ -22,6 +22,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -34,13 +35,11 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression;
-
-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -138,7 +137,7 @@ public class ReferenceBooleanExpressionItemProvider
 				 getResourceLocator(),
 				 getString("_UI_ReferenceBooleanExpression_referencedExpression_feature"), //$NON-NLS-1$
 				 getString("_UI_PropertyDescriptor_description", "_UI_ReferenceBooleanExpression_referencedExpression_feature", "_UI_ReferenceBooleanExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 EObjectBooleanExpressionsPackage.Literals.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION,
+				 BooleanExpressionsPackage.Literals.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION,
 				 true,
 				 false,
 				 true,
@@ -195,8 +194,8 @@ public class ReferenceBooleanExpressionItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ReferenceBooleanExpression.class)) {
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME:
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
@@ -223,7 +222,7 @@ public class ReferenceBooleanExpressionItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return ExpressionsEditPlugin.INSTANCE;
+		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
 	}
 
 }
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/provider/ExpressionCatalogItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/provider/ExpressionCatalogItemProvider.java
index 5c95c8ac096..36cccbe66ae 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/provider/ExpressionCatalogItemProvider.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/provider/ExpressionCatalogItemProvider.java
@@ -38,7 +38,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.papyrus.infra.emf.expressions.ExpressionCatalog;
 import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.ExpressionCatalog} object.
@@ -228,32 +228,32 @@ public class ExpressionCatalogItemProvider
 		newChildDescriptors.add
 			(createChildParameter
 				(ExpressionsPackage.Literals.EXPRESSION_CATALOG__EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createOrExpression()));
+				 BooleanExpressionsFactory.eINSTANCE.createOrExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(ExpressionsPackage.Literals.EXPRESSION_CATALOG__EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createAndExpression()));
+				 BooleanExpressionsFactory.eINSTANCE.createAndExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(ExpressionsPackage.Literals.EXPRESSION_CATALOG__EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createNotExpression()));
+				 BooleanExpressionsFactory.eINSTANCE.createNotExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(ExpressionsPackage.Literals.EXPRESSION_CATALOG__EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression()));
+				 BooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(ExpressionsPackage.Literals.EXPRESSION_CATALOG__EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression()));
+				 BooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(ExpressionsPackage.Literals.EXPRESSION_CATALOG__EXPRESSIONS,
-				 EObjectBooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression()));
+				 BooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression()));
 	}
 
 	/**
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/META-INF/MANIFEST.MF b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/META-INF/MANIFEST.MF
index c2200b27e29..90fa9d6be12 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Activator: org.eclipse.papyrus.infra.emf.expressions.presentation.Express
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.presentation,
+Export-Package: org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.presentation,
  org.eclipse.papyrus.infra.emf.expressions.presentation
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;visibility:=reexport,
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/icons/full/obj16/BooleanExpressionsModelFile.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/icons/full/obj16/BooleanExpressionsModelFile.gif
new file mode 100755
index 00000000000..f33d349a793
--- /dev/null
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/icons/full/obj16/BooleanExpressionsModelFile.gif
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/icons/full/obj16/EObjectBooleanExpressionsModelFile.gif b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/icons/full/obj16/EObjectBooleanExpressionsModelFile.gif
deleted file mode 100755
index 1efdfc34c8f..00000000000
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/icons/full/obj16/EObjectBooleanExpressionsModelFile.gif
+++ /dev/null
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.properties b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.properties
index 081e08503f4..bf3a594c71d 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.properties
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.properties
@@ -9,8 +9,8 @@
 # Contributors:
 # 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Expressions Editor
-providerName = www.example.org
+pluginName = Papyrus EMF Expressions Editor
+providerName = Eclipse Modeling Project
 
 _UI_ExpressionsEditor_menu = &Expressions Editor
 _UI_EObjectBooleanExpressionsEditor_menu = &EObjectBooleanExpressions Editor
@@ -66,3 +66,7 @@ _UI_Wizard_initial_object_description = Select a model object to create
 _UI_FileConflict_label = File Conflict
 _WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
 
+_UI_BooleanExpressionsEditor_menu = &BooleanExpressions Editor
+_UI_BooleanExpressionsEditor_label = BooleanExpressions Model Editor
+_UI_BooleanExpressionsEditorFilenameDefaultBase = My
+_UI_BooleanExpressionsEditorFilenameExtensions = booleanexpressions
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.xml b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.xml
index 02d24b8d113..2843e767534 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.xml
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.xml
@@ -49,12 +49,12 @@
    <extension point="org.eclipse.ui.editors">
       <!-- @generated NOT expressions -->
       <!--editor
-            id="org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.presentation.EObjectBooleanExpressionsEditorID"
-            name="%_UI_EObjectBooleanExpressionsEditor_label"
-            icon="icons/full/obj16/EObjectBooleanExpressionsModelFile.gif"
-            extensions="eobjectbooleanexpressions"
-            class="org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.presentation.EObjectBooleanExpressionsEditor"
-            contributorClass="org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.presentation.EObjectBooleanExpressionsActionBarContributor">
+            id="org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.presentation.BooleanExpressionsEditorID"
+            name="%_UI_BooleanExpressionsEditor_label"
+            icon="icons/full/obj16/BooleanExpressionsModelFile.gif"
+            extensions="booleanexpressions"
+            class="org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.presentation.BooleanExpressionsEditor"
+            contributorClass="org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.presentation.BooleanExpressionsActionBarContributor">
       </editor-->
    </extension>
 
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/presentation/EObjectBooleanExpressionsActionBarContributor.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/presentation/BooleanExpressionsActionBarContributor.java
index 6fc810a2e8f..800159cf343 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/presentation/EObjectBooleanExpressionsActionBarContributor.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/presentation/BooleanExpressionsActionBarContributor.java
@@ -10,15 +10,15 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.presentation;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.presentation;
 
 import java.util.ArrayList;
 import java.util.Collection;
-
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.StringTokenizer;
+
 import org.eclipse.emf.common.ui.viewer.IViewerProvider;
 
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -56,12 +56,12 @@ import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PartInitException;
 
 /**
- * This is the action bar contributor for the EObjectBooleanExpressions model editor.
+ * This is the action bar contributor for the BooleanExpressions model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class EObjectBooleanExpressionsActionBarContributor
+public class BooleanExpressionsActionBarContributor
 	extends EditingDomainActionBarContributor
 	implements ISelectionChangedListener {
 	/**
@@ -182,7 +182,7 @@ public class EObjectBooleanExpressionsActionBarContributor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EObjectBooleanExpressionsActionBarContributor() {
+	public BooleanExpressionsActionBarContributor() {
 		super(ADDITIONS_LAST_STYLE);
 		loadResourceAction = new LoadResourceAction();
 		validateAction = new ValidateAction();
@@ -197,8 +197,8 @@ public class EObjectBooleanExpressionsActionBarContributor
 	 */
 	@Override
 	public void contributeToToolBar(IToolBarManager toolBarManager) {
-		toolBarManager.add(new Separator("eobjectbooleanexpressions-settings")); //$NON-NLS-1$
-		toolBarManager.add(new Separator("eobjectbooleanexpressions-additions")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("booleanexpressions-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("booleanexpressions-additions")); //$NON-NLS-1$
 	}
 
 	/**
@@ -212,7 +212,7 @@ public class EObjectBooleanExpressionsActionBarContributor
 	public void contributeToMenu(IMenuManager menuManager) {
 		super.contributeToMenu(menuManager);
 
-		IMenuManager submenuManager = new MenuManager(ExpressionsEditorPlugin.INSTANCE.getString("_UI_EObjectBooleanExpressionsEditor_menu"), "org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackageMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		IMenuManager submenuManager = new MenuManager(ExpressionsEditorPlugin.INSTANCE.getString("_UI_BooleanExpressionsEditor_menu"), "org.eclipse.papyrus.infra.emf.expressions.booleanexpressionsMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
 		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
 		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
 		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/presentation/EObjectBooleanExpressionsEditor.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/presentation/BooleanExpressionsEditor.java
index 5d1392de312..5f4ec67f56f 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/presentation/EObjectBooleanExpressionsEditor.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/presentation/BooleanExpressionsEditor.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.presentation;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.presentation;
 
 
 import java.io.IOException;
@@ -154,7 +154,7 @@ import org.eclipse.emf.edit.ui.util.EditUIUtil;
 
 import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.provider.EObjectBooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
 
 import org.eclipse.papyrus.infra.emf.expressions.presentation.ExpressionsEditorPlugin;
 
@@ -164,12 +164,12 @@ import org.eclipse.ui.actions.WorkspaceModifyOperation;
 
 
 /**
- * This is an example of a EObjectBooleanExpressions model editor.
+ * This is an example of a BooleanExpressions model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class EObjectBooleanExpressionsEditor
+public class BooleanExpressionsEditor
 	extends MultiPageEditorPart
 	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
 	/**
@@ -281,18 +281,18 @@ public class EObjectBooleanExpressionsEditor
 			public void partActivated(IWorkbenchPart p) {
 				if (p instanceof ContentOutline) {
 					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
-						getActionBarContributor().setActiveEditor(EObjectBooleanExpressionsEditor.this);
+						getActionBarContributor().setActiveEditor(BooleanExpressionsEditor.this);
 
 						setCurrentViewer(contentOutlineViewer);
 					}
 				}
 				else if (p instanceof PropertySheet) {
 					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
-						getActionBarContributor().setActiveEditor(EObjectBooleanExpressionsEditor.this);
+						getActionBarContributor().setActiveEditor(BooleanExpressionsEditor.this);
 						handleActivate();
 					}
 				}
-				else if (p == EObjectBooleanExpressionsEditor.this) {
+				else if (p == BooleanExpressionsEditor.this) {
 					handleActivate();
 				}
 			}
@@ -465,7 +465,7 @@ public class EObjectBooleanExpressionsEditor
 								 public void run() {
 									 removedResources.addAll(visitor.getRemovedResources());
 									 if (!isDirty()) {
-										 getSite().getPage().closeEditor(EObjectBooleanExpressionsEditor.this, false);
+										 getSite().getPage().closeEditor(BooleanExpressionsEditor.this, false);
 									 }
 								 }
 							 });
@@ -476,7 +476,7 @@ public class EObjectBooleanExpressionsEditor
 							(new Runnable() {
 								 public void run() {
 									 changedResources.addAll(visitor.getChangedResources());
-									 if (getSite().getPage().getActiveEditor() == EObjectBooleanExpressionsEditor.this) {
+									 if (getSite().getPage().getActiveEditor() == BooleanExpressionsEditor.this) {
 										 handleActivate();
 									 }
 								 }
@@ -508,7 +508,7 @@ public class EObjectBooleanExpressionsEditor
 
 		if (!removedResources.isEmpty()) {
 			if (handleDirtyConflict()) {
-				getSite().getPage().closeEditor(EObjectBooleanExpressionsEditor.this, false);
+				getSite().getPage().closeEditor(BooleanExpressionsEditor.this, false);
 			}
 			else {
 				removedResources.clear();
@@ -635,7 +635,7 @@ public class EObjectBooleanExpressionsEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EObjectBooleanExpressionsEditor() {
+	public BooleanExpressionsEditor() {
 		super();
 		initializeEditingDomain();
 	}
@@ -653,7 +653,7 @@ public class EObjectBooleanExpressionsEditor
 
 		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new EObjectBooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
 
 		// Create the command stack that will notify this editor as commands are executed.
@@ -1155,8 +1155,8 @@ public class EObjectBooleanExpressionsEditor
 			new ExtendedPropertySheetPage(editingDomain) {
 				@Override
 				public void setSelectionToViewer(List<?> selection) {
-					EObjectBooleanExpressionsEditor.this.setSelectionToViewer(selection);
-					EObjectBooleanExpressionsEditor.this.setFocus();
+					BooleanExpressionsEditor.this.setSelectionToViewer(selection);
+					BooleanExpressionsEditor.this.setFocus();
 				}
 
 				@Override
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/src-gen/org/eclipse/papyrus/infra/emf/expressions/presentation/ExpressionsEditor.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/src-gen/org/eclipse/papyrus/infra/emf/expressions/presentation/ExpressionsEditor.java
index d59fc836907..45a9fe55140 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/src-gen/org/eclipse/papyrus/infra/emf/expressions/presentation/ExpressionsEditor.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/src-gen/org/eclipse/papyrus/infra/emf/expressions/presentation/ExpressionsEditor.java
@@ -166,8 +166,7 @@ import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
 
 import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.provider.EObjectBooleanExpressionsItemProviderAdapterFactory;
-
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 
 
@@ -711,7 +710,7 @@ public class ExpressionsEditor
 
 		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new EObjectBooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
 
 		// Create the command stack that will notify this editor as commands are executed.
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/README b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/README
new file mode 100755
index 00000000000..4877f7d0328
--- /dev/null
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/README
@@ -0,0 +1,2 @@
+Property View generator framework generates views for EClass and EObject.
+We must remove these views. Keeping them, we get an Expression view in the Papyrus Welcome Page and in other location using property views framework.
+\ No newline at end of file
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx
index 694ceee711d..bdca266dae0 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx
@@ -1,303 +1,275 @@
 <?xml version="1.0" encoding="ASCII"?>
-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_1yC0ICduEeeoAJG6t_MwCA" name="expressions">
-  <tabs xmi:id="_3OlDkCduEeeoAJG6t_MwCA" label="expressions" id="expressions" priority="100">
-    <sections xmi:id="_3Ou0kCduEeeoAJG6t_MwCA" name="Single IBasicExpressionElement" sectionFile="ui/SingleIBasicExpressionElement.xwt">
+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_TD6UMCq7EeeggtQf9kdCWQ" name="expressions">
+  <tabs xmi:id="_UckJMCq7EeeggtQf9kdCWQ" label="expressions" id="expressions" priority="100">
+    <sections xmi:id="_UckwQCq7EeeggtQf9kdCWQ" name="Single IBasicExpressionElement" sectionFile="ui/SingleIBasicExpressionElement.xwt">
       <widget href="ui/SingleIBasicExpressionElement.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0kSduEeeoAJG6t_MwCA" name="Single IExpression" sectionFile="ui/SingleIExpression.xwt">
+    <sections xmi:id="_UckwQSq7EeeggtQf9kdCWQ" name="Single IExpression" sectionFile="ui/SingleIExpression.xwt">
       <widget href="ui/SingleIExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0kiduEeeoAJG6t_MwCA" name="Single ExpressionCatalog" sectionFile="ui/SingleExpressionCatalog.xwt">
+    <sections xmi:id="_UckwQiq7EeeggtQf9kdCWQ" name="Single ExpressionCatalog" sectionFile="ui/SingleExpressionCatalog.xwt">
       <widget href="ui/SingleExpressionCatalog.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0kyduEeeoAJG6t_MwCA" name="Single EClass" sectionFile="ui/SingleEClass.xwt">
+    <sections xmi:id="_UclXUCq7EeeggtQf9kdCWQ" name="Single EClass" sectionFile="ui/SingleEClass.xwt">
       <widget href="ui/SingleEClass.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0lCduEeeoAJG6t_MwCA" name="Single EObject" sectionFile="ui/SingleEObject.xwt">
+    <sections xmi:id="_UclXUSq7EeeggtQf9kdCWQ" name="Single EObject" sectionFile="ui/SingleEObject.xwt">
       <widget href="ui/SingleEObject.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0lSduEeeoAJG6t_MwCA" name="Multiple IBasicExpressionElement" sectionFile="ui/MultipleIBasicExpressionElement.xwt">
+    <sections xmi:id="_UclXUiq7EeeggtQf9kdCWQ" name="Multiple IBasicExpressionElement" sectionFile="ui/MultipleIBasicExpressionElement.xwt">
       <widget href="ui/MultipleIBasicExpressionElement.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0liduEeeoAJG6t_MwCA" name="Multiple IExpression" sectionFile="ui/MultipleIExpression.xwt">
+    <sections xmi:id="_Ucl-YCq7EeeggtQf9kdCWQ" name="Multiple IExpression" sectionFile="ui/MultipleIExpression.xwt">
       <widget href="ui/MultipleIExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0lyduEeeoAJG6t_MwCA" name="Multiple ExpressionCatalog" sectionFile="ui/MultipleExpressionCatalog.xwt">
+    <sections xmi:id="_Ucl-YSq7EeeggtQf9kdCWQ" name="Multiple ExpressionCatalog" sectionFile="ui/MultipleExpressionCatalog.xwt">
       <widget href="ui/MultipleExpressionCatalog.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0mCduEeeoAJG6t_MwCA" name="Multiple EClass" sectionFile="ui/MultipleEClass.xwt">
+    <sections xmi:id="_Ucl-Yiq7EeeggtQf9kdCWQ" name="Multiple EClass" sectionFile="ui/MultipleEClass.xwt">
       <widget href="ui/MultipleEClass.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0mSduEeeoAJG6t_MwCA" name="Multiple EObject" sectionFile="ui/MultipleEObject.xwt">
+    <sections xmi:id="_Ucl-Yyq7EeeggtQf9kdCWQ" name="Multiple EObject" sectionFile="ui/MultipleEObject.xwt">
       <widget href="ui/MultipleEObject.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0miduEeeoAJG6t_MwCA" name="Single IBooleanExpression" sectionFile="ui/SingleIBooleanExpression.xwt">
+    <sections xmi:id="_UcmlcCq7EeeggtQf9kdCWQ" name="Single IBooleanExpression" sectionFile="ui/SingleIBooleanExpression.xwt">
       <widget href="ui/SingleIBooleanExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0myduEeeoAJG6t_MwCA" name="Multiple IBooleanExpression" sectionFile="ui/MultipleIBooleanExpression.xwt">
+    <sections xmi:id="_UcmlcSq7EeeggtQf9kdCWQ" name="Multiple IBooleanExpression" sectionFile="ui/MultipleIBooleanExpression.xwt">
       <widget href="ui/MultipleIBooleanExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0nCduEeeoAJG6t_MwCA" name="Single IBooleanEObjectExpression" sectionFile="ui/SingleIBooleanEObjectExpression.xwt">
+    <sections xmi:id="_Ucmlciq7EeeggtQf9kdCWQ" name="Single IBooleanEObjectExpression" sectionFile="ui/SingleIBooleanEObjectExpression.xwt">
       <widget href="ui/SingleIBooleanEObjectExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0nSduEeeoAJG6t_MwCA" name="Multiple IBooleanEObjectExpression" sectionFile="ui/MultipleIBooleanEObjectExpression.xwt">
+    <sections xmi:id="_Ucmlcyq7EeeggtQf9kdCWQ" name="Multiple IBooleanEObjectExpression" sectionFile="ui/MultipleIBooleanEObjectExpression.xwt">
       <widget href="ui/MultipleIBooleanEObjectExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0niduEeeoAJG6t_MwCA" name="Single OrExpression" sectionFile="ui/SingleOrExpression.xwt">
+    <sections xmi:id="_UcnMgCq7EeeggtQf9kdCWQ" name="Single OrExpression" sectionFile="ui/SingleOrExpression.xwt">
       <widget href="ui/SingleOrExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0nyduEeeoAJG6t_MwCA" name="Multiple OrExpression" sectionFile="ui/MultipleOrExpression.xwt">
+    <sections xmi:id="_UcnMgSq7EeeggtQf9kdCWQ" name="Multiple OrExpression" sectionFile="ui/MultipleOrExpression.xwt">
       <widget href="ui/MultipleOrExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0oCduEeeoAJG6t_MwCA" name="Single AndExpression" sectionFile="ui/SingleAndExpression.xwt">
+    <sections xmi:id="_UcnMgiq7EeeggtQf9kdCWQ" name="Single AndExpression" sectionFile="ui/SingleAndExpression.xwt">
       <widget href="ui/SingleAndExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0oSduEeeoAJG6t_MwCA" name="Multiple AndExpression" sectionFile="ui/MultipleAndExpression.xwt">
+    <sections xmi:id="_UcnzkCq7EeeggtQf9kdCWQ" name="Multiple AndExpression" sectionFile="ui/MultipleAndExpression.xwt">
       <widget href="ui/MultipleAndExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0oiduEeeoAJG6t_MwCA" name="Single NotExpression" sectionFile="ui/SingleNotExpression.xwt">
+    <sections xmi:id="_UcnzkSq7EeeggtQf9kdCWQ" name="Single NotExpression" sectionFile="ui/SingleNotExpression.xwt">
       <widget href="ui/SingleNotExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0oyduEeeoAJG6t_MwCA" name="Multiple NotExpression" sectionFile="ui/MultipleNotExpression.xwt">
+    <sections xmi:id="_UcoaoCq7EeeggtQf9kdCWQ" name="Multiple NotExpression" sectionFile="ui/MultipleNotExpression.xwt">
       <widget href="ui/MultipleNotExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0pCduEeeoAJG6t_MwCA" name="Single LiteralTrueExpression" sectionFile="ui/SingleLiteralTrueExpression.xwt">
+    <sections xmi:id="_UcoaoSq7EeeggtQf9kdCWQ" name="Single LiteralTrueExpression" sectionFile="ui/SingleLiteralTrueExpression.xwt">
       <widget href="ui/SingleLiteralTrueExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0pSduEeeoAJG6t_MwCA" name="Multiple LiteralTrueExpression" sectionFile="ui/MultipleLiteralTrueExpression.xwt">
+    <sections xmi:id="_Ucoaoiq7EeeggtQf9kdCWQ" name="Multiple LiteralTrueExpression" sectionFile="ui/MultipleLiteralTrueExpression.xwt">
       <widget href="ui/MultipleLiteralTrueExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0piduEeeoAJG6t_MwCA" name="Single LiteralFalseExpression" sectionFile="ui/SingleLiteralFalseExpression.xwt">
+    <sections xmi:id="_Ucoaoyq7EeeggtQf9kdCWQ" name="Single LiteralFalseExpression" sectionFile="ui/SingleLiteralFalseExpression.xwt">
       <widget href="ui/SingleLiteralFalseExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0pyduEeeoAJG6t_MwCA" name="Multiple LiteralFalseExpression" sectionFile="ui/MultipleLiteralFalseExpression.xwt">
+    <sections xmi:id="_UcpBsCq7EeeggtQf9kdCWQ" name="Multiple LiteralFalseExpression" sectionFile="ui/MultipleLiteralFalseExpression.xwt">
       <widget href="ui/MultipleLiteralFalseExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0qCduEeeoAJG6t_MwCA" name="Single ReferenceBooleanExpression" sectionFile="ui/SingleReferenceBooleanExpression.xwt">
+    <sections xmi:id="_UcpBsSq7EeeggtQf9kdCWQ" name="Single ReferenceBooleanExpression" sectionFile="ui/SingleReferenceBooleanExpression.xwt">
       <widget href="ui/SingleReferenceBooleanExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_3Ou0qSduEeeoAJG6t_MwCA" name="Multiple ReferenceBooleanExpression" sectionFile="ui/MultipleReferenceBooleanExpression.xwt">
+    <sections xmi:id="_UcpBsiq7EeeggtQf9kdCWQ" name="Multiple ReferenceBooleanExpression" sectionFile="ui/MultipleReferenceBooleanExpression.xwt">
       <widget href="ui/MultipleReferenceBooleanExpression.xwt#/"/>
     </sections>
   </tabs>
-  <views xmi:id="_1yC0ISduEeeoAJG6t_MwCA" name="Single IBasicExpressionElement" sections="_3Ou0kCduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0iiduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0IiduEeeoAJG6t_MwCA" name="isSingleIBasicExpressionElement">
+  <views xmi:id="_TD6UMSq7EeeggtQf9kdCWQ" name="Single IBasicExpressionElement" sections="_UckwQCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Umiq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UMiq7EeeggtQf9kdCWQ" name="isSingleIBasicExpressionElement">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0IyduEeeoAJG6t_MwCA" name="className" value="IBasicExpressionElement"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0JCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UMyq7EeeggtQf9kdCWQ" name="className" value="IBasicExpressionElement"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UNCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0JSduEeeoAJG6t_MwCA" name="Single IExpression" sections="_3Ou0kSduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0jSduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0JiduEeeoAJG6t_MwCA" name="isSingleIExpression">
+  <views xmi:id="_TD6UNSq7EeeggtQf9kdCWQ" name="Single IExpression" sections="_UckwQSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UnSq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UNiq7EeeggtQf9kdCWQ" name="isSingleIExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0JyduEeeoAJG6t_MwCA" name="className" value="IExpression"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0KCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UNyq7EeeggtQf9kdCWQ" name="className" value="IExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UOCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0KSduEeeoAJG6t_MwCA" name="Single ExpressionCatalog" sections="_3Ou0kiduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0jiduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0KiduEeeoAJG6t_MwCA" name="isSingleExpressionCatalog">
+  <views xmi:id="_TD6UOSq7EeeggtQf9kdCWQ" name="Single ExpressionCatalog" sections="_UckwQiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uniq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UOiq7EeeggtQf9kdCWQ" name="isSingleExpressionCatalog">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0KyduEeeoAJG6t_MwCA" name="className" value="ExpressionCatalog"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0LCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UOyq7EeeggtQf9kdCWQ" name="className" value="ExpressionCatalog"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UPCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0LSduEeeoAJG6t_MwCA" name="Single EClass" sections="_3Ou0kyduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0kCduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0LiduEeeoAJG6t_MwCA" name="isSingleEClass">
+  <views xmi:id="_TD6URSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple IBasicExpressionElement" sections="_UclXUiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Umiq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6URiq7EeeggtQf9kdCWQ" name="isMultipleIBasicExpressionElement">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0LyduEeeoAJG6t_MwCA" name="className" value="EClass"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0MCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6URyq7EeeggtQf9kdCWQ" name="className" value="IBasicExpressionElement"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6USCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0MSduEeeoAJG6t_MwCA" name="Single EObject" sections="_3Ou0lCduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0kSduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0MiduEeeoAJG6t_MwCA" name="isSingleEObject">
+  <views xmi:id="_TD6USSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple IExpression" sections="_Ucl-YCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UnSq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6USiq7EeeggtQf9kdCWQ" name="isMultipleIExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0MyduEeeoAJG6t_MwCA" name="className" value="EObject"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0NCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6USyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UTCq7EeeggtQf9kdCWQ" name="className" value="IExpression"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0NSduEeeoAJG6t_MwCA" elementMultiplicity="-1" name="Multiple IBasicExpressionElement" sections="_3Ou0lSduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0iiduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0NiduEeeoAJG6t_MwCA" name="isMultipleIBasicExpressionElement">
+  <views xmi:id="_TD6UTSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple ExpressionCatalog" sections="_Ucl-YSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uniq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UTiq7EeeggtQf9kdCWQ" name="isMultipleExpressionCatalog">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0NyduEeeoAJG6t_MwCA" name="className" value="IBasicExpressionElement"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0OCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UTyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UUCq7EeeggtQf9kdCWQ" name="className" value="ExpressionCatalog"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0OSduEeeoAJG6t_MwCA" elementMultiplicity="-1" name="Multiple IExpression" sections="_3Ou0liduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0jSduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0OiduEeeoAJG6t_MwCA" name="isMultipleIExpression">
+  <views xmi:id="_TD6UWSq7EeeggtQf9kdCWQ" name="Single IBooleanExpression" sections="_UcmlcCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Upyq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UWiq7EeeggtQf9kdCWQ" name="isSingleIBooleanExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0OyduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0PCduEeeoAJG6t_MwCA" name="className" value="IExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UWyq7EeeggtQf9kdCWQ" name="className" value="IBooleanExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UXCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0PSduEeeoAJG6t_MwCA" elementMultiplicity="-1" name="Multiple ExpressionCatalog" sections="_3Ou0lyduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0jiduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0PiduEeeoAJG6t_MwCA" name="isMultipleExpressionCatalog">
+  <views xmi:id="_TD6UXSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple IBooleanExpression" sections="_UcmlcSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Upyq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UXiq7EeeggtQf9kdCWQ" name="isMultipleIBooleanExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0PyduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0QCduEeeoAJG6t_MwCA" name="className" value="ExpressionCatalog"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UXyq7EeeggtQf9kdCWQ" name="className" value="IBooleanExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UYCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0QSduEeeoAJG6t_MwCA" elementMultiplicity="-1" name="Multiple EClass" sections="_3Ou0mCduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0kCduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0QiduEeeoAJG6t_MwCA" name="isMultipleEClass">
+  <views xmi:id="_TD6UYSq7EeeggtQf9kdCWQ" name="Single IBooleanEObjectExpression" sections="_Ucmlciq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Upiq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UYiq7EeeggtQf9kdCWQ" name="isSingleIBooleanEObjectExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0QyduEeeoAJG6t_MwCA" name="className" value="EClass"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0RCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UYyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UZCq7EeeggtQf9kdCWQ" name="className" value="IBooleanEObjectExpression"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0RSduEeeoAJG6t_MwCA" elementMultiplicity="-1" name="Multiple EObject" sections="_3Ou0mSduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0kSduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0RiduEeeoAJG6t_MwCA" name="isMultipleEObject">
+  <views xmi:id="_TD6UZSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple IBooleanEObjectExpression" sections="_Ucmlcyq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Upiq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UZiq7EeeggtQf9kdCWQ" name="isMultipleIBooleanEObjectExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0RyduEeeoAJG6t_MwCA" name="className" value="EObject"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0SCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UZyq7EeeggtQf9kdCWQ" name="className" value="IBooleanEObjectExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UaCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0SSduEeeoAJG6t_MwCA" name="Single IBooleanExpression" sections="_3Ou0miduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0lyduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0SiduEeeoAJG6t_MwCA" name="isSingleIBooleanExpression">
+  <views xmi:id="_TD6UaSq7EeeggtQf9kdCWQ" name="Single OrExpression" sections="_UcnMgCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uoyq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uaiq7EeeggtQf9kdCWQ" name="isSingleOrExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0SyduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0TCduEeeoAJG6t_MwCA" name="className" value="IBooleanExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Uayq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UbCq7EeeggtQf9kdCWQ" name="className" value="OrExpression"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0TSduEeeoAJG6t_MwCA" elementMultiplicity="-1" name="Multiple IBooleanExpression" sections="_3Ou0myduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0lyduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0TiduEeeoAJG6t_MwCA" name="isMultipleIBooleanExpression">
+  <views xmi:id="_TD6UbSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple OrExpression" sections="_UcnMgSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uoyq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ubiq7EeeggtQf9kdCWQ" name="isMultipleOrExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0TyduEeeoAJG6t_MwCA" name="className" value="IBooleanExpression"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0UCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ubyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UcCq7EeeggtQf9kdCWQ" name="className" value="OrExpression"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0USduEeeoAJG6t_MwCA" name="Single IBooleanEObjectExpression" sections="_3Ou0nCduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0liduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0UiduEeeoAJG6t_MwCA" name="isSingleIBooleanEObjectExpression">
+  <views xmi:id="_TD6UcSq7EeeggtQf9kdCWQ" name="Single AndExpression" sections="_UcnMgiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UqCq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uciq7EeeggtQf9kdCWQ" name="isSingleAndExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0UyduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0VCduEeeoAJG6t_MwCA" name="className" value="IBooleanEObjectExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ucyq7EeeggtQf9kdCWQ" name="className" value="AndExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UdCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0VSduEeeoAJG6t_MwCA" elementMultiplicity="-1" name="Multiple IBooleanEObjectExpression" sections="_3Ou0nSduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0liduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0ViduEeeoAJG6t_MwCA" name="isMultipleIBooleanEObjectExpression">
+  <views xmi:id="_TD6UdSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple AndExpression" sections="_UcnzkCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UqCq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Udiq7EeeggtQf9kdCWQ" name="isMultipleAndExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0VyduEeeoAJG6t_MwCA" name="className" value="IBooleanEObjectExpression"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0WCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Udyq7EeeggtQf9kdCWQ" name="className" value="AndExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UeCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0WSduEeeoAJG6t_MwCA" name="Single OrExpression" sections="_3Ou0niduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0kyduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0WiduEeeoAJG6t_MwCA" name="isSingleOrExpression">
+  <views xmi:id="_TD6UeSq7EeeggtQf9kdCWQ" name="Single NotExpression" sections="_UcnzkSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uqyq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ueiq7EeeggtQf9kdCWQ" name="isSingleNotExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0WyduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0XCduEeeoAJG6t_MwCA" name="className" value="OrExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ueyq7EeeggtQf9kdCWQ" name="className" value="NotExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UfCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0XSduEeeoAJG6t_MwCA" elementMultiplicity="-1" name="Multiple OrExpression" sections="_3Ou0nyduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0kyduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0XiduEeeoAJG6t_MwCA" name="isMultipleOrExpression">
+  <views xmi:id="_TD6UfSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple NotExpression" sections="_UcoaoCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uqyq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ufiq7EeeggtQf9kdCWQ" name="isMultipleNotExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0XyduEeeoAJG6t_MwCA" name="className" value="OrExpression"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0YCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ufyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UgCq7EeeggtQf9kdCWQ" name="className" value="NotExpression"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0YSduEeeoAJG6t_MwCA" name="Single AndExpression" sections="_3Ou0oCduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0mCduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0YiduEeeoAJG6t_MwCA" name="isSingleAndExpression">
+  <views xmi:id="_TD6UgSq7EeeggtQf9kdCWQ" name="Single LiteralTrueExpression" sections="_UcoaoSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uriq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ugiq7EeeggtQf9kdCWQ" name="isSingleLiteralTrueExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0YyduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0ZCduEeeoAJG6t_MwCA" name="className" value="AndExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ugyq7EeeggtQf9kdCWQ" name="className" value="LiteralTrueExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UhCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0ZSduEeeoAJG6t_MwCA" elementMultiplicity="-1" name="Multiple AndExpression" sections="_3Ou0oSduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0mCduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0ZiduEeeoAJG6t_MwCA" name="isMultipleAndExpression">
+  <views xmi:id="_TD6UhSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple LiteralTrueExpression" sections="_Ucoaoiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uriq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uhiq7EeeggtQf9kdCWQ" name="isMultipleLiteralTrueExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0ZyduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0aCduEeeoAJG6t_MwCA" name="className" value="AndExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Uhyq7EeeggtQf9kdCWQ" name="className" value="LiteralTrueExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UiCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0aSduEeeoAJG6t_MwCA" name="Single NotExpression" sections="_3Ou0oiduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0myduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0aiduEeeoAJG6t_MwCA" name="isSingleNotExpression">
+  <views xmi:id="_TD6UiSq7EeeggtQf9kdCWQ" name="Single LiteralFalseExpression" sections="_Ucoaoyq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uryq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uiiq7EeeggtQf9kdCWQ" name="isSingleLiteralFalseExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0ayduEeeoAJG6t_MwCA" name="className" value="NotExpression"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0bCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Uiyq7EeeggtQf9kdCWQ" name="className" value="LiteralFalseExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UjCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0bSduEeeoAJG6t_MwCA" elementMultiplicity="-1" name="Multiple NotExpression" sections="_3Ou0oyduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0myduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0biduEeeoAJG6t_MwCA" name="isMultipleNotExpression">
+  <views xmi:id="_TD6UjSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple LiteralFalseExpression" sections="_UcpBsCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uryq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ujiq7EeeggtQf9kdCWQ" name="isMultipleLiteralFalseExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0byduEeeoAJG6t_MwCA" name="className" value="NotExpression"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0cCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ujyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UkCq7EeeggtQf9kdCWQ" name="className" value="LiteralFalseExpression"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0cSduEeeoAJG6t_MwCA" name="Single LiteralTrueExpression" sections="_3Ou0pCduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0niduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0ciduEeeoAJG6t_MwCA" name="isSingleLiteralTrueExpression">
+  <views xmi:id="_TD6UkSq7EeeggtQf9kdCWQ" name="Single ReferenceBooleanExpression" sections="_UcpBsSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UsCq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ukiq7EeeggtQf9kdCWQ" name="isSingleReferenceBooleanExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0cyduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0dCduEeeoAJG6t_MwCA" name="className" value="LiteralTrueExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ukyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UlCq7EeeggtQf9kdCWQ" name="className" value="ReferenceBooleanExpression"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0dSduEeeoAJG6t_MwCA" elementMultiplicity="-1" name="Multiple LiteralTrueExpression" sections="_3Ou0pSduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0niduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0diduEeeoAJG6t_MwCA" name="isMultipleLiteralTrueExpression">
+  <views xmi:id="_TD6UlSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple ReferenceBooleanExpression" sections="_UcpBsiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UsCq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uliq7EeeggtQf9kdCWQ" name="isMultipleReferenceBooleanExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0dyduEeeoAJG6t_MwCA" name="className" value="LiteralTrueExpression"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0eCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ulyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UmCq7EeeggtQf9kdCWQ" name="className" value="ReferenceBooleanExpression"/>
     </constraints>
   </views>
-  <views xmi:id="_1yC0eSduEeeoAJG6t_MwCA" name="Single LiteralFalseExpression" sections="_3Ou0piduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0nyduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0eiduEeeoAJG6t_MwCA" name="isSingleLiteralFalseExpression">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0eyduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0fCduEeeoAJG6t_MwCA" name="className" value="LiteralFalseExpression"/>
-    </constraints>
-  </views>
-  <views xmi:id="_1yC0fSduEeeoAJG6t_MwCA" elementMultiplicity="-1" name="Multiple LiteralFalseExpression" sections="_3Ou0pyduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0nyduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0fiduEeeoAJG6t_MwCA" name="isMultipleLiteralFalseExpression">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0fyduEeeoAJG6t_MwCA" name="className" value="LiteralFalseExpression"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0gCduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
-    </constraints>
-  </views>
-  <views xmi:id="_1yC0gSduEeeoAJG6t_MwCA" name="Single ReferenceBooleanExpression" sections="_3Ou0qCduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0oCduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0giduEeeoAJG6t_MwCA" name="isSingleReferenceBooleanExpression">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0gyduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0hCduEeeoAJG6t_MwCA" name="className" value="ReferenceBooleanExpression"/>
-    </constraints>
-  </views>
-  <views xmi:id="_1yC0hSduEeeoAJG6t_MwCA" elementMultiplicity="-1" name="Multiple ReferenceBooleanExpression" sections="_3Ou0qSduEeeoAJG6t_MwCA" automaticContext="true" datacontexts="_1yC0oCduEeeoAJG6t_MwCA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_1yC0hiduEeeoAJG6t_MwCA" name="isMultipleReferenceBooleanExpression">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0hyduEeeoAJG6t_MwCA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_1yC0iCduEeeoAJG6t_MwCA" name="className" value="ReferenceBooleanExpression"/>
-    </constraints>
-  </views>
-  <dataContexts xmi:id="_1yC0iSduEeeoAJG6t_MwCA" name="expressions" label="expressions">
-    <elements xmi:id="_1yC0iiduEeeoAJG6t_MwCA" name="IBasicExpressionElement">
-      <properties xmi:id="_1yC0iyduEeeoAJG6t_MwCA" name="name"/>
-      <properties xmi:id="_1yC0jCduEeeoAJG6t_MwCA" name="description"/>
+  <dataContexts xmi:id="_TD6UmSq7EeeggtQf9kdCWQ" name="expressions" label="expressions">
+    <elements xmi:id="_TD6Umiq7EeeggtQf9kdCWQ" name="IBasicExpressionElement">
+      <properties xmi:id="_TD6Umyq7EeeggtQf9kdCWQ" name="name"/>
+      <properties xmi:id="_TD6UnCq7EeeggtQf9kdCWQ" name="description"/>
     </elements>
-    <elements xmi:id="_1yC0jSduEeeoAJG6t_MwCA" name="IExpression" supertypes="_1yC0iiduEeeoAJG6t_MwCA"/>
-    <elements xmi:id="_1yC0jiduEeeoAJG6t_MwCA" name="ExpressionCatalog" supertypes="_1yC0iiduEeeoAJG6t_MwCA">
-      <properties xmi:id="_1yC0jyduEeeoAJG6t_MwCA" name="expressions" type="Reference" multiplicity="-1"/>
+    <elements xmi:id="_TD6UnSq7EeeggtQf9kdCWQ" name="IExpression" supertypes="_TD6Umiq7EeeggtQf9kdCWQ"/>
+    <elements xmi:id="_TD6Uniq7EeeggtQf9kdCWQ" name="ExpressionCatalog" supertypes="_TD6Umiq7EeeggtQf9kdCWQ">
+      <properties xmi:id="_TD6Unyq7EeeggtQf9kdCWQ" name="expressions" type="Reference" multiplicity="-1"/>
     </elements>
-    <elements xmi:id="_1yC0kCduEeeoAJG6t_MwCA" name="EClass"/>
-    <elements xmi:id="_1yC0kSduEeeoAJG6t_MwCA" name="EObject"/>
-    <elements xsi:type="contexts:DataContextPackage" xmi:id="_1yC0kiduEeeoAJG6t_MwCA" name="booleanexpressionspackage">
-      <elements xmi:id="_1yC0kyduEeeoAJG6t_MwCA" name="OrExpression" supertypes="_1yC0liduEeeoAJG6t_MwCA">
-        <properties xmi:id="_1yC0lCduEeeoAJG6t_MwCA" name="ownedExpressions" type="Reference" multiplicity="-1"/>
-        <properties xmi:id="_1yC0lSduEeeoAJG6t_MwCA" name="referencedExpressions" type="Reference" multiplicity="-1"/>
+    <elements xmi:id="_TD6UoCq7EeeggtQf9kdCWQ" name="EClass"/>
+    <elements xmi:id="_TD6UoSq7EeeggtQf9kdCWQ" name="EObject"/>
+    <elements xsi:type="contexts:DataContextPackage" xmi:id="_TD6Uoiq7EeeggtQf9kdCWQ" name="booleanexpressions">
+      <elements xmi:id="_TD6Uoyq7EeeggtQf9kdCWQ" name="OrExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ">
+        <properties xmi:id="_TD6UpCq7EeeggtQf9kdCWQ" name="ownedExpressions" type="Reference" multiplicity="-1"/>
+        <properties xmi:id="_TD6UpSq7EeeggtQf9kdCWQ" name="referencedExpressions" type="Reference" multiplicity="-1"/>
       </elements>
-      <elements xmi:id="_1yC0liduEeeoAJG6t_MwCA" name="IBooleanEObjectExpression" supertypes="_1yC0lyduEeeoAJG6t_MwCA"/>
-      <elements xmi:id="_1yC0lyduEeeoAJG6t_MwCA" name="IBooleanExpression" supertypes="_1yC0jSduEeeoAJG6t_MwCA"/>
-      <elements xmi:id="_1yC0mCduEeeoAJG6t_MwCA" name="AndExpression" supertypes="_1yC0liduEeeoAJG6t_MwCA">
-        <properties xmi:id="_1yC0mSduEeeoAJG6t_MwCA" name="ownedExpressions" type="Reference" multiplicity="-1"/>
-        <properties xmi:id="_1yC0miduEeeoAJG6t_MwCA" name="referencedExpressions" type="Reference" multiplicity="-1"/>
+      <elements xmi:id="_TD6Upiq7EeeggtQf9kdCWQ" name="IBooleanEObjectExpression" supertypes="_TD6Upyq7EeeggtQf9kdCWQ"/>
+      <elements xmi:id="_TD6Upyq7EeeggtQf9kdCWQ" name="IBooleanExpression" supertypes="_TD6UnSq7EeeggtQf9kdCWQ"/>
+      <elements xmi:id="_TD6UqCq7EeeggtQf9kdCWQ" name="AndExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ">
+        <properties xmi:id="_TD6UqSq7EeeggtQf9kdCWQ" name="ownedExpressions" type="Reference" multiplicity="-1"/>
+        <properties xmi:id="_TD6Uqiq7EeeggtQf9kdCWQ" name="referencedExpressions" type="Reference" multiplicity="-1"/>
       </elements>
-      <elements xmi:id="_1yC0myduEeeoAJG6t_MwCA" name="NotExpression" supertypes="_1yC0liduEeeoAJG6t_MwCA">
-        <properties xmi:id="_1yC0nCduEeeoAJG6t_MwCA" name="ownedExpression" type="Reference"/>
-        <properties xmi:id="_1yC0nSduEeeoAJG6t_MwCA" name="referencedExpression" type="Reference"/>
+      <elements xmi:id="_TD6Uqyq7EeeggtQf9kdCWQ" name="NotExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ">
+        <properties xmi:id="_TD6UrCq7EeeggtQf9kdCWQ" name="ownedExpression" type="Reference"/>
+        <properties xmi:id="_TD6UrSq7EeeggtQf9kdCWQ" name="referencedExpression" type="Reference"/>
       </elements>
-      <elements xmi:id="_1yC0niduEeeoAJG6t_MwCA" name="LiteralTrueExpression" supertypes="_1yC0liduEeeoAJG6t_MwCA"/>
-      <elements xmi:id="_1yC0nyduEeeoAJG6t_MwCA" name="LiteralFalseExpression" supertypes="_1yC0liduEeeoAJG6t_MwCA"/>
-      <elements xmi:id="_1yC0oCduEeeoAJG6t_MwCA" name="ReferenceBooleanExpression" supertypes="_1yC0liduEeeoAJG6t_MwCA">
-        <properties xmi:id="_1yC0oSduEeeoAJG6t_MwCA" name="referencedExpression" type="Reference"/>
+      <elements xmi:id="_TD6Uriq7EeeggtQf9kdCWQ" name="LiteralTrueExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ"/>
+      <elements xmi:id="_TD6Uryq7EeeggtQf9kdCWQ" name="LiteralFalseExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ"/>
+      <elements xmi:id="_TD6UsCq7EeeggtQf9kdCWQ" name="ReferenceBooleanExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ">
+        <properties xmi:id="_TD6UsSq7EeeggtQf9kdCWQ" name="referencedExpression" type="Reference"/>
       </elements>
     </elements>
     <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/>
   </dataContexts>
   <dataContexts xmi:id="_6U4QsCdvEeeoAJG6t_MwCA" name="custom expressions" label="custom expressions">
-    <elements xmi:id="_Jq6mkCdwEeeoAJG6t_MwCA" name="CustomReferenceBooleanExpression" supertypes="_1yC0oCduEeeoAJG6t_MwCA">
+    <elements xmi:id="_Jq6mkCdwEeeoAJG6t_MwCA" name="CustomReferenceBooleanExpression" supertypes="_TD6UsCq7EeeggtQf9kdCWQ">
       <properties xmi:id="_X_kX8CdwEeeoAJG6t_MwCA" name="referencedExpression" type="Reference"/>
     </elements>
     <modelElementFactory href="Environment.xmi#//@modelElementFactories.0"/>
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleEClass.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleEClass.xwt
deleted file mode 100755
index e29bdbb8542..00000000000
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleEClass.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
-\ No newline at end of file
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleEObject.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleEObject.xwt
deleted file mode 100755
index e29bdbb8542..00000000000
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleEObject.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
-\ No newline at end of file
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAndExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAndExpression.xwt
index 33676d3406e..ac9030c9ceb 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAndExpression.xwt
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAndExpression.xwt
@@ -20,8 +20,8 @@
 			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
 		</Composite.layout>
 		<ppe:MultiReference input="{Binding}"
-			property="expressions:booleanexpressionspackage:AndExpression:ownedExpressions"></ppe:MultiReference>
+			property="expressions:booleanexpressions:AndExpression:ownedExpressions"></ppe:MultiReference>
 		<ppe:MultiReference input="{Binding}"
-			property="expressions:booleanexpressionspackage:AndExpression:referencedExpressions"></ppe:MultiReference>
+			property="expressions:booleanexpressions:AndExpression:referencedExpressions"></ppe:MultiReference>
 	</Composite>
 </Composite>
 \ No newline at end of file
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleEClass.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleEClass.xwt
deleted file mode 100755
index e29bdbb8542..00000000000
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleEClass.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
-\ No newline at end of file
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleEObject.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleEObject.xwt
deleted file mode 100755
index e29bdbb8542..00000000000
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleEObject.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
-\ No newline at end of file
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleNotExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleNotExpression.xwt
index d3cc2df6bba..05eaea2e993 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleNotExpression.xwt
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleNotExpression.xwt
@@ -20,8 +20,8 @@
 			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
 		</Composite.layout>
 		<ppe:ReferenceDialog input="{Binding}"
-			property="expressions:booleanexpressionspackage:NotExpression:ownedExpression"></ppe:ReferenceDialog>
+			property="expressions:booleanexpressions:NotExpression:ownedExpression"></ppe:ReferenceDialog>
 		<ppe:ReferenceDialog input="{Binding}"
-			property="expressions:booleanexpressionspackage:NotExpression:referencedExpression"></ppe:ReferenceDialog>
+			property="expressions:booleanexpressions:NotExpression:referencedExpression"></ppe:ReferenceDialog>
 	</Composite>
 </Composite>
 \ No newline at end of file
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleOrExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleOrExpression.xwt
index 2a3cf54d2f0..202d438140a 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleOrExpression.xwt
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleOrExpression.xwt
@@ -20,8 +20,8 @@
 			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
 		</Composite.layout>
 		<ppe:MultiReference input="{Binding}"
-			property="expressions:booleanexpressionspackage:OrExpression:ownedExpressions"></ppe:MultiReference>
+			property="expressions:booleanexpressions:OrExpression:ownedExpressions"></ppe:MultiReference>
 		<ppe:MultiReference input="{Binding}"
-			property="expressions:booleanexpressionspackage:OrExpression:referencedExpressions"></ppe:MultiReference>
+			property="expressions:booleanexpressions:OrExpression:referencedExpressions"></ppe:MultiReference>
 	</Composite>
 </Composite>
 \ No newline at end of file
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/src/org/eclipse/papyrus/infra/emf/expressions/properties/factories/CustomExpressionsEMFModelElementFactory.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/src/org/eclipse/papyrus/infra/emf/expressions/properties/factories/CustomExpressionsEMFModelElementFactory.java
index 7ef9e53174a..78330e6b6a6 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/src/org/eclipse/papyrus/infra/emf/expressions/properties/factories/CustomExpressionsEMFModelElementFactory.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/src/org/eclipse/papyrus/infra/emf/expressions/properties/factories/CustomExpressionsEMFModelElementFactory.java
@@ -14,7 +14,8 @@
 package org.eclipse.papyrus.infra.emf.expressions.properties.factories;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression;
+import org.eclipse.papyrus.infra.emf.expressions.properties.Activator;
 import org.eclipse.papyrus.infra.emf.expressions.properties.modelelements.ReferenceBooleanEObjectExpressionModelElement;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
@@ -37,6 +38,11 @@ public class CustomExpressionsEMFModelElementFactory extends EMFModelElementFact
 	 */
 	@Override
 	protected EMFModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {
+		final EObject source = EMFHelper.getEObject(sourceElement);
+		if (null == source) {
+			Activator.log.warn("Unable to resolve the selected element to an EObject"); //$NON-NLS-1$
+			return null;
+		}
 		if (sourceElement instanceof ReferenceBooleanExpression) {
 			return new ReferenceBooleanEObjectExpressionModelElement((EObject) sourceElement, EMFHelper.resolveEditingDomain(sourceElement));
 		}
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/src/org/eclipse/papyrus/infra/emf/expressions/properties/modelelements/ReferenceBooleanEObjectExpressionModelElement.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/src/org/eclipse/papyrus/infra/emf/expressions/properties/modelelements/ReferenceBooleanEObjectExpressionModelElement.java
index d16aaa5fe0f..4ccbb5ecca1 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/src/org/eclipse/papyrus/infra/emf/expressions/properties/modelelements/ReferenceBooleanEObjectExpressionModelElement.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/src/org/eclipse/papyrus/infra/emf/expressions/properties/modelelements/ReferenceBooleanEObjectExpressionModelElement.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.infra.emf.expressions.properties.modelelements;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
 import org.eclipse.papyrus.infra.emf.expressions.properties.provider.ExpressionCatalogContentProvider;
 import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
@@ -27,11 +27,6 @@ import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
 public class ReferenceBooleanEObjectExpressionModelElement extends EMFModelElement {
 
 	/**
-	 * The managed feature
-	 */
-	private String REFERENCED_EXPRESSION = "referencedExpression";// $NON-NLS-0$
-
-	/**
 	 * Constructor.
 	 *
 	 * @param source
@@ -59,8 +54,8 @@ public class ReferenceBooleanEObjectExpressionModelElement extends EMFModelEleme
 	 */
 	@Override
 	public IStaticContentProvider getContentProvider(final String propertyPath) {
-		if (REFERENCED_EXPRESSION.equals(propertyPath)) {
-			return new ExpressionCatalogContentProvider(EObjectBooleanExpressionsPackage.eINSTANCE.getReferenceBooleanExpression_ReferencedExpression());
+		if (BooleanExpressionsPackage.eINSTANCE.getReferenceBooleanExpression_ReferencedExpression().getName().equals(propertyPath)) {
+			return new ExpressionCatalogContentProvider(BooleanExpressionsPackage.eINSTANCE.getReferenceBooleanExpression_ReferencedExpression());
 		}
 		return super.getContentProvider(propertyPath);
 	}
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/META-INF/MANIFEST.MF b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/META-INF/MANIFEST.MF
index 7589f886f2d..6f4a0ded812 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/META-INF/MANIFEST.MF
@@ -8,11 +8,11 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.papyrus.infra.emf.expressions,
- org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage,
- org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl,
- org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.util,
+ org.eclipse.papyrus.infra.emf.expressions.booleanexpressions,
+ org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.custom,
+ org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl,
+ org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.util,
  org.eclipse.papyrus.infra.emf.expressions.catalog,
- org.eclipse.papyrus.infra.emf.expressions.eobjectbooleanexpressions.custom,
  org.eclipse.papyrus.infra.emf.expressions.impl,
  org.eclipse.papyrus.infra.emf.expressions.util,
  org.eclipse.papyrus.infra.emf.expressions.util.custom
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore
index fedf41eb3c3..29f15e919af 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore
@@ -49,27 +49,27 @@
       abstract="true" interface="true"/>
   <eClassifiers xsi:type="ecore:EClass" name="EObject" instanceClassName="org.eclipse.emf.ecore.EObject"
       abstract="true" interface="true"/>
-  <eSubpackages name="booleanexpressionspackage" nsURI="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"
-      nsPrefix="booleanexpressionspackage">
+  <eSubpackages name="booleanexpressions" nsURI="http://www.eclipse.org/papyrus/expressions/booleanexpressions"
+      nsPrefix="booleanexpressions">
     <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <details key="originalName" value="BooleanExpressionsPackage"/>
+      <details key="originalName" value="BooleanExpressions"/>
     </eAnnotations>
-    <eClassifiers xsi:type="ecore:EClass" name="OrExpression" eSuperTypes="#//booleanexpressionspackage/IBooleanEObjectExpression">
+    <eClassifiers xsi:type="ecore:EClass" name="OrExpression" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Make an OR between all owned and referenced IBooleanExpressions.&#xD;&#xA;If ownedExpressions.size()==0 and referencedExpressions.size()==0, we return FALSE&#xD;&#xA;otherwize we return the OR between all owned and referenced expressions"/>
       </eAnnotations>
       <eStructuralFeatures xsi:type="ecore:EReference" name="ownedExpressions" ordered="false"
-          upperBound="-1" eType="#//booleanexpressionspackage/IBooleanEObjectExpression"
+          upperBound="-1" eType="#//booleanexpressions/IBooleanEObjectExpression"
           containment="true"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="referencedExpressions"
-          ordered="false" upperBound="-1" eType="#//booleanexpressionspackage/IBooleanEObjectExpression"/>
+          ordered="false" upperBound="-1" eType="#//booleanexpressions/IBooleanEObjectExpression"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="IBooleanEObjectExpression" abstract="true"
         interface="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The common type to use for all BooleanExpression evaluating EObject&#xD;&#xA;&#xD;&#xA;"/>
       </eAnnotations>
-      <eGenericSuperTypes eClassifier="#//booleanexpressionspackage/IBooleanExpression">
+      <eGenericSuperTypes eClassifier="#//booleanexpressions/IBooleanExpression">
         <eTypeArguments eClassifier="#//EObject"/>
       </eGenericSuperTypes>
     </eClassifiers>
@@ -81,45 +81,45 @@
         </eAnnotations>
       </eTypeParameters>
       <eGenericSuperTypes eClassifier="#//IExpression">
-        <eTypeArguments eTypeParameter="#//booleanexpressionspackage/IBooleanExpression/IBooleanExpression_REDEFINED_CONTEXT_TYPE"/>
+        <eTypeArguments eTypeParameter="#//booleanexpressions/IBooleanExpression/IBooleanExpression_REDEFINED_CONTEXT_TYPE"/>
         <eTypeArguments eClassifier="#//Bool"/>
       </eGenericSuperTypes>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="AndExpression" eSuperTypes="#//booleanexpressionspackage/IBooleanEObjectExpression">
+    <eClassifiers xsi:type="ecore:EClass" name="AndExpression" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Make an AND between all owned and referenced IBooleanExpression.&#xD;&#xA;If ownedExpressions.size()==0 and referencedExpressions.size()==0, we return TRUE&#xD;&#xA;otherwize we return the OR between all owned and referenced expressions"/>
       </eAnnotations>
       <eStructuralFeatures xsi:type="ecore:EReference" name="ownedExpressions" ordered="false"
-          upperBound="-1" eType="#//booleanexpressionspackage/IBooleanEObjectExpression"
+          upperBound="-1" eType="#//booleanexpressions/IBooleanEObjectExpression"
           containment="true"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="referencedExpressions"
-          ordered="false" upperBound="-1" eType="#//booleanexpressionspackage/IBooleanEObjectExpression"/>
+          ordered="false" upperBound="-1" eType="#//booleanexpressions/IBooleanEObjectExpression"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NotExpression" eSuperTypes="#//booleanexpressionspackage/IBooleanEObjectExpression">
+    <eClassifiers xsi:type="ecore:EClass" name="NotExpression" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Make a not on an IBooleanExpression&#xD;&#xA;If ownedExpression==NULL and referencedExpression==NULL we return FALSE&#xD;&#xA;If ownedExpression&lt;>NULL and referencedExpression&lt;>NULL we return the result for ownedExpression. The referencedExpression is ignored&#xD;&#xA;In other case we return the evaluation of the non NULL expression"/>
       </eAnnotations>
       <eStructuralFeatures xsi:type="ecore:EReference" name="ownedExpression" ordered="false"
-          eType="#//booleanexpressionspackage/IBooleanEObjectExpression" containment="true"/>
+          eType="#//booleanexpressions/IBooleanEObjectExpression" containment="true"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="referencedExpression"
-          ordered="false" eType="#//booleanexpressionspackage/IBooleanEObjectExpression"/>
+          ordered="false" eType="#//booleanexpressions/IBooleanEObjectExpression"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="LiteralTrueExpression" eSuperTypes="#//booleanexpressionspackage/IBooleanEObjectExpression">
+    <eClassifiers xsi:type="ecore:EClass" name="LiteralTrueExpression" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Returns always TRUE"/>
       </eAnnotations>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="LiteralFalseExpression" eSuperTypes="#//booleanexpressionspackage/IBooleanEObjectExpression">
+    <eClassifiers xsi:type="ecore:EClass" name="LiteralFalseExpression" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Returns always false"/>
       </eAnnotations>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="ReferenceBooleanExpression" eSuperTypes="#//booleanexpressionspackage/IBooleanEObjectExpression">
+    <eClassifiers xsi:type="ecore:EClass" name="ReferenceBooleanExpression" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="This expression allows to reference an expression defined in another model.&#xD;&#xA;If there is no expression referenced we return TRUE."/>
       </eAnnotations>
       <eStructuralFeatures xsi:type="ecore:EReference" name="referencedExpression"
-          ordered="false" eType="#//booleanexpressionspackage/IBooleanEObjectExpression"/>
+          ordered="false" eType="#//booleanexpressions/IBooleanEObjectExpression"/>
     </eClassifiers>
   </eSubpackages>
 </ecore:EPackage>
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.genmodel b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.genmodel
index cb6bebe2803..76ef86e5424 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.genmodel
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.genmodel
@@ -55,37 +55,37 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="expressions.ecore#//EClass"/>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="expressions.ecore#//EObject"/>
-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="EObjectBooleanExpressions"
+    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="BooleanExpressions"
         basePackage="org.eclipse.papyrus.infra.emf.expressions" disposableProviderFactory="true"
         generateExampleClass="false" multipleEditorPages="false" generateModelWizard="false"
-        ecorePackage="expressions.ecore#//booleanexpressionspackage">
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressionspackage/OrExpression">
+        extensibleProviderFactory="true" childCreationExtenders="true" ecorePackage="expressions.ecore#//booleanexpressions">
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/OrExpression">
         <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-            createChild="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressionspackage/OrExpression/ownedExpressions"/>
+            createChild="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/OrExpression/ownedExpressions"/>
         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-            propertySortChoices="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressionspackage/OrExpression/referencedExpressions"/>
+            propertySortChoices="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/OrExpression/referencedExpressions"/>
       </genClasses>
-      <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="expressions.ecore#//booleanexpressionspackage/IBooleanEObjectExpression"/>
-      <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="expressions.ecore#//booleanexpressionspackage/IBooleanExpression">
-        <genTypeParameters ecoreTypeParameter="expressions.ecore#//booleanexpressionspackage/IBooleanExpression/IBooleanExpression_REDEFINED_CONTEXT_TYPE"/>
+      <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="expressions.ecore#//booleanexpressions/IBooleanEObjectExpression"/>
+      <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="expressions.ecore#//booleanexpressions/IBooleanExpression">
+        <genTypeParameters ecoreTypeParameter="expressions.ecore#//booleanexpressions/IBooleanExpression/IBooleanExpression_REDEFINED_CONTEXT_TYPE"/>
       </genClasses>
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressionspackage/AndExpression">
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/AndExpression">
         <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-            createChild="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressionspackage/AndExpression/ownedExpressions"/>
+            createChild="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/AndExpression/ownedExpressions"/>
         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-            propertySortChoices="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressionspackage/AndExpression/referencedExpressions"/>
+            propertySortChoices="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/AndExpression/referencedExpressions"/>
       </genClasses>
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressionspackage/NotExpression">
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/NotExpression">
         <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-            createChild="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressionspackage/NotExpression/ownedExpression"/>
+            createChild="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/NotExpression/ownedExpression"/>
         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-            propertySortChoices="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressionspackage/NotExpression/referencedExpression"/>
+            propertySortChoices="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/NotExpression/referencedExpression"/>
       </genClasses>
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressionspackage/LiteralTrueExpression"/>
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressionspackage/LiteralFalseExpression"/>
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressionspackage/ReferenceBooleanExpression">
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/LiteralTrueExpression"/>
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/LiteralFalseExpression"/>
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/ReferenceBooleanExpression">
         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-            propertySortChoices="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressionspackage/ReferenceBooleanExpression/referencedExpression"/>
+            propertySortChoices="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/ReferenceBooleanExpression/referencedExpression"/>
       </genClasses>
     </nestedGenPackages>
   </genPackages>
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.notation b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.notation
index 6d88bcecdcd..ec392deda35 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.notation
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.notation
@@ -217,7 +217,7 @@
   <css:ModelStyleSheets xmi:id="_pOVMsBUqEee_D4EhwjboOQ">
     <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_pOWa0BUqEee_D4EhwjboOQ" path="/org.eclipse.papyrus.infra.emf.expressions/model/custom.css"/>
   </css:ModelStyleSheets>
-  <notation:Diagram xmi:id="_E-Du8BXiEee_D4EhwjboOQ" type="PapyrusUMLClassDiagram" name="EObjectBooleanExpression" measurementUnit="Pixel">
+  <notation:Diagram xmi:id="_E-Du8BXiEee_D4EhwjboOQ" type="PapyrusUMLClassDiagram" name="BooleanExpressionClassDiagram" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_SokXIBXiEee_D4EhwjboOQ" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_Sok-MBXiEee_D4EhwjboOQ" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_Sok-MRXiEee_D4EhwjboOQ" type="Class_FloatingNameLabel">
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.uml b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.uml
index 0c2afe46004..69428a272fc 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.uml
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.uml
@@ -50,7 +50,7 @@ The class ExpressionCatalogRegistry allows to find all registered Catalog throw
     <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XMj8MBrDEeedD7ZlFnJTGw" name="Boolean"/>
     <packagedElement xmi:type="uml:Interface" xmi:id="_LWXU4BoAEee5_t3XPJ6rjA" name="EClass"/>
     <packagedElement xmi:type="uml:Interface" xmi:id="_fLCccBoEEeetAMClMbO5iQ" name="EObject"/>
-    <packagedElement xmi:type="uml:Package" xmi:id="_0cNGMBXhEee_D4EhwjboOQ" name="BooleanExpressionsPackage" URI="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions">
+    <packagedElement xmi:type="uml:Package" xmi:id="_0cNGMBXhEee_D4EhwjboOQ" name="BooleanExpressions" URI="http://www.eclipse.org/papyrus/expressions/booleanexpressions">
       <ownedComment xmi:type="uml:Comment" xmi:id="_GlUW0Bn3EeeYEuQJkmbFAA" annotatedElement="_2GdzIBXiEee_D4EhwjboOQ">
         <body>Make an OR between all owned and referenced IBooleanExpressions.&#xD;
 If ownedExpressions.size()==0 and referencedExpressions.size()==0, we return FALSE&#xD;
@@ -106,9 +106,6 @@ If there is no expression referenced we return TRUE.</body>
         <ownedEnd xmi:type="uml:Property" xmi:id="_cc8HkBVbEee_D4EhwjboOQ" name="andexpression" type="_WpVKMBVbEee_D4EhwjboOQ" association="_cc5rUBVbEee_D4EhwjboOQ"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_wcKe0BVKEee_D4EhwjboOQ" name="LiteralTrueExpression">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_8RxwABVMEee_D4EhwjboOQ">
-          <body></body>
-        </ownedComment>
         <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_5eytMBVbEee_D4EhwjboOQ" client="_wcKe0BVKEee_D4EhwjboOQ" supplier="_P-MkYBVaEee_D4EhwjboOQ" contract="_P-MkYBVaEee_D4EhwjboOQ"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_2GdzIBXiEee_D4EhwjboOQ" name="OrExpression">
@@ -213,7 +210,7 @@ If there is no expression referenced we return TRUE.</body>
     </profileApplication>
   </uml:Model>
   <Ecore:EPackage xmi:id="_4JTR0Bn5EeeYEuQJkmbFAA" base_Package="_s7iicBUjEee_D4EhwjboOQ" packageName="expressions" nsPrefix="expressions" basePackage="org.eclipse.papyrus.infra.emf" prefix="Expressions"/>
-  <Ecore:EPackage xmi:id="_-wytwBn6EeeYEuQJkmbFAA" base_Package="_0cNGMBXhEee_D4EhwjboOQ" packageName="booleanexpressionspackage" nsPrefix="booleanexpressionspackage" basePackage="org.eclipse.papyrus.infra.emf.expressions" prefix="BooleanExpressionsPackage"/>
+  <Ecore:EPackage xmi:id="_-wytwBn6EeeYEuQJkmbFAA" base_Package="_0cNGMBXhEee_D4EhwjboOQ" packageName="booleanexpressions" nsPrefix="booleanexpressions" basePackage="org.eclipse.papyrus.infra.emf.expressions" prefix="BooleanExpressions"/>
   <Ecore:EClass xmi:id="_MZPHIBoAEee5_t3XPJ6rjA" instanceClassName="org.eclipse.emf.ecore.EClass" base_Interface="_LWXU4BoAEee5_t3XPJ6rjA" className="EClass"/>
   <Ecore:EClass xmi:id="_hGYHwBoEEeetAMClMbO5iQ" instanceClassName="org.eclipse.emf.ecore.EObject" base_Interface="_fLCccBoEEeetAMClMbO5iQ" className="EObject"/>
   <Ecore:EAttribute xmi:id="_YGSR8BqhEeex7OKxnYgv8Q" base_Property="_6fy8MBUkEee_D4EhwjboOQ" isID="true"/>
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/plugin.properties b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/plugin.properties
index 3b1bca8061b..0d3b49a46f2 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/plugin.properties
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/plugin.properties
@@ -9,5 +9,5 @@
 # Contributors:
 # 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Expressions Model
-providerName = www.example.org
+pluginName = Papyrus EMF Expression
+providerName = Eclipse Modeling Framework
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/plugin.xml b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/plugin.xml
index a96fd8c2eab..9e309554c4a 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/plugin.xml
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/plugin.xml
@@ -20,8 +20,8 @@
    <extension
          point="org.eclipse.emf.ecore.factory_override">
       <factory
-            class="org.eclipse.papyrus.infra.emf.expressions.eobjectbooleanexpressions.custom.CustomEObjectBooleanExpressionsFactory"
-            uri="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions">
+            class="org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.custom.CustomBooleanExpressionsFactory"
+            uri="http://www.eclipse.org/papyrus/expressions/booleanexpressions">
       </factory>
    </extension>
 
@@ -36,8 +36,8 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated expressions -->
       <package
-            uri="http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"
-            class="org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage"
+            uri="http://www.eclipse.org/papyrus/expressions/booleanexpressions"
+            class="org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage"
             genModel="model/expressions.genmodel"/>
    </extension>
 
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/AndExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AndExpression.java
index 755a61ba721..da343704bd3 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/AndExpression.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AndExpression.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -29,18 +29,18 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression#getOwnedExpressions <em>Owned Expressions</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression#getReferencedExpressions <em>Referenced Expressions</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression#getOwnedExpressions <em>Owned Expressions</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression#getReferencedExpressions <em>Referenced Expressions</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getAndExpression()
+ * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getAndExpression()
  * @model
  * @generated
  */
 public interface AndExpression extends IBooleanEObjectExpression {
 	/**
 	 * Returns the value of the '<em><b>Owned Expressions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Owned Expressions</em>' containment reference list isn't clear,
@@ -48,7 +48,7 @@ public interface AndExpression extends IBooleanEObjectExpression {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Owned Expressions</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getAndExpression_OwnedExpressions()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getAndExpression_OwnedExpressions()
 	 * @model containment="true" ordered="false"
 	 * @generated
 	 */
@@ -56,7 +56,7 @@ public interface AndExpression extends IBooleanEObjectExpression {
 
 	/**
 	 * Returns the value of the '<em><b>Referenced Expressions</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Referenced Expressions</em>' reference list isn't clear,
@@ -64,7 +64,7 @@ public interface AndExpression extends IBooleanEObjectExpression {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Referenced Expressions</em>' reference list.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getAndExpression_ReferencedExpressions()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getAndExpression_ReferencedExpressions()
 	 * @model ordered="false"
 	 * @generated
 	 */
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/EObjectBooleanExpressionsFactory.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/BooleanExpressionsFactory.java
index b497d523197..438486e3a38 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/EObjectBooleanExpressionsFactory.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/BooleanExpressionsFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -19,17 +19,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage
+ * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage
  * @generated
  */
-public interface EObjectBooleanExpressionsFactory extends EFactory {
+public interface BooleanExpressionsFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	EObjectBooleanExpressionsFactory eINSTANCE = org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsFactoryImpl.init();
+	BooleanExpressionsFactory eINSTANCE = org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Or Expression</em>'.
@@ -92,6 +92,6 @@ public interface EObjectBooleanExpressionsFactory extends EFactory {
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
-	EObjectBooleanExpressionsPackage getEObjectBooleanExpressionsPackage();
+	BooleanExpressionsPackage getBooleanExpressionsPackage();
 
-} //EObjectBooleanExpressionsFactory
+} //BooleanExpressionsFactory
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/EObjectBooleanExpressionsPackage.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/BooleanExpressionsPackage.java
index 834a9379e9f..ce721e8e5e4 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/EObjectBooleanExpressionsPackage.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/BooleanExpressionsPackage.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
@@ -30,19 +30,19 @@ import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsFactory
+ * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory
  * @model kind="package"
- *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='BooleanExpressionsPackage'"
+ *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='BooleanExpressions'"
  * @generated
  */
-public interface EObjectBooleanExpressionsPackage extends EPackage {
+public interface BooleanExpressionsPackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNAME = "booleanexpressionspackage"; //$NON-NLS-1$
+	String eNAME = "booleanexpressions"; //$NON-NLS-1$
 
 	/**
 	 * The package namespace URI.
@@ -50,7 +50,7 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/expressions/eobjectbooleanexpressions"; //$NON-NLS-1$
+	String eNS_URI = "http://www.eclipse.org/papyrus/expressions/booleanexpressions"; //$NON-NLS-1$
 
 	/**
 	 * The package namespace name.
@@ -58,7 +58,7 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_PREFIX = "booleanexpressionspackage"; //$NON-NLS-1$
+	String eNS_PREFIX = "booleanexpressions"; //$NON-NLS-1$
 
 	/**
 	 * The singleton instance of the package.
@@ -66,14 +66,14 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	EObjectBooleanExpressionsPackage eINSTANCE = org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl.init();
+	BooleanExpressionsPackage eINSTANCE = org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanExpression <em>IBoolean Expression</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanExpression <em>IBoolean Expression</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanExpression
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getIBooleanExpression()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getIBooleanExpression()
 	 * @generated
 	 */
 	int IBOOLEAN_EXPRESSION = 2;
@@ -124,11 +124,11 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 	int IBOOLEAN_EXPRESSION_OPERATION_COUNT = ExpressionsPackage.IEXPRESSION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression <em>IBoolean EObject Expression</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression <em>IBoolean EObject Expression</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getIBooleanEObjectExpression()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getIBooleanEObjectExpression()
 	 * @generated
 	 */
 	int IBOOLEAN_EOBJECT_EXPRESSION = 1;
@@ -179,11 +179,11 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 	int IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EXPRESSION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.OrExpressionImpl <em>Or Expression</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.OrExpressionImpl <em>Or Expression</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.OrExpressionImpl
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getOrExpression()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.OrExpressionImpl
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getOrExpression()
 	 * @generated
 	 */
 	int OR_EXPRESSION = 0;
@@ -252,11 +252,11 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 	int OR_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.AndExpressionImpl <em>And Expression</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl <em>And Expression</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.AndExpressionImpl
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getAndExpression()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getAndExpression()
 	 * @generated
 	 */
 	int AND_EXPRESSION = 3;
@@ -325,11 +325,11 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 	int AND_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.NotExpressionImpl <em>Not Expression</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl <em>Not Expression</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.NotExpressionImpl
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getNotExpression()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getNotExpression()
 	 * @generated
 	 */
 	int NOT_EXPRESSION = 4;
@@ -398,11 +398,11 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 	int NOT_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.LiteralTrueExpressionImpl <em>Literal True Expression</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralTrueExpressionImpl <em>Literal True Expression</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.LiteralTrueExpressionImpl
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getLiteralTrueExpression()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralTrueExpressionImpl
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getLiteralTrueExpression()
 	 * @generated
 	 */
 	int LITERAL_TRUE_EXPRESSION = 5;
@@ -453,11 +453,11 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 	int LITERAL_TRUE_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.LiteralFalseExpressionImpl <em>Literal False Expression</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralFalseExpressionImpl <em>Literal False Expression</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.LiteralFalseExpressionImpl
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getLiteralFalseExpression()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralFalseExpressionImpl
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getLiteralFalseExpression()
 	 * @generated
 	 */
 	int LITERAL_FALSE_EXPRESSION = 6;
@@ -508,11 +508,11 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 	int LITERAL_FALSE_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.ReferenceBooleanExpressionImpl <em>Reference Boolean Expression</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.ReferenceBooleanExpressionImpl <em>Reference Boolean Expression</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.ReferenceBooleanExpressionImpl
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getReferenceBooleanExpression()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.ReferenceBooleanExpressionImpl
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getReferenceBooleanExpression()
 	 * @generated
 	 */
 	int REFERENCE_BOOLEAN_EXPRESSION = 7;
@@ -573,157 +573,157 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression <em>Or Expression</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression <em>Or Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Or Expression</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression
 	 * @generated
 	 */
 	EClass getOrExpression();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression#getOwnedExpressions <em>Owned Expressions</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression#getOwnedExpressions <em>Owned Expressions</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Owned Expressions</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression#getOwnedExpressions()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression#getOwnedExpressions()
 	 * @see #getOrExpression()
 	 * @generated
 	 */
 	EReference getOrExpression_OwnedExpressions();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression#getReferencedExpressions <em>Referenced Expressions</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression#getReferencedExpressions <em>Referenced Expressions</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Referenced Expressions</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression#getReferencedExpressions()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression#getReferencedExpressions()
 	 * @see #getOrExpression()
 	 * @generated
 	 */
 	EReference getOrExpression_ReferencedExpressions();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression <em>IBoolean EObject Expression</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression <em>IBoolean EObject Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>IBoolean EObject Expression</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression
 	 * @generated
 	 */
 	EClass getIBooleanEObjectExpression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanExpression <em>IBoolean Expression</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanExpression <em>IBoolean Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>IBoolean Expression</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanExpression
 	 * @generated
 	 */
 	EClass getIBooleanExpression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression <em>And Expression</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression <em>And Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>And Expression</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression
 	 * @generated
 	 */
 	EClass getAndExpression();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression#getOwnedExpressions <em>Owned Expressions</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression#getOwnedExpressions <em>Owned Expressions</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Owned Expressions</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression#getOwnedExpressions()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression#getOwnedExpressions()
 	 * @see #getAndExpression()
 	 * @generated
 	 */
 	EReference getAndExpression_OwnedExpressions();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression#getReferencedExpressions <em>Referenced Expressions</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression#getReferencedExpressions <em>Referenced Expressions</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Referenced Expressions</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression#getReferencedExpressions()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression#getReferencedExpressions()
 	 * @see #getAndExpression()
 	 * @generated
 	 */
 	EReference getAndExpression_ReferencedExpressions();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression <em>Not Expression</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression <em>Not Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Not Expression</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression
 	 * @generated
 	 */
 	EClass getNotExpression();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression#getOwnedExpression <em>Owned Expression</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getOwnedExpression <em>Owned Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Owned Expression</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression#getOwnedExpression()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getOwnedExpression()
 	 * @see #getNotExpression()
 	 * @generated
 	 */
 	EReference getNotExpression_OwnedExpression();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression#getReferencedExpression <em>Referenced Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getReferencedExpression <em>Referenced Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Referenced Expression</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression#getReferencedExpression()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getReferencedExpression()
 	 * @see #getNotExpression()
 	 * @generated
 	 */
 	EReference getNotExpression_ReferencedExpression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralTrueExpression <em>Literal True Expression</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralTrueExpression <em>Literal True Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Literal True Expression</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralTrueExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralTrueExpression
 	 * @generated
 	 */
 	EClass getLiteralTrueExpression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralFalseExpression <em>Literal False Expression</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralFalseExpression <em>Literal False Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Literal False Expression</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralFalseExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralFalseExpression
 	 * @generated
 	 */
 	EClass getLiteralFalseExpression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression <em>Reference Boolean Expression</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression <em>Reference Boolean Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Reference Boolean Expression</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression
 	 * @generated
 	 */
 	EClass getReferenceBooleanExpression();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression#getReferencedExpression <em>Referenced Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression#getReferencedExpression <em>Referenced Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Referenced Expression</em>'.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression#getReferencedExpression()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression#getReferencedExpression()
 	 * @see #getReferenceBooleanExpression()
 	 * @generated
 	 */
@@ -736,7 +736,7 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
-	EObjectBooleanExpressionsFactory getEObjectBooleanExpressionsFactory();
+	BooleanExpressionsFactory getBooleanExpressionsFactory();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -753,11 +753,11 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.OrExpressionImpl <em>Or Expression</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.OrExpressionImpl <em>Or Expression</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.OrExpressionImpl
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getOrExpression()
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.OrExpressionImpl
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getOrExpression()
 		 * @generated
 		 */
 		EClass OR_EXPRESSION = eINSTANCE.getOrExpression();
@@ -779,31 +779,31 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 		EReference OR_EXPRESSION__REFERENCED_EXPRESSIONS = eINSTANCE.getOrExpression_ReferencedExpressions();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression <em>IBoolean EObject Expression</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression <em>IBoolean EObject Expression</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getIBooleanEObjectExpression()
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getIBooleanEObjectExpression()
 		 * @generated
 		 */
 		EClass IBOOLEAN_EOBJECT_EXPRESSION = eINSTANCE.getIBooleanEObjectExpression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanExpression <em>IBoolean Expression</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanExpression <em>IBoolean Expression</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanExpression
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getIBooleanExpression()
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanExpression
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getIBooleanExpression()
 		 * @generated
 		 */
 		EClass IBOOLEAN_EXPRESSION = eINSTANCE.getIBooleanExpression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.AndExpressionImpl <em>And Expression</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl <em>And Expression</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.AndExpressionImpl
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getAndExpression()
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getAndExpression()
 		 * @generated
 		 */
 		EClass AND_EXPRESSION = eINSTANCE.getAndExpression();
@@ -825,11 +825,11 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 		EReference AND_EXPRESSION__REFERENCED_EXPRESSIONS = eINSTANCE.getAndExpression_ReferencedExpressions();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.NotExpressionImpl <em>Not Expression</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl <em>Not Expression</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.NotExpressionImpl
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getNotExpression()
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getNotExpression()
 		 * @generated
 		 */
 		EClass NOT_EXPRESSION = eINSTANCE.getNotExpression();
@@ -851,31 +851,31 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 		EReference NOT_EXPRESSION__REFERENCED_EXPRESSION = eINSTANCE.getNotExpression_ReferencedExpression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.LiteralTrueExpressionImpl <em>Literal True Expression</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralTrueExpressionImpl <em>Literal True Expression</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.LiteralTrueExpressionImpl
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getLiteralTrueExpression()
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralTrueExpressionImpl
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getLiteralTrueExpression()
 		 * @generated
 		 */
 		EClass LITERAL_TRUE_EXPRESSION = eINSTANCE.getLiteralTrueExpression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.LiteralFalseExpressionImpl <em>Literal False Expression</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralFalseExpressionImpl <em>Literal False Expression</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.LiteralFalseExpressionImpl
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getLiteralFalseExpression()
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralFalseExpressionImpl
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getLiteralFalseExpression()
 		 * @generated
 		 */
 		EClass LITERAL_FALSE_EXPRESSION = eINSTANCE.getLiteralFalseExpression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.ReferenceBooleanExpressionImpl <em>Reference Boolean Expression</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.ReferenceBooleanExpressionImpl <em>Reference Boolean Expression</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.ReferenceBooleanExpressionImpl
-		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl#getReferenceBooleanExpression()
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.ReferenceBooleanExpressionImpl
+		 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getReferenceBooleanExpression()
 		 * @generated
 		 */
 		EClass REFERENCE_BOOLEAN_EXPRESSION = eINSTANCE.getReferenceBooleanExpression();
@@ -890,4 +890,4 @@ public interface EObjectBooleanExpressionsPackage extends EPackage {
 
 	}
 
-} //EObjectBooleanExpressionsPackage
+} //BooleanExpressionsPackage
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/IBooleanEObjectExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/IBooleanEObjectExpression.java
index c471bce85c4..8b0c00d306d 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/IBooleanEObjectExpression.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/IBooleanEObjectExpression.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -26,8 +26,8 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-model-doc -->
  *
  *
- * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getIBooleanEObjectExpression()
- * @model interface="true" abstract="true" superTypes="org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanExpression&lt;org.eclipse.papyrus.infra.emf.expressions.EObject&gt;"
+ * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getIBooleanEObjectExpression()
+ * @model interface="true" abstract="true" superTypes="org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanExpression&lt;org.eclipse.papyrus.infra.emf.expressions.EObject&gt;"
  * @generated
  */
 public interface IBooleanEObjectExpression extends IBooleanExpression<EObject> {
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/IBooleanExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/IBooleanExpression.java
index 94422d5668d..3790269d02c 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/IBooleanExpression.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/IBooleanExpression.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions;
 
 import org.eclipse.papyrus.infra.emf.expressions.IExpression;
 
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.infra.emf.expressions.IExpression;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getIBooleanExpression()
+ * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getIBooleanExpression()
  * @model interface="true" abstract="true" superTypes="org.eclipse.papyrus.infra.emf.expressions.IExpression&lt;IBooleanExpression_REDEFINED_CONTEXT_TYPE, org.eclipse.papyrus.infra.emf.expressions.Bool&gt;"
  * @generated
  */
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/LiteralFalseExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/LiteralFalseExpression.java
index eee7b11fdd6..7ab39c280b3 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/LiteralFalseExpression.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/LiteralFalseExpression.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions;
 
 
 /**
@@ -23,7 +23,7 @@ package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage;
  * <!-- end-model-doc -->
  *
  *
- * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getLiteralFalseExpression()
+ * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getLiteralFalseExpression()
  * @model
  * @generated
  */
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/LiteralTrueExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/LiteralTrueExpression.java
index 0396da235fc..f7d498ec12d 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/LiteralTrueExpression.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/LiteralTrueExpression.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions;
 
 
 /**
@@ -23,7 +23,7 @@ package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage;
  * <!-- end-model-doc -->
  *
  *
- * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getLiteralTrueExpression()
+ * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getLiteralTrueExpression()
  * @model
  * @generated
  */
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/NotExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/NotExpression.java
index d912651d379..f2f4a273f98 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/NotExpression.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/NotExpression.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions;
 
 
 /**
@@ -29,11 +29,11 @@ package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression#getOwnedExpression <em>Owned Expression</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression#getReferencedExpression <em>Referenced Expression</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getOwnedExpression <em>Owned Expression</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getReferencedExpression <em>Referenced Expression</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getNotExpression()
+ * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getNotExpression()
  * @model
  * @generated
  */
@@ -48,14 +48,14 @@ public interface NotExpression extends IBooleanEObjectExpression {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Owned Expression</em>' containment reference.
 	 * @see #setOwnedExpression(IBooleanEObjectExpression)
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getNotExpression_OwnedExpression()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getNotExpression_OwnedExpression()
 	 * @model containment="true" ordered="false"
 	 * @generated
 	 */
 	IBooleanEObjectExpression getOwnedExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression#getOwnedExpression <em>Owned Expression</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getOwnedExpression <em>Owned Expression</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Owned Expression</em>' containment reference.
@@ -74,14 +74,14 @@ public interface NotExpression extends IBooleanEObjectExpression {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Referenced Expression</em>' reference.
 	 * @see #setReferencedExpression(IBooleanEObjectExpression)
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getNotExpression_ReferencedExpression()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getNotExpression_ReferencedExpression()
 	 * @model ordered="false"
 	 * @generated
 	 */
 	IBooleanEObjectExpression getReferencedExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression#getReferencedExpression <em>Referenced Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getReferencedExpression <em>Referenced Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Referenced Expression</em>' reference.
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/OrExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/OrExpression.java
index a7f618b57cf..2ecf0a426dc 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/OrExpression.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/OrExpression.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -29,18 +29,18 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression#getOwnedExpressions <em>Owned Expressions</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression#getReferencedExpressions <em>Referenced Expressions</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression#getOwnedExpressions <em>Owned Expressions</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression#getReferencedExpressions <em>Referenced Expressions</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getOrExpression()
+ * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getOrExpression()
  * @model
  * @generated
  */
 public interface OrExpression extends IBooleanEObjectExpression {
 	/**
 	 * Returns the value of the '<em><b>Owned Expressions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Owned Expressions</em>' containment reference list isn't clear,
@@ -48,7 +48,7 @@ public interface OrExpression extends IBooleanEObjectExpression {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Owned Expressions</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getOrExpression_OwnedExpressions()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getOrExpression_OwnedExpressions()
 	 * @model containment="true" ordered="false"
 	 * @generated
 	 */
@@ -56,7 +56,7 @@ public interface OrExpression extends IBooleanEObjectExpression {
 
 	/**
 	 * Returns the value of the '<em><b>Referenced Expressions</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Referenced Expressions</em>' reference list isn't clear,
@@ -64,7 +64,7 @@ public interface OrExpression extends IBooleanEObjectExpression {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Referenced Expressions</em>' reference list.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getOrExpression_ReferencedExpressions()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getOrExpression_ReferencedExpressions()
 	 * @model ordered="false"
 	 * @generated
 	 */
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/ReferenceBooleanExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/ReferenceBooleanExpression.java
index 658e98aba23..96e53830a82 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/ReferenceBooleanExpression.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/ReferenceBooleanExpression.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions;
 
 
 /**
@@ -27,10 +27,10 @@ package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression#getReferencedExpression <em>Referenced Expression</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression#getReferencedExpression <em>Referenced Expression</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getReferenceBooleanExpression()
+ * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getReferenceBooleanExpression()
  * @model
  * @generated
  */
@@ -45,14 +45,14 @@ public interface ReferenceBooleanExpression extends IBooleanEObjectExpression {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Referenced Expression</em>' reference.
 	 * @see #setReferencedExpression(IBooleanEObjectExpression)
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#getReferenceBooleanExpression_ReferencedExpression()
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getReferenceBooleanExpression_ReferencedExpression()
 	 * @model ordered="false"
 	 * @generated
 	 */
 	IBooleanEObjectExpression getReferencedExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression#getReferencedExpression <em>Referenced Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression#getReferencedExpression <em>Referenced Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Referenced Expression</em>' reference.
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/AndExpressionImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AndExpressionImpl.java
index 56e86c0acd1..8149da8f568 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/AndExpressionImpl.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AndExpressionImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -32,9 +32,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;
 
 /**
  * <!-- begin-user-doc -->
@@ -44,10 +44,10 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBool
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.AndExpressionImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.AndExpressionImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.AndExpressionImpl#getOwnedExpressions <em>Owned Expressions</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.AndExpressionImpl#getReferencedExpressions <em>Referenced Expressions</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl#getOwnedExpressions <em>Owned Expressions</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl#getReferencedExpressions <em>Referenced Expressions</em>}</li>
  * </ul>
  *
  * @generated
@@ -129,7 +129,7 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return EObjectBooleanExpressionsPackage.Literals.AND_EXPRESSION;
+		return BooleanExpressionsPackage.Literals.AND_EXPRESSION;
 	}
 
 	/**
@@ -150,7 +150,7 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.AND_EXPRESSION__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.AND_EXPRESSION__NAME, oldName, name));
 	}
 
 	/**
@@ -171,7 +171,7 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A
 		String oldDescription = description;
 		description = newDescription;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION, oldDescription, description));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION, oldDescription, description));
 	}
 
 	/**
@@ -181,7 +181,7 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A
 	 */
 	public EList<IBooleanEObjectExpression> getOwnedExpressions() {
 		if (ownedExpressions == null) {
-			ownedExpressions = new EObjectContainmentEList<IBooleanEObjectExpression>(IBooleanEObjectExpression.class, this, EObjectBooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS);
+			ownedExpressions = new EObjectContainmentEList<IBooleanEObjectExpression>(IBooleanEObjectExpression.class, this, BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS);
 		}
 		return ownedExpressions;
 	}
@@ -193,7 +193,7 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A
 	 */
 	public EList<IBooleanEObjectExpression> getReferencedExpressions() {
 		if (referencedExpressions == null) {
-			referencedExpressions = new EObjectResolvingEList<IBooleanEObjectExpression>(IBooleanEObjectExpression.class, this, EObjectBooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS);
+			referencedExpressions = new EObjectResolvingEList<IBooleanEObjectExpression>(IBooleanEObjectExpression.class, this, BooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS);
 		}
 		return referencedExpressions;
 	}
@@ -217,7 +217,7 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS:
+			case BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS:
 				return ((InternalEList<?>)getOwnedExpressions()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -231,13 +231,13 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.AND_EXPRESSION__NAME:
 				return getName();
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION:
 				return getDescription();
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS:
+			case BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS:
 				return getOwnedExpressions();
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS:
+			case BooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS:
 				return getReferencedExpressions();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -252,17 +252,17 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.AND_EXPRESSION__NAME:
 				setName((String)newValue);
 				return;
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION:
 				setDescription((String)newValue);
 				return;
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS:
+			case BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS:
 				getOwnedExpressions().clear();
 				getOwnedExpressions().addAll((Collection<? extends IBooleanEObjectExpression>)newValue);
 				return;
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS:
+			case BooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS:
 				getReferencedExpressions().clear();
 				getReferencedExpressions().addAll((Collection<? extends IBooleanEObjectExpression>)newValue);
 				return;
@@ -278,16 +278,16 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.AND_EXPRESSION__NAME:
 				setName(NAME_EDEFAULT);
 				return;
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION:
 				setDescription(DESCRIPTION_EDEFAULT);
 				return;
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS:
+			case BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS:
 				getOwnedExpressions().clear();
 				return;
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS:
+			case BooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS:
 				getReferencedExpressions().clear();
 				return;
 		}
@@ -302,13 +302,13 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.AND_EXPRESSION__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION:
 				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS:
+			case BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS:
 				return ownedExpressions != null && !ownedExpressions.isEmpty();
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS:
+			case BooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS:
 				return referencedExpressions != null && !referencedExpressions.isEmpty();
 		}
 		return super.eIsSet(featureID);
@@ -322,7 +322,7 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A
 	@Override
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
 		switch (operationID) {
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION___EVALUATE__OBJECT:
+			case BooleanExpressionsPackage.AND_EXPRESSION___EVALUATE__OBJECT:
 				return evaluate((EObject)arguments.get(0));
 		}
 		return super.eInvoke(operationID, arguments);
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/EObjectBooleanExpressionsFactoryImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/BooleanExpressionsFactoryImpl.java
index 3dad15a8091..92e1ffac2a9 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/EObjectBooleanExpressionsFactoryImpl.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/BooleanExpressionsFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.*;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,24 +28,24 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.*;
  * <!-- end-user-doc -->
  * @generated
  */
-public class EObjectBooleanExpressionsFactoryImpl extends EFactoryImpl implements EObjectBooleanExpressionsFactory {
+public class BooleanExpressionsFactoryImpl extends EFactoryImpl implements BooleanExpressionsFactory {
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static EObjectBooleanExpressionsFactory init() {
+	public static BooleanExpressionsFactory init() {
 		try {
-			EObjectBooleanExpressionsFactory theEObjectBooleanExpressionsFactory = (EObjectBooleanExpressionsFactory)EPackage.Registry.INSTANCE.getEFactory(EObjectBooleanExpressionsPackage.eNS_URI);
-			if (theEObjectBooleanExpressionsFactory != null) {
-				return theEObjectBooleanExpressionsFactory;
+			BooleanExpressionsFactory theBooleanExpressionsFactory = (BooleanExpressionsFactory)EPackage.Registry.INSTANCE.getEFactory(BooleanExpressionsPackage.eNS_URI);
+			if (theBooleanExpressionsFactory != null) {
+				return theBooleanExpressionsFactory;
 			}
 		}
 		catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
-		return new EObjectBooleanExpressionsFactoryImpl();
+		return new BooleanExpressionsFactoryImpl();
 	}
 
 	/**
@@ -54,7 +54,7 @@ public class EObjectBooleanExpressionsFactoryImpl extends EFactoryImpl implement
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EObjectBooleanExpressionsFactoryImpl() {
+	public BooleanExpressionsFactoryImpl() {
 		super();
 	}
 
@@ -66,12 +66,12 @@ public class EObjectBooleanExpressionsFactoryImpl extends EFactoryImpl implement
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION: return createOrExpression();
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION: return createAndExpression();
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION: return createNotExpression();
-			case EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION: return createLiteralTrueExpression();
-			case EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION: return createLiteralFalseExpression();
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION: return createReferenceBooleanExpression();
+			case BooleanExpressionsPackage.OR_EXPRESSION: return createOrExpression();
+			case BooleanExpressionsPackage.AND_EXPRESSION: return createAndExpression();
+			case BooleanExpressionsPackage.NOT_EXPRESSION: return createNotExpression();
+			case BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION: return createLiteralTrueExpression();
+			case BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION: return createLiteralFalseExpression();
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION: return createReferenceBooleanExpression();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
@@ -142,8 +142,8 @@ public class EObjectBooleanExpressionsFactoryImpl extends EFactoryImpl implement
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EObjectBooleanExpressionsPackage getEObjectBooleanExpressionsPackage() {
-		return (EObjectBooleanExpressionsPackage)getEPackage();
+	public BooleanExpressionsPackage getBooleanExpressionsPackage() {
+		return (BooleanExpressionsPackage)getEPackage();
 	}
 
 	/**
@@ -153,8 +153,8 @@ public class EObjectBooleanExpressionsFactoryImpl extends EFactoryImpl implement
 	 * @generated
 	 */
 	@Deprecated
-	public static EObjectBooleanExpressionsPackage getPackage() {
-		return EObjectBooleanExpressionsPackage.eINSTANCE;
+	public static BooleanExpressionsPackage getPackage() {
+		return BooleanExpressionsPackage.eINSTANCE;
 	}
 
-} //EObjectBooleanExpressionsFactoryImpl
+} //BooleanExpressionsFactoryImpl
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/EObjectBooleanExpressionsPackageImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/BooleanExpressionsPackageImpl.java
index dff7e3efe95..5871066832b 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/EObjectBooleanExpressionsPackageImpl.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/BooleanExpressionsPackageImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EGenericType;
@@ -22,16 +22,16 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsFactory;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralFalseExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralTrueExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralFalseExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralTrueExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression;
 
 import org.eclipse.papyrus.infra.emf.expressions.impl.ExpressionsPackageImpl;
 
@@ -43,7 +43,7 @@ import org.eclipse.uml2.types.TypesPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class EObjectBooleanExpressionsPackageImpl extends EPackageImpl implements EObjectBooleanExpressionsPackage {
+public class BooleanExpressionsPackageImpl extends EPackageImpl implements BooleanExpressionsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -111,12 +111,12 @@ public class EObjectBooleanExpressionsPackageImpl extends EPackageImpl implement
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage#eNS_URI
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
-	private EObjectBooleanExpressionsPackageImpl() {
-		super(eNS_URI, EObjectBooleanExpressionsFactory.eINSTANCE);
+	private BooleanExpressionsPackageImpl() {
+		super(eNS_URI, BooleanExpressionsFactory.eINSTANCE);
 	}
 
 	/**
@@ -129,7 +129,7 @@ public class EObjectBooleanExpressionsPackageImpl extends EPackageImpl implement
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 * 
-	 * <p>This method is used to initialize {@link EObjectBooleanExpressionsPackage#eINSTANCE} when that field is accessed.
+	 * <p>This method is used to initialize {@link BooleanExpressionsPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -138,11 +138,11 @@ public class EObjectBooleanExpressionsPackageImpl extends EPackageImpl implement
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
-	public static EObjectBooleanExpressionsPackage init() {
-		if (isInited) return (EObjectBooleanExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(EObjectBooleanExpressionsPackage.eNS_URI);
+	public static BooleanExpressionsPackage init() {
+		if (isInited) return (BooleanExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(BooleanExpressionsPackage.eNS_URI);
 
 		// Obtain or create and register package
-		EObjectBooleanExpressionsPackageImpl theEObjectBooleanExpressionsPackage = (EObjectBooleanExpressionsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EObjectBooleanExpressionsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EObjectBooleanExpressionsPackageImpl());
+		BooleanExpressionsPackageImpl theBooleanExpressionsPackage = (BooleanExpressionsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BooleanExpressionsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BooleanExpressionsPackageImpl());
 
 		isInited = true;
 
@@ -153,20 +153,20 @@ public class EObjectBooleanExpressionsPackageImpl extends EPackageImpl implement
 		ExpressionsPackageImpl theExpressionsPackage = (ExpressionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI) instanceof ExpressionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI) : ExpressionsPackage.eINSTANCE);
 
 		// Create package meta-data objects
-		theEObjectBooleanExpressionsPackage.createPackageContents();
+		theBooleanExpressionsPackage.createPackageContents();
 		theExpressionsPackage.createPackageContents();
 
 		// Initialize created meta-data
-		theEObjectBooleanExpressionsPackage.initializePackageContents();
+		theBooleanExpressionsPackage.initializePackageContents();
 		theExpressionsPackage.initializePackageContents();
 
 		// Mark meta-data to indicate it can't be changed
-		theEObjectBooleanExpressionsPackage.freeze();
+		theBooleanExpressionsPackage.freeze();
 
   
 		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(EObjectBooleanExpressionsPackage.eNS_URI, theEObjectBooleanExpressionsPackage);
-		return theEObjectBooleanExpressionsPackage;
+		EPackage.Registry.INSTANCE.put(BooleanExpressionsPackage.eNS_URI, theBooleanExpressionsPackage);
+		return theBooleanExpressionsPackage;
 	}
 
 	/**
@@ -309,8 +309,8 @@ public class EObjectBooleanExpressionsPackageImpl extends EPackageImpl implement
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EObjectBooleanExpressionsFactory getEObjectBooleanExpressionsFactory() {
-		return (EObjectBooleanExpressionsFactory)getEFactoryInstance();
+	public BooleanExpressionsFactory getBooleanExpressionsFactory() {
+		return (BooleanExpressionsFactory)getEFactoryInstance();
 	}
 
 	/**
@@ -446,7 +446,7 @@ public class EObjectBooleanExpressionsPackageImpl extends EPackageImpl implement
 		  (this, 
 		   source, 
 		   new String[] {
-			 "originalName", "BooleanExpressionsPackage" //$NON-NLS-1$ //$NON-NLS-2$
+			 "originalName", "BooleanExpressions" //$NON-NLS-1$ //$NON-NLS-2$
 		   });	
 //		addAnnotation
 //		  (null, 
@@ -456,4 +456,4 @@ public class EObjectBooleanExpressionsPackageImpl extends EPackageImpl implement
 //		   });
 	}
 
-} //EObjectBooleanExpressionsPackageImpl
+} //BooleanExpressionsPackageImpl
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/LiteralFalseExpressionImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/LiteralFalseExpressionImpl.java
index 511f4033939..4ad9c1b5b9a 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/LiteralFalseExpressionImpl.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/LiteralFalseExpressionImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -24,8 +24,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralFalseExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralFalseExpression;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,8 +35,8 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.Liter
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.LiteralFalseExpressionImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.LiteralFalseExpressionImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralFalseExpressionImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralFalseExpressionImpl#getDescription <em>Description</em>}</li>
  * </ul>
  *
  * @generated
@@ -98,7 +98,7 @@ public class LiteralFalseExpressionImpl extends MinimalEObjectImpl.Container imp
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return EObjectBooleanExpressionsPackage.Literals.LITERAL_FALSE_EXPRESSION;
+		return BooleanExpressionsPackage.Literals.LITERAL_FALSE_EXPRESSION;
 	}
 
 	/**
@@ -119,7 +119,7 @@ public class LiteralFalseExpressionImpl extends MinimalEObjectImpl.Container imp
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__NAME, oldName, name));
 	}
 
 	/**
@@ -140,7 +140,7 @@ public class LiteralFalseExpressionImpl extends MinimalEObjectImpl.Container imp
 		String oldDescription = description;
 		description = newDescription;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__DESCRIPTION, oldDescription, description));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__DESCRIPTION, oldDescription, description));
 	}
 
 	/**
@@ -162,9 +162,9 @@ public class LiteralFalseExpressionImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__NAME:
 				return getName();
-			case EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__DESCRIPTION:
 				return getDescription();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -178,10 +178,10 @@ public class LiteralFalseExpressionImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__NAME:
 				setName((String)newValue);
 				return;
-			case EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__DESCRIPTION:
 				setDescription((String)newValue);
 				return;
 		}
@@ -196,10 +196,10 @@ public class LiteralFalseExpressionImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__NAME:
 				setName(NAME_EDEFAULT);
 				return;
-			case EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__DESCRIPTION:
 				setDescription(DESCRIPTION_EDEFAULT);
 				return;
 		}
@@ -214,9 +214,9 @@ public class LiteralFalseExpressionImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION__DESCRIPTION:
 				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
 		}
 		return super.eIsSet(featureID);
@@ -230,7 +230,7 @@ public class LiteralFalseExpressionImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
 		switch (operationID) {
-			case EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION___EVALUATE__OBJECT:
+			case BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION___EVALUATE__OBJECT:
 				return evaluate((EObject)arguments.get(0));
 		}
 		return super.eInvoke(operationID, arguments);
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/LiteralTrueExpressionImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/LiteralTrueExpressionImpl.java
index b7567eeaf8e..1ea39116351 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/LiteralTrueExpressionImpl.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/LiteralTrueExpressionImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -24,8 +24,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralTrueExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralTrueExpression;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,8 +35,8 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.Liter
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.LiteralTrueExpressionImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.LiteralTrueExpressionImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralTrueExpressionImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralTrueExpressionImpl#getDescription <em>Description</em>}</li>
  * </ul>
  *
  * @generated
@@ -98,7 +98,7 @@ public class LiteralTrueExpressionImpl extends MinimalEObjectImpl.Container impl
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return EObjectBooleanExpressionsPackage.Literals.LITERAL_TRUE_EXPRESSION;
+		return BooleanExpressionsPackage.Literals.LITERAL_TRUE_EXPRESSION;
 	}
 
 	/**
@@ -119,7 +119,7 @@ public class LiteralTrueExpressionImpl extends MinimalEObjectImpl.Container impl
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__NAME, oldName, name));
 	}
 
 	/**
@@ -140,7 +140,7 @@ public class LiteralTrueExpressionImpl extends MinimalEObjectImpl.Container impl
 		String oldDescription = description;
 		description = newDescription;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__DESCRIPTION, oldDescription, description));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__DESCRIPTION, oldDescription, description));
 	}
 
 	/**
@@ -162,9 +162,9 @@ public class LiteralTrueExpressionImpl extends MinimalEObjectImpl.Container impl
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__NAME:
 				return getName();
-			case EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__DESCRIPTION:
 				return getDescription();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -178,10 +178,10 @@ public class LiteralTrueExpressionImpl extends MinimalEObjectImpl.Container impl
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__NAME:
 				setName((String)newValue);
 				return;
-			case EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__DESCRIPTION:
 				setDescription((String)newValue);
 				return;
 		}
@@ -196,10 +196,10 @@ public class LiteralTrueExpressionImpl extends MinimalEObjectImpl.Container impl
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__NAME:
 				setName(NAME_EDEFAULT);
 				return;
-			case EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__DESCRIPTION:
 				setDescription(DESCRIPTION_EDEFAULT);
 				return;
 		}
@@ -214,9 +214,9 @@ public class LiteralTrueExpressionImpl extends MinimalEObjectImpl.Container impl
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION__DESCRIPTION:
 				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
 		}
 		return super.eIsSet(featureID);
@@ -230,7 +230,7 @@ public class LiteralTrueExpressionImpl extends MinimalEObjectImpl.Container impl
 	@Override
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
 		switch (operationID) {
-			case EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION___EVALUATE__OBJECT:
+			case BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION___EVALUATE__OBJECT:
 				return evaluate((EObject)arguments.get(0));
 		}
 		return super.eInvoke(operationID, arguments);
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/NotExpressionImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/NotExpressionImpl.java
index 1b9730f7bd7..0772b66a38e 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/NotExpressionImpl.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/NotExpressionImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -26,9 +26,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression;
 
 /**
  * <!-- begin-user-doc -->
@@ -38,10 +38,10 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotEx
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.NotExpressionImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.NotExpressionImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.NotExpressionImpl#getOwnedExpression <em>Owned Expression</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.NotExpressionImpl#getReferencedExpression <em>Referenced Expression</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl#getOwnedExpression <em>Owned Expression</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl#getReferencedExpression <em>Referenced Expression</em>}</li>
  * </ul>
  *
  * @generated
@@ -123,7 +123,7 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return EObjectBooleanExpressionsPackage.Literals.NOT_EXPRESSION;
+		return BooleanExpressionsPackage.Literals.NOT_EXPRESSION;
 	}
 
 	/**
@@ -144,7 +144,7 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.NOT_EXPRESSION__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.NOT_EXPRESSION__NAME, oldName, name));
 	}
 
 	/**
@@ -165,7 +165,7 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N
 		String oldDescription = description;
 		description = newDescription;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION, oldDescription, description));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION, oldDescription, description));
 	}
 
 	/**
@@ -186,7 +186,7 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N
 		IBooleanEObjectExpression oldOwnedExpression = ownedExpression;
 		ownedExpression = newOwnedExpression;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION, oldOwnedExpression, newOwnedExpression);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION, oldOwnedExpression, newOwnedExpression);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -201,14 +201,14 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N
 		if (newOwnedExpression != ownedExpression) {
 			NotificationChain msgs = null;
 			if (ownedExpression != null)
-				msgs = ((InternalEObject)ownedExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EObjectBooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION, null, msgs);
+				msgs = ((InternalEObject)ownedExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION, null, msgs);
 			if (newOwnedExpression != null)
-				msgs = ((InternalEObject)newOwnedExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EObjectBooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION, null, msgs);
+				msgs = ((InternalEObject)newOwnedExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION, null, msgs);
 			msgs = basicSetOwnedExpression(newOwnedExpression, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION, newOwnedExpression, newOwnedExpression));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION, newOwnedExpression, newOwnedExpression));
 	}
 
 	/**
@@ -222,7 +222,7 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N
 			referencedExpression = (IBooleanEObjectExpression)eResolveProxy(oldReferencedExpression);
 			if (referencedExpression != oldReferencedExpression) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EObjectBooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION, oldReferencedExpression, referencedExpression));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION, oldReferencedExpression, referencedExpression));
 			}
 		}
 		return referencedExpression;
@@ -246,7 +246,7 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N
 		IBooleanEObjectExpression oldReferencedExpression = referencedExpression;
 		referencedExpression = newReferencedExpression;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION, oldReferencedExpression, referencedExpression));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION, oldReferencedExpression, referencedExpression));
 	}
 
 	/**
@@ -268,7 +268,7 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION:
 				return basicSetOwnedExpression(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -282,13 +282,13 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__NAME:
 				return getName();
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION:
 				return getDescription();
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION:
 				return getOwnedExpression();
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION:
 				if (resolve) return getReferencedExpression();
 				return basicGetReferencedExpression();
 		}
@@ -303,16 +303,16 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__NAME:
 				setName((String)newValue);
 				return;
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION:
 				setDescription((String)newValue);
 				return;
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION:
 				setOwnedExpression((IBooleanEObjectExpression)newValue);
 				return;
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION:
 				setReferencedExpression((IBooleanEObjectExpression)newValue);
 				return;
 		}
@@ -327,16 +327,16 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__NAME:
 				setName(NAME_EDEFAULT);
 				return;
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION:
 				setDescription(DESCRIPTION_EDEFAULT);
 				return;
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION:
 				setOwnedExpression((IBooleanEObjectExpression)null);
 				return;
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION:
 				setReferencedExpression((IBooleanEObjectExpression)null);
 				return;
 		}
@@ -351,13 +351,13 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION:
 				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION:
 				return ownedExpression != null;
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION:
+			case BooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION:
 				return referencedExpression != null;
 		}
 		return super.eIsSet(featureID);
@@ -371,7 +371,7 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N
 	@Override
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
 		switch (operationID) {
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION___EVALUATE__OBJECT:
+			case BooleanExpressionsPackage.NOT_EXPRESSION___EVALUATE__OBJECT:
 				return evaluate((EObject)arguments.get(0));
 		}
 		return super.eInvoke(operationID, arguments);
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/OrExpressionImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/OrExpressionImpl.java
index 48d9fbdc7a3..4038c16f104 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/OrExpressionImpl.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/OrExpressionImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -32,9 +32,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression;
 
 /**
  * <!-- begin-user-doc -->
@@ -44,10 +44,10 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExp
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.OrExpressionImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.OrExpressionImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.OrExpressionImpl#getOwnedExpressions <em>Owned Expressions</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.OrExpressionImpl#getReferencedExpressions <em>Referenced Expressions</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.OrExpressionImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.OrExpressionImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.OrExpressionImpl#getOwnedExpressions <em>Owned Expressions</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.OrExpressionImpl#getReferencedExpressions <em>Referenced Expressions</em>}</li>
  * </ul>
  *
  * @generated
@@ -129,7 +129,7 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return EObjectBooleanExpressionsPackage.Literals.OR_EXPRESSION;
+		return BooleanExpressionsPackage.Literals.OR_EXPRESSION;
 	}
 
 	/**
@@ -150,7 +150,7 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.OR_EXPRESSION__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.OR_EXPRESSION__NAME, oldName, name));
 	}
 
 	/**
@@ -171,7 +171,7 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or
 		String oldDescription = description;
 		description = newDescription;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION, oldDescription, description));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION, oldDescription, description));
 	}
 
 	/**
@@ -181,7 +181,7 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or
 	 */
 	public EList<IBooleanEObjectExpression> getOwnedExpressions() {
 		if (ownedExpressions == null) {
-			ownedExpressions = new EObjectContainmentEList<IBooleanEObjectExpression>(IBooleanEObjectExpression.class, this, EObjectBooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS);
+			ownedExpressions = new EObjectContainmentEList<IBooleanEObjectExpression>(IBooleanEObjectExpression.class, this, BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS);
 		}
 		return ownedExpressions;
 	}
@@ -193,7 +193,7 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or
 	 */
 	public EList<IBooleanEObjectExpression> getReferencedExpressions() {
 		if (referencedExpressions == null) {
-			referencedExpressions = new EObjectResolvingEList<IBooleanEObjectExpression>(IBooleanEObjectExpression.class, this, EObjectBooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS);
+			referencedExpressions = new EObjectResolvingEList<IBooleanEObjectExpression>(IBooleanEObjectExpression.class, this, BooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS);
 		}
 		return referencedExpressions;
 	}
@@ -217,7 +217,7 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS:
+			case BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS:
 				return ((InternalEList<?>)getOwnedExpressions()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -231,13 +231,13 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.OR_EXPRESSION__NAME:
 				return getName();
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION:
 				return getDescription();
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS:
+			case BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS:
 				return getOwnedExpressions();
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS:
+			case BooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS:
 				return getReferencedExpressions();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -252,17 +252,17 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.OR_EXPRESSION__NAME:
 				setName((String)newValue);
 				return;
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION:
 				setDescription((String)newValue);
 				return;
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS:
+			case BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS:
 				getOwnedExpressions().clear();
 				getOwnedExpressions().addAll((Collection<? extends IBooleanEObjectExpression>)newValue);
 				return;
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS:
+			case BooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS:
 				getReferencedExpressions().clear();
 				getReferencedExpressions().addAll((Collection<? extends IBooleanEObjectExpression>)newValue);
 				return;
@@ -278,16 +278,16 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.OR_EXPRESSION__NAME:
 				setName(NAME_EDEFAULT);
 				return;
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION:
 				setDescription(DESCRIPTION_EDEFAULT);
 				return;
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS:
+			case BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS:
 				getOwnedExpressions().clear();
 				return;
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS:
+			case BooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS:
 				getReferencedExpressions().clear();
 				return;
 		}
@@ -302,13 +302,13 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.OR_EXPRESSION__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION:
 				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS:
+			case BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS:
 				return ownedExpressions != null && !ownedExpressions.isEmpty();
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS:
+			case BooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS:
 				return referencedExpressions != null && !referencedExpressions.isEmpty();
 		}
 		return super.eIsSet(featureID);
@@ -322,7 +322,7 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or
 	@Override
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
 		switch (operationID) {
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION___EVALUATE__OBJECT:
+			case BooleanExpressionsPackage.OR_EXPRESSION___EVALUATE__OBJECT:
 				return evaluate((EObject)arguments.get(0));
 		}
 		return super.eInvoke(operationID, arguments);
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/ReferenceBooleanExpressionImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/ReferenceBooleanExpressionImpl.java
index 8b49562425e..9e3ae6dec56 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/impl/ReferenceBooleanExpressionImpl.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/ReferenceBooleanExpressionImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -25,9 +25,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,9 +37,9 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.Refer
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.ReferenceBooleanExpressionImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.ReferenceBooleanExpressionImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.ReferenceBooleanExpressionImpl#getReferencedExpression <em>Referenced Expression</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.ReferenceBooleanExpressionImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.ReferenceBooleanExpressionImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.ReferenceBooleanExpressionImpl#getReferencedExpression <em>Referenced Expression</em>}</li>
  * </ul>
  *
  * @generated
@@ -111,7 +111,7 @@ public class ReferenceBooleanExpressionImpl extends MinimalEObjectImpl.Container
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return EObjectBooleanExpressionsPackage.Literals.REFERENCE_BOOLEAN_EXPRESSION;
+		return BooleanExpressionsPackage.Literals.REFERENCE_BOOLEAN_EXPRESSION;
 	}
 
 	/**
@@ -132,7 +132,7 @@ public class ReferenceBooleanExpressionImpl extends MinimalEObjectImpl.Container
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME, oldName, name));
 	}
 
 	/**
@@ -153,7 +153,7 @@ public class ReferenceBooleanExpressionImpl extends MinimalEObjectImpl.Container
 		String oldDescription = description;
 		description = newDescription;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION, oldDescription, description));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION, oldDescription, description));
 	}
 
 	/**
@@ -167,7 +167,7 @@ public class ReferenceBooleanExpressionImpl extends MinimalEObjectImpl.Container
 			referencedExpression = (IBooleanEObjectExpression)eResolveProxy(oldReferencedExpression);
 			if (referencedExpression != oldReferencedExpression) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION, oldReferencedExpression, referencedExpression));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION, oldReferencedExpression, referencedExpression));
 			}
 		}
 		return referencedExpression;
@@ -191,7 +191,7 @@ public class ReferenceBooleanExpressionImpl extends MinimalEObjectImpl.Container
 		IBooleanEObjectExpression oldReferencedExpression = referencedExpression;
 		referencedExpression = newReferencedExpression;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION, oldReferencedExpression, referencedExpression));
+			eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION, oldReferencedExpression, referencedExpression));
 	}
 
 	/**
@@ -213,11 +213,11 @@ public class ReferenceBooleanExpressionImpl extends MinimalEObjectImpl.Container
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME:
 				return getName();
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION:
 				return getDescription();
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION:
 				if (resolve) return getReferencedExpression();
 				return basicGetReferencedExpression();
 		}
@@ -232,13 +232,13 @@ public class ReferenceBooleanExpressionImpl extends MinimalEObjectImpl.Container
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME:
 				setName((String)newValue);
 				return;
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION:
 				setDescription((String)newValue);
 				return;
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION:
 				setReferencedExpression((IBooleanEObjectExpression)newValue);
 				return;
 		}
@@ -253,13 +253,13 @@ public class ReferenceBooleanExpressionImpl extends MinimalEObjectImpl.Container
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME:
 				setName(NAME_EDEFAULT);
 				return;
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION:
 				setDescription(DESCRIPTION_EDEFAULT);
 				return;
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION:
 				setReferencedExpression((IBooleanEObjectExpression)null);
 				return;
 		}
@@ -274,11 +274,11 @@ public class ReferenceBooleanExpressionImpl extends MinimalEObjectImpl.Container
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION:
 				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION:
 				return referencedExpression != null;
 		}
 		return super.eIsSet(featureID);
@@ -292,7 +292,7 @@ public class ReferenceBooleanExpressionImpl extends MinimalEObjectImpl.Container
 	@Override
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
 		switch (operationID) {
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION___EVALUATE__OBJECT:
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION___EVALUATE__OBJECT:
 				return evaluate((EObject)arguments.get(0));
 		}
 		return super.eInvoke(operationID, arguments);
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/util/EObjectBooleanExpressionsAdapterFactory.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/util/BooleanExpressionsAdapterFactory.java
index f168cbd17be..866240fc673 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/util/EObjectBooleanExpressionsAdapterFactory.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/util/BooleanExpressionsAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.util;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -22,24 +22,24 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.infra.emf.expressions.IBasicExpressionElement;
 import org.eclipse.papyrus.infra.emf.expressions.IExpression;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.*;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage
+ * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage
  * @generated
  */
-public class EObjectBooleanExpressionsAdapterFactory extends AdapterFactoryImpl {
+public class BooleanExpressionsAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static EObjectBooleanExpressionsPackage modelPackage;
+	protected static BooleanExpressionsPackage modelPackage;
 
 	/**
 	 * Creates an instance of the adapter factory.
@@ -47,9 +47,9 @@ public class EObjectBooleanExpressionsAdapterFactory extends AdapterFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EObjectBooleanExpressionsAdapterFactory() {
+	public BooleanExpressionsAdapterFactory() {
 		if (modelPackage == null) {
-			modelPackage = EObjectBooleanExpressionsPackage.eINSTANCE;
+			modelPackage = BooleanExpressionsPackage.eINSTANCE;
 		}
 	}
 
@@ -78,8 +78,8 @@ public class EObjectBooleanExpressionsAdapterFactory extends AdapterFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected EObjectBooleanExpressionsSwitch<Adapter> modelSwitch =
-		new EObjectBooleanExpressionsSwitch<Adapter>() {
+	protected BooleanExpressionsSwitch<Adapter> modelSwitch =
+		new BooleanExpressionsSwitch<Adapter>() {
 			@Override
 			public Adapter caseOrExpression(OrExpression object) {
 				return createOrExpressionAdapter();
@@ -141,13 +141,13 @@ public class EObjectBooleanExpressionsAdapterFactory extends AdapterFactoryImpl
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression <em>Or Expression</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression <em>Or Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression
 	 * @generated
 	 */
 	public Adapter createOrExpressionAdapter() {
@@ -155,13 +155,13 @@ public class EObjectBooleanExpressionsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression <em>IBoolean EObject Expression</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression <em>IBoolean EObject Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression
 	 * @generated
 	 */
 	public Adapter createIBooleanEObjectExpressionAdapter() {
@@ -169,13 +169,13 @@ public class EObjectBooleanExpressionsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanExpression <em>IBoolean Expression</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanExpression <em>IBoolean Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanExpression
 	 * @generated
 	 */
 	public Adapter createIBooleanExpressionAdapter() {
@@ -183,13 +183,13 @@ public class EObjectBooleanExpressionsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression <em>And Expression</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression <em>And Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression
 	 * @generated
 	 */
 	public Adapter createAndExpressionAdapter() {
@@ -197,13 +197,13 @@ public class EObjectBooleanExpressionsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression <em>Not Expression</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression <em>Not Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression
 	 * @generated
 	 */
 	public Adapter createNotExpressionAdapter() {
@@ -211,13 +211,13 @@ public class EObjectBooleanExpressionsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralTrueExpression <em>Literal True Expression</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralTrueExpression <em>Literal True Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralTrueExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralTrueExpression
 	 * @generated
 	 */
 	public Adapter createLiteralTrueExpressionAdapter() {
@@ -225,13 +225,13 @@ public class EObjectBooleanExpressionsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralFalseExpression <em>Literal False Expression</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralFalseExpression <em>Literal False Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralFalseExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralFalseExpression
 	 * @generated
 	 */
 	public Adapter createLiteralFalseExpressionAdapter() {
@@ -239,13 +239,13 @@ public class EObjectBooleanExpressionsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression <em>Reference Boolean Expression</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression <em>Reference Boolean Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression
+	 * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression
 	 * @generated
 	 */
 	public Adapter createReferenceBooleanExpressionAdapter() {
@@ -292,4 +292,4 @@ public class EObjectBooleanExpressionsAdapterFactory extends AdapterFactoryImpl
 		return null;
 	}
 
-} //EObjectBooleanExpressionsAdapterFactory
+} //BooleanExpressionsAdapterFactory
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/util/EObjectBooleanExpressionsSwitch.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/util/BooleanExpressionsSwitch.java
index ca53f116dcb..8ac939c1add 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressionspackage/util/EObjectBooleanExpressionsSwitch.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/util/BooleanExpressionsSwitch.java
@@ -10,7 +10,7 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.util;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.util.Switch;
 import org.eclipse.papyrus.infra.emf.expressions.IBasicExpressionElement;
 import org.eclipse.papyrus.infra.emf.expressions.IExpression;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.*;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -32,17 +32,17 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.*;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage
+ * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage
  * @generated
  */
-public class EObjectBooleanExpressionsSwitch<T> extends Switch<T> {
+public class BooleanExpressionsSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static EObjectBooleanExpressionsPackage modelPackage;
+	protected static BooleanExpressionsPackage modelPackage;
 
 	/**
 	 * Creates an instance of the switch.
@@ -50,9 +50,9 @@ public class EObjectBooleanExpressionsSwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EObjectBooleanExpressionsSwitch() {
+	public BooleanExpressionsSwitch() {
 		if (modelPackage == null) {
-			modelPackage = EObjectBooleanExpressionsPackage.eINSTANCE;
+			modelPackage = BooleanExpressionsPackage.eINSTANCE;
 		}
 	}
 
@@ -79,7 +79,7 @@ public class EObjectBooleanExpressionsSwitch<T> extends Switch<T> {
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-			case EObjectBooleanExpressionsPackage.OR_EXPRESSION: {
+			case BooleanExpressionsPackage.OR_EXPRESSION: {
 				OrExpression orExpression = (OrExpression)theEObject;
 				T result = caseOrExpression(orExpression);
 				if (result == null) result = caseIBooleanEObjectExpression(orExpression);
@@ -89,7 +89,7 @@ public class EObjectBooleanExpressionsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case EObjectBooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION: {
+			case BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION: {
 				IBooleanEObjectExpression iBooleanEObjectExpression = (IBooleanEObjectExpression)theEObject;
 				T result = caseIBooleanEObjectExpression(iBooleanEObjectExpression);
 				if (result == null) result = caseIBooleanExpression(iBooleanEObjectExpression);
@@ -98,7 +98,7 @@ public class EObjectBooleanExpressionsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case EObjectBooleanExpressionsPackage.IBOOLEAN_EXPRESSION: {
+			case BooleanExpressionsPackage.IBOOLEAN_EXPRESSION: {
 				IBooleanExpression<?> iBooleanExpression = (IBooleanExpression<?>)theEObject;
 				T result = caseIBooleanExpression(iBooleanExpression);
 				if (result == null) result = caseIExpression(iBooleanExpression);
@@ -106,7 +106,7 @@ public class EObjectBooleanExpressionsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case EObjectBooleanExpressionsPackage.AND_EXPRESSION: {
+			case BooleanExpressionsPackage.AND_EXPRESSION: {
 				AndExpression andExpression = (AndExpression)theEObject;
 				T result = caseAndExpression(andExpression);
 				if (result == null) result = caseIBooleanEObjectExpression(andExpression);
@@ -116,7 +116,7 @@ public class EObjectBooleanExpressionsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case EObjectBooleanExpressionsPackage.NOT_EXPRESSION: {
+			case BooleanExpressionsPackage.NOT_EXPRESSION: {
 				NotExpression notExpression = (NotExpression)theEObject;
 				T result = caseNotExpression(notExpression);
 				if (result == null) result = caseIBooleanEObjectExpression(notExpression);
@@ -126,7 +126,7 @@ public class EObjectBooleanExpressionsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case EObjectBooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION: {
+			case BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION: {
 				LiteralTrueExpression literalTrueExpression = (LiteralTrueExpression)theEObject;
 				T result = caseLiteralTrueExpression(literalTrueExpression);
 				if (result == null) result = caseIBooleanEObjectExpression(literalTrueExpression);
@@ -136,7 +136,7 @@ public class EObjectBooleanExpressionsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case EObjectBooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION: {
+			case BooleanExpressionsPackage.LITERAL_FALSE_EXPRESSION: {
 				LiteralFalseExpression literalFalseExpression = (LiteralFalseExpression)theEObject;
 				T result = caseLiteralFalseExpression(literalFalseExpression);
 				if (result == null) result = caseIBooleanEObjectExpression(literalFalseExpression);
@@ -146,7 +146,7 @@ public class EObjectBooleanExpressionsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case EObjectBooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION: {
+			case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION: {
 				ReferenceBooleanExpression referenceBooleanExpression = (ReferenceBooleanExpression)theEObject;
 				T result = caseReferenceBooleanExpression(referenceBooleanExpression);
 				if (result == null) result = caseIBooleanEObjectExpression(referenceBooleanExpression);
@@ -326,4 +326,4 @@ public class EObjectBooleanExpressionsSwitch<T> extends Switch<T> {
 		return null;
 	}
 
-} //EObjectBooleanExpressionsSwitch
+} //BooleanExpressionsSwitch
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/impl/ExpressionsPackageImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/impl/ExpressionsPackageImpl.java
index 7cee29bfa80..a9fdc51caea 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/impl/ExpressionsPackageImpl.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/impl/ExpressionsPackageImpl.java
@@ -30,9 +30,9 @@ import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
 import org.eclipse.papyrus.infra.emf.expressions.IBasicExpressionElement;
 import org.eclipse.papyrus.infra.emf.expressions.IExpression;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.EObjectBooleanExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl;
 
 import org.eclipse.uml2.types.TypesPackage;
 
@@ -135,15 +135,15 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
 		TypesPackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
-		EObjectBooleanExpressionsPackageImpl theEObjectBooleanExpressionsPackage = (EObjectBooleanExpressionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EObjectBooleanExpressionsPackage.eNS_URI) instanceof EObjectBooleanExpressionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EObjectBooleanExpressionsPackage.eNS_URI) : EObjectBooleanExpressionsPackage.eINSTANCE);
+		BooleanExpressionsPackageImpl theBooleanExpressionsPackage = (BooleanExpressionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(BooleanExpressionsPackage.eNS_URI) instanceof BooleanExpressionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BooleanExpressionsPackage.eNS_URI) : BooleanExpressionsPackage.eINSTANCE);
 
 		// Create package meta-data objects
 		theExpressionsPackage.createPackageContents();
-		theEObjectBooleanExpressionsPackage.createPackageContents();
+		theBooleanExpressionsPackage.createPackageContents();
 
 		// Initialize created meta-data
 		theExpressionsPackage.initializePackageContents();
-		theEObjectBooleanExpressionsPackage.initializePackageContents();
+		theBooleanExpressionsPackage.initializePackageContents();
 
 		// Mark meta-data to indicate it can't be changed
 		theExpressionsPackage.freeze();
@@ -314,11 +314,11 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		EObjectBooleanExpressionsPackage theEObjectBooleanExpressionsPackage = (EObjectBooleanExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(EObjectBooleanExpressionsPackage.eNS_URI);
+		BooleanExpressionsPackage theBooleanExpressionsPackage = (BooleanExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(BooleanExpressionsPackage.eNS_URI);
 		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);
 
 		// Add subpackages
-		getESubpackages().add(theEObjectBooleanExpressionsPackage);
+		getESubpackages().add(theBooleanExpressionsPackage);
 
 		// Create type parameters
 		ETypeParameter iExpressionEClass_CONTEXT_TYPE = addETypeParameter(iExpressionEClass, "CONTEXT_TYPE"); //$NON-NLS-1$
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/eobjectbooleanexpressions/custom/CustomAndExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/custom/CustomAndExpression.java
index d3850474024..41d773b26b9 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/eobjectbooleanexpressions/custom/CustomAndExpression.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/custom/CustomAndExpression.java
@@ -10,11 +10,11 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.eobjectbooleanexpressions.custom;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.custom;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.AndExpressionImpl;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl;
 
 public class CustomAndExpression extends AndExpressionImpl{
 	
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/eobjectbooleanexpressions/custom/CustomEObjectBooleanExpressionsFactory.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/custom/CustomBooleanExpressionsFactory.java
index 161c4616d1f..6f2390dab60 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/eobjectbooleanexpressions/custom/CustomEObjectBooleanExpressionsFactory.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/custom/CustomBooleanExpressionsFactory.java
@@ -10,17 +10,17 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.eobjectbooleanexpressions.custom;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.custom;
 
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.AndExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralFalseExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.LiteralTrueExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.NotExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.OrExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.ReferenceBooleanExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.EObjectBooleanExpressionsFactoryImpl;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralFalseExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralTrueExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsFactoryImpl;
 
-public class CustomEObjectBooleanExpressionsFactory extends EObjectBooleanExpressionsFactoryImpl {
+public class CustomBooleanExpressionsFactory extends BooleanExpressionsFactoryImpl {
 
 	/**
 	 * @see org.eclipse.papyrus.infra.emf.expressions.eobjectbooleanexpressions.impl.EObjectBooleanExpressionsFactoryImpl#createAndExpression()
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/eobjectbooleanexpressions/custom/CustomLiteralFalseExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/custom/CustomLiteralFalseExpression.java
index a981cb7c99b..306fe5d6953 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/eobjectbooleanexpressions/custom/CustomLiteralFalseExpression.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/custom/CustomLiteralFalseExpression.java
@@ -10,10 +10,10 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.eobjectbooleanexpressions.custom;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.custom;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.LiteralFalseExpressionImpl;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralFalseExpressionImpl;
 
 
 public class CustomLiteralFalseExpression extends LiteralFalseExpressionImpl {
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/eobjectbooleanexpressions/custom/CustomLiteralTrueExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/custom/CustomLiteralTrueExpression.java
index 5e5ecb643be..6e60b8ba0f3 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/eobjectbooleanexpressions/custom/CustomLiteralTrueExpression.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/custom/CustomLiteralTrueExpression.java
@@ -10,10 +10,10 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.eobjectbooleanexpressions.custom;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.custom;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.LiteralTrueExpressionImpl;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralTrueExpressionImpl;
 
 
 public class CustomLiteralTrueExpression extends LiteralTrueExpressionImpl {
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/eobjectbooleanexpressions/custom/CustomNotExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/custom/CustomNotExpression.java
index 17c43132d72..2a4d97f397d 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/eobjectbooleanexpressions/custom/CustomNotExpression.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/custom/CustomNotExpression.java
@@ -10,10 +10,10 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.eobjectbooleanexpressions.custom;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.custom;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.NotExpressionImpl;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl;
 
 
 public class CustomNotExpression extends NotExpressionImpl{
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/eobjectbooleanexpressions/custom/CustomOrExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/custom/CustomOrExpression.java
index ef5b438e392..46d54886d4a 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/eobjectbooleanexpressions/custom/CustomOrExpression.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/custom/CustomOrExpression.java
@@ -10,11 +10,11 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.eobjectbooleanexpressions.custom;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.custom;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.IBooleanEObjectExpression;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.OrExpressionImpl;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.OrExpressionImpl;
 
 public class CustomOrExpression extends OrExpressionImpl {
 
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/eobjectbooleanexpressions/custom/CustomReferenceBooleanExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/custom/CustomReferenceBooleanExpression.java
index 11ceed9f3a8..7d9192d7aa8 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/eobjectbooleanexpressions/custom/CustomReferenceBooleanExpression.java
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/custom/CustomReferenceBooleanExpression.java
@@ -10,10 +10,10 @@
  * Contributors:
  * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.emf.expressions.eobjectbooleanexpressions.custom;
+package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.custom;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressionspackage.impl.ReferenceBooleanExpressionImpl;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.ReferenceBooleanExpressionImpl;
 
 public class CustomReferenceBooleanExpression extends ReferenceBooleanExpressionImpl {
author	Vincent Lorenzo	2017-04-26 19:17:44 +0000
committer	Gerrit Code Review @ Eclipse.org	2017-04-27 13:22:06 +0000
commit	7fb01af04ab30c121a99aff3b039d882688bd985 (patch)
tree	b0e27fd8ca3cc25a51df51c663e22a8bd4d57ec1 /plugins/infra/emf/expressions
parent	71d46ac5a8601a33b6ff65a425098d42b22cdda0 (diff)
download	org.eclipse.papyrus-7fb01af04ab30c121a99aff3b039d882688bd985.tar.gz org.eclipse.papyrus-7fb01af04ab30c121a99aff3b039d882688bd985.tar.xz org.eclipse.papyrus-7fb01af04ab30c121a99aff3b039d882688bd985.zip