329865: [ALF editor] Papyrus shall provide a specific textual editor for ALF.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=329865

153 files changed, 585 insertions, 582 deletions

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/common/ElementReference.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/common/ElementReference.java
deleted file mode 100644
index b106f9a261b..00000000000
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/common/ElementReference.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.eclipse.papyrus.alf.syntax.common;

-

-public abstract class ElementReference {

-

-}

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/common/SyntaxElement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/common/SyntaxElement.java
deleted file mode 100644
index 4706a88b86c..00000000000
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/common/SyntaxElement.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.eclipse.papyrus.alf.syntax.common;

-

-public abstract class SyntaxElement {

-

-}

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/TemplateBinding.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/TemplateBinding.java
deleted file mode 100644
index bc078e5d970..00000000000
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/TemplateBinding.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

-

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

-

-public abstract class TemplateBinding extends SyntaxElement {

-	

-}

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/QualifiedNameList.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/QualifiedNameList.java
deleted file mode 100644
index 8d8426009cb..00000000000
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/QualifiedNameList.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.papyrus.alf.syntax.statements;

-

-import java.util.List;

-

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

-import org.eclipse.papyrus.alf.syntax.expressions.QualifiedName;

-

-public class QualifiedNameList extends SyntaxElement {

-

-	// Synthesized Properties

-	public List<QualifiedName> name ;

-	

-}

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/Alf.xtext b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/Alf.xtext
index 17258d2ebf5..acea9b9fe2d 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/Alf.xtext
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/Alf.xtext
@@ -12,7 +12,7 @@
  *
  *****************************************************************************/
 
-grammar org.eclipse.papyrus.alf.Alf with org.eclipse.xtext.common.Terminals
+grammar org.eclipse.papyrus.uml.alf.Alf with org.eclipse.xtext.common.Terminals
 
 generate alf "http://www.eclipse.org/papyrus/alf/Alf"
 
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/AlfRuntimeModule.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/AlfRuntimeModule.java
index 1eee1999feb..82502d2e2e6 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/AlfRuntimeModule.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/AlfRuntimeModule.java
@@ -11,12 +11,12 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.alf;
+package org.eclipse.papyrus.uml.alf;
 
 /**
  * Use this class to register components to be used at runtime / without the Equinox extension registry.
  */
-public class AlfRuntimeModule extends org.eclipse.papyrus.alf.AbstractAlfRuntimeModule {
+public class AlfRuntimeModule extends org.eclipse.papyrus.uml.alf.AbstractAlfRuntimeModule {
 	
 }
 
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/AlfStandaloneSetup.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/AlfStandaloneSetup.java
index d8324e4296e..406b0312a22 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/AlfStandaloneSetup.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/AlfStandaloneSetup.java
@@ -12,7 +12,9 @@
  *
  *****************************************************************************/
 
-package org.eclipse.papyrus.alf;
+package org.eclipse.papyrus.uml.alf;
+
+import org.eclipse.papyrus.uml.alf.AlfStandaloneSetupGenerated;
 
 /**
  * Initialization support for running Xtext languages 
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/Copy (2) of Alf.xtext b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/Copy (2) of Alf.xtext
index 918d55e86ad..6e7c27ea7bf 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/Copy (2) of Alf.xtext
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/Copy (2) of Alf.xtext
@@ -12,7 +12,7 @@
  *
  *****************************************************************************/
 
-grammar org.eclipse.papyrus.alf.Alf with org.eclipse.xtext.common.Terminals
+grammar org.eclipse.papyrus.uml.alf.Alf with org.eclipse.xtext.common.Terminals
 
 generate alf "http://www.eclipse.org/papyrus/alf/Alf"
 
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/Copy of Alf.xtext b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/Copy of Alf.xtext
index ccc7288a678..254c8628d6d 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/Copy of Alf.xtext
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/Copy of Alf.xtext
@@ -12,7 +12,7 @@
  *
  *****************************************************************************/
 
-grammar org.eclipse.papyrus.alf.Alf with org.eclipse.xtext.common.Terminals
+grammar org.eclipse.papyrus.uml.alf.Alf with org.eclipse.xtext.common.Terminals
 
 generate alf "http://www.eclipse.org/papyrus/alf/Alf"
 
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/GenerateAlf.mwe2 b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/GenerateAlf.mwe2
index fbf0a951ca1..109432a4f4b 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/GenerateAlf.mwe2
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/GenerateAlf.mwe2
@@ -1,4 +1,4 @@
-module org.eclipse.papyrus.alf.Alf
+module org.eclipse.papyrus.uml.alf.Alf
 
 import org.eclipse.emf.mwe.utils.*
 import org.eclipse.xtext.generator.*
@@ -6,7 +6,7 @@ import org.eclipse.xtext.ui.generator.*
 
 var grammarURI = "classpath:/org/eclipse/papyrus/alf/Alf.xtext"
 var file.extensions = "alf"
-var projectName = "org.eclipse.papyrus.alf"
+var projectName = "org.eclipse.papyrus.uml.alf"
 var runtimeProject = "../${projectName}"
 
 Workflow {
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/formatting/AlfFormatter.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/formatting/AlfFormatter.java
index 3add6fb48e7..137811264c4 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/formatting/AlfFormatter.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/formatting/AlfFormatter.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.alf.formatting;
+package org.eclipse.papyrus.uml.alf.formatting;
 
 import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter;
 import org.eclipse.xtext.formatting.impl.FormattingConfig;
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/generator/AlfGenerator.xtend b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/generator/AlfGenerator.xtend
index 6b7a26fb7c9..349d5189df3 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/generator/AlfGenerator.xtend
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/generator/AlfGenerator.xtend
@@ -1,7 +1,7 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.papyrus.alf.generator
+package org.eclipse.papyrus.uml.alf.generator
 
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.xtext.generator.IGenerator
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/scoping/AlfPartialScope.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/scoping/AlfPartialScope.java
index 32cddeaaec0..0d2e670715c 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/scoping/AlfPartialScope.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/scoping/AlfPartialScope.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.scoping;

+package org.eclipse.papyrus.uml.alf.scoping;

 

 import java.util.ArrayList;

 import java.util.Iterator;

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/scoping/AlfScopeProvider.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/scoping/AlfScopeProvider.java
index cbbb2d9ace9..ae347d08b0a 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/scoping/AlfScopeProvider.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/scoping/AlfScopeProvider.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.alf.scoping;
+package org.eclipse.papyrus.uml.alf.scoping;
 
 import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
 
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/scoping/AlfScopingTool.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/scoping/AlfScopingTool.java
index 4f909b79725..35ee0432f4d 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/scoping/AlfScopingTool.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/scoping/AlfScopingTool.java
@@ -11,24 +11,24 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.scoping;

+package org.eclipse.papyrus.uml.alf.scoping;

 

 import java.util.ArrayList;

 import java.util.HashMap;

 import java.util.List;

 

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.alf.alf.AcceptClause;

-import org.eclipse.papyrus.alf.alf.AcceptStatement;

-import org.eclipse.papyrus.alf.alf.DocumentedStatement;

-import org.eclipse.papyrus.alf.alf.InvocationOrAssignementOrDeclarationStatement;

-import org.eclipse.papyrus.alf.alf.LocalNameDeclarationStatement;

-import org.eclipse.papyrus.alf.alf.LoopVariableDefinition;

-import org.eclipse.papyrus.alf.alf.SequenceExpansionExpression;

-import org.eclipse.papyrus.alf.alf.Statement;

-import org.eclipse.papyrus.alf.validation.AlfJavaValidator;

-import org.eclipse.papyrus.alf.validation.typing.TypeExpression;

-import org.eclipse.papyrus.alf.validation.typing.TypeUtils;

+import org.eclipse.papyrus.uml.alf.alf.AcceptClause;

+import org.eclipse.papyrus.uml.alf.alf.AcceptStatement;

+import org.eclipse.papyrus.uml.alf.alf.DocumentedStatement;

+import org.eclipse.papyrus.uml.alf.alf.InvocationOrAssignementOrDeclarationStatement;

+import org.eclipse.papyrus.uml.alf.alf.LocalNameDeclarationStatement;

+import org.eclipse.papyrus.uml.alf.alf.LoopVariableDefinition;

+import org.eclipse.papyrus.uml.alf.alf.SequenceExpansionExpression;

+import org.eclipse.papyrus.uml.alf.alf.Statement;

+import org.eclipse.papyrus.uml.alf.validation.AlfJavaValidator;

+import org.eclipse.papyrus.uml.alf.validation.typing.TypeExpression;

+import org.eclipse.papyrus.uml.alf.validation.typing.TypeUtils;

 import org.eclipse.uml2.uml.Behavior;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Classifier;

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/ASTFactory.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/ASTFactory.java
index 52d8a64459d..8a5dbf50516 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/ASTFactory.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/ASTFactory.java
@@ -1,81 +1,81 @@
-package org.eclipse.papyrus.alf.syntax;

+package org.eclipse.papyrus.uml.alf.syntax;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.alf.AdditiveExpression;

-import org.eclipse.papyrus.alf.alf.AndExpression;

-import org.eclipse.papyrus.alf.alf.BOOLEAN_LITERAL;

-import org.eclipse.papyrus.alf.alf.BooleanValue;

-import org.eclipse.papyrus.alf.alf.CollectOrIterateOperation;

-import org.eclipse.papyrus.alf.alf.ConditionalAndExpression;

-import org.eclipse.papyrus.alf.alf.ExclusiveOrExpression;

-import org.eclipse.papyrus.alf.alf.ForAllOrExistsOrOneOperation;

-import org.eclipse.papyrus.alf.alf.INTEGER_LITERAL;

-import org.eclipse.papyrus.alf.alf.InclusiveOrExpression;

-import org.eclipse.papyrus.alf.alf.IsUniqueOperation;

-import org.eclipse.papyrus.alf.alf.LITERAL;

-import org.eclipse.papyrus.alf.alf.LinkOperationTuple;

-import org.eclipse.papyrus.alf.alf.LinkOperationTupleElement;

-import org.eclipse.papyrus.alf.alf.MultiplicativeExpression;

-import org.eclipse.papyrus.alf.alf.NonLiteralValueSpecification;

-import org.eclipse.papyrus.alf.alf.NullExpression;

-import org.eclipse.papyrus.alf.alf.ParenthesizedExpression;

-import org.eclipse.papyrus.alf.alf.PrimaryExpression;

-import org.eclipse.papyrus.alf.alf.QualifiedNamePath;

-import org.eclipse.papyrus.alf.alf.QualifiedNameWithBinding;

-import org.eclipse.papyrus.alf.alf.STRING_LITERAL;

-import org.eclipse.papyrus.alf.alf.SelectOrRejectOperation;

-import org.eclipse.papyrus.alf.alf.SuffixExpression;

-import org.eclipse.papyrus.alf.alf.TupleElement;

-import org.eclipse.papyrus.alf.alf.UNLIMITED_LITERAL;

-import org.eclipse.papyrus.alf.alf.UnqualifiedName;

-import org.eclipse.papyrus.alf.syntax.expressions.ArithmeticExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.BitStringUnaryExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.BooleanLiteralExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.BooleanUnaryExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.CastExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.ClassExtentExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.ClassificationExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.ConditionalLogicalExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.ConditionalTestExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.EqualityExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.Expression;

-import org.eclipse.papyrus.alf.syntax.expressions.ExtentOrExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.FeatureInvocationExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.FeatureReference;

-import org.eclipse.papyrus.alf.syntax.expressions.ForAllOrExistsOrOneExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.InstanceCreationExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.InvocationExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.IsUniqueExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.IsolationExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.LinkOperationExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.LogicalExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.NameBinding;

-import org.eclipse.papyrus.alf.syntax.expressions.NameExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.NamedExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.NamedTemplateBinding;

-import org.eclipse.papyrus.alf.syntax.expressions.NamedTuple;

-import org.eclipse.papyrus.alf.syntax.expressions.NaturalLiteralExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.NumericUnaryExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.PositionalTuple;

-import org.eclipse.papyrus.alf.syntax.expressions.PropertyAccessExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.QualifiedName;

-import org.eclipse.papyrus.alf.syntax.expressions.RelationalExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.SelectOrRejectExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.SequenceAccessExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.SequenceConstructionExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.SequenceOperationExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.SequenceReductionExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.ShiftExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.StringLiteralExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.SuperInvocationExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.TemplateBinding;

-import org.eclipse.papyrus.alf.syntax.expressions.TemplateParameterSubstitution;

-import org.eclipse.papyrus.alf.syntax.expressions.ThisExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.Tuple;

-import org.eclipse.papyrus.alf.syntax.expressions.UnaryExpression;

-import org.eclipse.papyrus.alf.syntax.expressions.UnboundedLiteralExpression;

+import org.eclipse.papyrus.uml.alf.alf.AdditiveExpression;

+import org.eclipse.papyrus.uml.alf.alf.AndExpression;

+import org.eclipse.papyrus.uml.alf.alf.BOOLEAN_LITERAL;

+import org.eclipse.papyrus.uml.alf.alf.BooleanValue;

+import org.eclipse.papyrus.uml.alf.alf.CollectOrIterateOperation;

+import org.eclipse.papyrus.uml.alf.alf.ConditionalAndExpression;

+import org.eclipse.papyrus.uml.alf.alf.ExclusiveOrExpression;

+import org.eclipse.papyrus.uml.alf.alf.ForAllOrExistsOrOneOperation;

+import org.eclipse.papyrus.uml.alf.alf.INTEGER_LITERAL;

+import org.eclipse.papyrus.uml.alf.alf.InclusiveOrExpression;

+import org.eclipse.papyrus.uml.alf.alf.IsUniqueOperation;

+import org.eclipse.papyrus.uml.alf.alf.LITERAL;

+import org.eclipse.papyrus.uml.alf.alf.LinkOperationTuple;

+import org.eclipse.papyrus.uml.alf.alf.LinkOperationTupleElement;

+import org.eclipse.papyrus.uml.alf.alf.MultiplicativeExpression;

+import org.eclipse.papyrus.uml.alf.alf.NonLiteralValueSpecification;

+import org.eclipse.papyrus.uml.alf.alf.NullExpression;

+import org.eclipse.papyrus.uml.alf.alf.ParenthesizedExpression;

+import org.eclipse.papyrus.uml.alf.alf.PrimaryExpression;

+import org.eclipse.papyrus.uml.alf.alf.QualifiedNamePath;

+import org.eclipse.papyrus.uml.alf.alf.QualifiedNameWithBinding;

+import org.eclipse.papyrus.uml.alf.alf.STRING_LITERAL;

+import org.eclipse.papyrus.uml.alf.alf.SelectOrRejectOperation;

+import org.eclipse.papyrus.uml.alf.alf.SuffixExpression;

+import org.eclipse.papyrus.uml.alf.alf.TupleElement;

+import org.eclipse.papyrus.uml.alf.alf.UNLIMITED_LITERAL;

+import org.eclipse.papyrus.uml.alf.alf.UnqualifiedName;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.ArithmeticExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.BitStringUnaryExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.BooleanLiteralExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.BooleanUnaryExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.CastExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.ClassExtentExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.ClassificationExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.ConditionalLogicalExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.ConditionalTestExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.EqualityExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.Expression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.ExtentOrExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.FeatureInvocationExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.FeatureReference;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.ForAllOrExistsOrOneExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.InstanceCreationExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.InvocationExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.IsUniqueExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.IsolationExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.LinkOperationExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.LogicalExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.NameBinding;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.NameExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.NamedExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.NamedTemplateBinding;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.NamedTuple;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.NaturalLiteralExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.NumericUnaryExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.PositionalTuple;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.PropertyAccessExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.QualifiedName;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.RelationalExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.SelectOrRejectExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.SequenceAccessExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.SequenceConstructionExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.SequenceOperationExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.SequenceReductionExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.ShiftExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.StringLiteralExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.SuperInvocationExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.TemplateBinding;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.TemplateParameterSubstitution;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.ThisExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.Tuple;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.UnaryExpression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.UnboundedLiteralExpression;

 

 public class ASTFactory {

 

@@ -107,7 +107,7 @@ public class ASTFactory {
 	/*

 	 * Synthesizes a alf.syntax.expressions.QualifiedName from a NameExpression

 	 */

-	public QualifiedName synthesizeQualifiedName(org.eclipse.papyrus.alf.alf.NameExpression parsed) {

+	public QualifiedName synthesizeQualifiedName(org.eclipse.papyrus.uml.alf.alf.NameExpression parsed) {

 		QualifiedName synthesized = new QualifiedName() ;

 		/* 1. Synthesizes property isAmbigous:boolean */

 		// LIMITATION: The parser implementation only supports :: (no .)

@@ -142,72 +142,72 @@ public class ASTFactory {
 	 * Synthesizes a alf.syntax.expressions.QualifiedName from a NameExpression

 	 */

 	public QualifiedName synthesizeQualifiedName(

-			org.eclipse.papyrus.alf.alf.Expression parsed) {

+			org.eclipse.papyrus.uml.alf.alf.Expression parsed) {

 		// TODO Raise an error in the case where "parsed" does not finally resolve to a NameExpression

-		org.eclipse.papyrus.alf.alf.ConditionalTestExpression tmp1 = 

-				(org.eclipse.papyrus.alf.alf.ConditionalTestExpression)parsed ;

+		org.eclipse.papyrus.uml.alf.alf.ConditionalTestExpression tmp1 = 

+				(org.eclipse.papyrus.uml.alf.alf.ConditionalTestExpression)parsed ;

 		if (tmp1.getWhenFalse() != null || tmp1.getWhenTrue() != null)

 			// error

 			return new QualifiedName() ;

-		org.eclipse.papyrus.alf.alf.ConditionalOrExpression tmp2 = tmp1.getExp() ;

+		org.eclipse.papyrus.uml.alf.alf.ConditionalOrExpression tmp2 = tmp1.getExp() ;

 		if (tmp2.getExp().size() != 1)

 			// error

 			return new QualifiedName() ;

-		org.eclipse.papyrus.alf.alf.ConditionalAndExpression tmp3 = tmp2.getExp().get(0) ;

+		org.eclipse.papyrus.uml.alf.alf.ConditionalAndExpression tmp3 = tmp2.getExp().get(0) ;

 		if (tmp3.getExp().size() != 1)

 			// error

 			return new QualifiedName() ;

-		org.eclipse.papyrus.alf.alf.InclusiveOrExpression tmp4 = tmp3.getExp().get(0) ;

+		org.eclipse.papyrus.uml.alf.alf.InclusiveOrExpression tmp4 = tmp3.getExp().get(0) ;

 		if (tmp4.getExp().size() != 1)

 			// error

 			return new QualifiedName() ;

-		org.eclipse.papyrus.alf.alf.ExclusiveOrExpression tmp5 = tmp4.getExp().get(0) ;

+		org.eclipse.papyrus.uml.alf.alf.ExclusiveOrExpression tmp5 = tmp4.getExp().get(0) ;

 		if (tmp5.getExp().size() != 1)

 			// error

 			return new QualifiedName() ;

-		org.eclipse.papyrus.alf.alf.AndExpression tmp6 = tmp5.getExp().get(0) ;

+		org.eclipse.papyrus.uml.alf.alf.AndExpression tmp6 = tmp5.getExp().get(0) ;

 		if (tmp6.getExp().size() != 1)

 			// error

 			return new QualifiedName() ;

-		org.eclipse.papyrus.alf.alf.EqualityExpression tmp7 = tmp6.getExp().get(0) ;

+		org.eclipse.papyrus.uml.alf.alf.EqualityExpression tmp7 = tmp6.getExp().get(0) ;

 		if (tmp7.getOp().size() != 0)

 			// error

 			return new QualifiedName() ;

-		org.eclipse.papyrus.alf.alf.ClassificationExpression tmp8 = tmp7.getExp().get(0) ;

+		org.eclipse.papyrus.uml.alf.alf.ClassificationExpression tmp8 = tmp7.getExp().get(0) ;

 		if (tmp8.getOp() != null && !tmp8.getOp().equals(""))

 			//error

 			return new QualifiedName() ;

-		org.eclipse.papyrus.alf.alf.RelationalExpression tmp9 = tmp8.getExp() ;

+		org.eclipse.papyrus.uml.alf.alf.RelationalExpression tmp9 = tmp8.getExp() ;

 		if (tmp9.getOp() != null && !tmp9.getOp().equals(""))

 			// error

 			return new QualifiedName() ;

-		org.eclipse.papyrus.alf.alf.ShiftExpression tmp10 = tmp9.getLeft() ;

+		org.eclipse.papyrus.uml.alf.alf.ShiftExpression tmp10 = tmp9.getLeft() ;

 		if (tmp10.getExp().size() != 1)

 			// error

 			return new QualifiedName() ;

-		org.eclipse.papyrus.alf.alf.AdditiveExpression tmp11 = tmp10.getExp().get(0) ;

+		org.eclipse.papyrus.uml.alf.alf.AdditiveExpression tmp11 = tmp10.getExp().get(0) ;

 		if (tmp11.getExp().size() != 1)

 			// error

 			return new QualifiedName() ;

-		org.eclipse.papyrus.alf.alf.MultiplicativeExpression tmp12 = tmp11.getExp().get(0) ;

+		org.eclipse.papyrus.uml.alf.alf.MultiplicativeExpression tmp12 = tmp11.getExp().get(0) ;

 		if (tmp12.getExp().size() != 1)

 			// error

 			return new QualifiedName() ;

-		org.eclipse.papyrus.alf.alf.UnaryExpression tmp13 = tmp12.getExp().get(0) ;

+		org.eclipse.papyrus.uml.alf.alf.UnaryExpression tmp13 = tmp12.getExp().get(0) ;

 		if (tmp13.getOp() != null && !tmp13.getOp().equals(""))

 			// error

 			return new QualifiedName() ;

-		org.eclipse.papyrus.alf.alf.PrimaryExpression tmp14 = tmp13.getExp() ;

+		org.eclipse.papyrus.uml.alf.alf.PrimaryExpression tmp14 = tmp13.getExp() ;

 		if (tmp14.getPrefix() == null)

 			// error

 			return new QualifiedName() ;

-		org.eclipse.papyrus.alf.alf.ValueSpecification tmp15 = tmp14.getPrefix() ;

+		org.eclipse.papyrus.uml.alf.alf.ValueSpecification tmp15 = tmp14.getPrefix() ;

 		

-		if (! (tmp15 instanceof org.eclipse.papyrus.alf.alf.NameExpression))

+		if (! (tmp15 instanceof org.eclipse.papyrus.uml.alf.alf.NameExpression))

 			// error

 			return new QualifiedName() ;

 		

-		return this.synthesizeQualifiedName((org.eclipse.papyrus.alf.alf.NameExpression)tmp15) ;

+		return this.synthesizeQualifiedName((org.eclipse.papyrus.uml.alf.alf.NameExpression)tmp15) ;

 	}

 	

 	/*

@@ -267,7 +267,7 @@ public class ASTFactory {
 	/*

 	 * Synthesizes a import alf.syntax.expressions.TemplateBinding from a TemplateBinding

 	 */

-	public TemplateBinding synthesizeTemplateBinding(org.eclipse.papyrus.alf.alf.TemplateBinding parsed) {

+	public TemplateBinding synthesizeTemplateBinding(org.eclipse.papyrus.uml.alf.alf.TemplateBinding parsed) {

 		// LIMITATION: In this implementation of the Alf parser, only NamedTemplateBinding are supported		

 		return this.synthesizeNamedTemplateBinding(parsed) ;

 	}

@@ -275,12 +275,12 @@ public class ASTFactory {
 	/*

 	 * Synthesizes a alf.syntax.expressions.NamedTemplateBinding from a TemplateBinding

 	 */

-	public NamedTemplateBinding synthesizeNamedTemplateBinding(org.eclipse.papyrus.alf.alf.TemplateBinding parsed) {

+	public NamedTemplateBinding synthesizeNamedTemplateBinding(org.eclipse.papyrus.uml.alf.alf.TemplateBinding parsed) {

 		NamedTemplateBinding synthesized = new NamedTemplateBinding() ;

 		

 		/*1. Synthesizes property substitution:List<TemplateParameterSubstitution> */

 		synthesized.substitution = new ArrayList<TemplateParameterSubstitution>() ;

-		for (org.eclipse.papyrus.alf.alf.NamedTemplateBinding s : parsed.getBindings()) {

+		for (org.eclipse.papyrus.uml.alf.alf.NamedTemplateBinding s : parsed.getBindings()) {

 			synthesized.substitution.add(

 				this.synthesizeTemplateParameterSubstitution(s)) ;

 		}

@@ -292,7 +292,7 @@ public class ASTFactory {
 	 * NOTE: The class NamedTemplateBinding, from the implementation of the Alf grammar, is misleading

 	 * Should be TemplateParameterSubsitution

 	 */

-	public TemplateParameterSubstitution synthesizeTemplateParameterSubstitution(org.eclipse.papyrus.alf.alf.NamedTemplateBinding parsed) {

+	public TemplateParameterSubstitution synthesizeTemplateParameterSubstitution(org.eclipse.papyrus.uml.alf.alf.NamedTemplateBinding parsed) {

 		TemplateParameterSubstitution synthesized = new TemplateParameterSubstitution() ;

 		

 		/* 1. Synthesizes property parameterName:String */

@@ -308,14 +308,14 @@ public class ASTFactory {
 	/*

 	 * Synthesizes a alf.syntax.expressions.Expression from an Expression

 	 */

-	public Expression synthesizeExpression(org.eclipse.papyrus.alf.alf.Expression parsed) {

+	public Expression synthesizeExpression(org.eclipse.papyrus.uml.alf.alf.Expression parsed) {

 		

 		// In this implementation of the Alf parser, rule Expression can only 

 		// produce a ConditionalTestExpression

 		// NOTE: In the Alf spec, Expression can also produce an AssignmentExpression,

 		// which are not directly supported by our parser.

 		

-		return this.synthesizeConditionalTestExpression((org.eclipse.papyrus.alf.alf.ConditionalTestExpression)parsed) ;

+		return this.synthesizeConditionalTestExpression((org.eclipse.papyrus.uml.alf.alf.ConditionalTestExpression)parsed) ;

 	}

 	

 	/*

@@ -338,7 +338,7 @@ public class ASTFactory {
 	/*

 	 * Synthesizes a alf.syntax.expressions.Expression from a NameExpression

 	 */

-	public Expression synthesizeExpression(org.eclipse.papyrus.alf.alf.NameExpression exp) {

+	public Expression synthesizeExpression(org.eclipse.papyrus.uml.alf.alf.NameExpression exp) {

 		// TODO Auto-generated method stub

 		return new Expression();

 	}

@@ -358,7 +358,7 @@ public class ASTFactory {
 	/*

 	 * Synthesizes a alf.syntax.expressions.Expression from a ConditionTestExpression

 	 */

-	public Expression synthesizeConditionalTestExpression(org.eclipse.papyrus.alf.alf.ConditionalTestExpression parsed) {

+	public Expression synthesizeConditionalTestExpression(org.eclipse.papyrus.uml.alf.alf.ConditionalTestExpression parsed) {

 		// First checks if it is actually a ConditionalTestExpression

 		if (parsed.getWhenFalse() != null || parsed.getWhenTrue() != null) {

 			// This is a ConditionalTestExpression

@@ -382,7 +382,7 @@ public class ASTFactory {
 	/*

 	 * Synthesizes a alf.syntax.expressions.Expression from a ConditionalOrExpression

 	 */

-	public Expression synthesizeConditionalLogicalExpression(org.eclipse.papyrus.alf.alf.ConditionalOrExpression parsed) {

+	public Expression synthesizeConditionalLogicalExpression(org.eclipse.papyrus.uml.alf.alf.ConditionalOrExpression parsed) {

 

 		// First check if it is a ConditionalOrExpression

 		if (parsed.getExp().size() == 1)

@@ -580,7 +580,7 @@ public class ASTFactory {
 	 * representing a flat AndExpression

 	 */

 	public Expression synthesizeLogicalExpressionFromListOfEqualityExpression(

-			List<org.eclipse.papyrus.alf.alf.EqualityExpression> flatParsed) {

+			List<org.eclipse.papyrus.uml.alf.alf.EqualityExpression> flatParsed) {

 		//first check if it is a flat AndExpression

 		if (flatParsed.size() == 1)

 			// This is not a flat AndExpression

@@ -629,7 +629,7 @@ public class ASTFactory {
 	 * Synthesizes a alf.syntax.expressions.Expression from a EqualityExpression

 	 */

 	public Expression synthesizeEqualityExpression(

-			org.eclipse.papyrus.alf.alf.EqualityExpression parsed) {

+			org.eclipse.papyrus.uml.alf.alf.EqualityExpression parsed) {

 		//first check if it is an EqualityExpression

 		if (parsed.getExp().size() == 1)

 			// This is not an EqualityExpression

@@ -655,7 +655,7 @@ public class ASTFactory {
 	 * and (equality) operators representing a flat EqualityExpression

 	 */

 	public Expression synthesizeEqualityExpression(

-			List<org.eclipse.papyrus.alf.alf.ClassificationExpression> flatParsed,

+			List<org.eclipse.papyrus.uml.alf.alf.ClassificationExpression> flatParsed,

 			List<String> operators) {

 		//first check if it is a flat EqualityExpression

 		if (flatParsed.size() == 1)

@@ -681,7 +681,7 @@ public class ASTFactory {
 	 * Synthesizes a alf.syntax.expressions.Expression from a ClassificationExpression

 	 */

 	public Expression synthesizeClassificationExpression(

-			org.eclipse.papyrus.alf.alf.ClassificationExpression parsed) {

+			org.eclipse.papyrus.uml.alf.alf.ClassificationExpression parsed) {

 		//first check if it is a ClassificationExpression

 		if (parsed.getOp() == null || parsed.getOp().equals(""))

 			// This is not a ClassificationExpression

@@ -704,7 +704,7 @@ public class ASTFactory {
 	/*

 	 * Synthesizes a alf.syntax.expressions.Expression from a RelationalExpression

 	 */

-	public Expression synthesizeRelationalExpression(org.eclipse.papyrus.alf.alf.RelationalExpression parsed) {

+	public Expression synthesizeRelationalExpression(org.eclipse.papyrus.uml.alf.alf.RelationalExpression parsed) {

 		//first check if it is a RelationalExpression

 		if (parsed.getOp() == null || parsed.getOp().equals(""))

 			// This is not a RelationalExpression

@@ -727,7 +727,7 @@ public class ASTFactory {
 	/*

 	 * Synthesizes a alf.syntax.expressions.Expression from a ShiftExpression

 	 */

-	public Expression synthesizeShiftExpression(org.eclipse.papyrus.alf.alf.ShiftExpression parsed) {

+	public Expression synthesizeShiftExpression(org.eclipse.papyrus.uml.alf.alf.ShiftExpression parsed) {

 		//first check if it is a ShiftExpression

 		if (parsed.getExp().size() == 1)

 			// This is not a ShiftExpression

@@ -828,7 +828,7 @@ public class ASTFactory {
 	 * and (multiplicative) operators representing a flat MultiplicativeExpression

 	 */

 	public Expression synthesizeArithmeticExpressionFromListOfUnaryExpression(

-			List<org.eclipse.papyrus.alf.alf.UnaryExpression> flatParsed,

+			List<org.eclipse.papyrus.uml.alf.alf.UnaryExpression> flatParsed,

 			List<String> operators) {

 		//first check if it is a flat MultiplicativeExpression

 		if (flatParsed.size() == 1)

@@ -854,7 +854,7 @@ public class ASTFactory {
 	 * Synthesizes a alf.syntax.expressions.Expression from a UnaryExpression

 	 */

 	public Expression synthesizeUnaryExpression(

-			org.eclipse.papyrus.alf.alf.UnaryExpression parsed) {

+			org.eclipse.papyrus.uml.alf.alf.UnaryExpression parsed) {

 		//first check if it is a UnaryExpression

 		if (parsed.getOp() == null || parsed.getOp().equals(""))

 			// This is not a UnaryExpression

@@ -885,27 +885,27 @@ public class ASTFactory {
 	 * Synthesizes a alf.syntax.expressions.Expression from a PrimaryExpression

 	 */

 	public Expression synthesizePrimaryExpression(PrimaryExpression exp) {

-		if (exp instanceof org.eclipse.papyrus.alf.alf.LITERAL)

+		if (exp instanceof org.eclipse.papyrus.uml.alf.alf.LITERAL)

 			return this.synthesizeLiteralExpression(

-					(org.eclipse.papyrus.alf.alf.LITERAL) exp) ;

-		else if (exp instanceof org.eclipse.papyrus.alf.alf.ThisExpression)

+					(org.eclipse.papyrus.uml.alf.alf.LITERAL) exp) ;

+		else if (exp instanceof org.eclipse.papyrus.uml.alf.alf.ThisExpression)

 			return this.synthesizeThisExpression(

-					(org.eclipse.papyrus.alf.alf.ThisExpression) exp) ;

-		else if (exp instanceof org.eclipse.papyrus.alf.alf.SuperInvocationExpression)

+					(org.eclipse.papyrus.uml.alf.alf.ThisExpression) exp) ;

+		else if (exp instanceof org.eclipse.papyrus.uml.alf.alf.SuperInvocationExpression)

 			return this.synthesizeSuperInvocationExpression(

-					(org.eclipse.papyrus.alf.alf.SuperInvocationExpression) exp) ;

-		else if (exp instanceof org.eclipse.papyrus.alf.alf.InstanceCreationExpression)

+					(org.eclipse.papyrus.uml.alf.alf.SuperInvocationExpression) exp) ;

+		else if (exp instanceof org.eclipse.papyrus.uml.alf.alf.InstanceCreationExpression)

 			return this.synthesizeInstanceCreationExpression(

-					(org.eclipse.papyrus.alf.alf.InstanceCreationExpression) exp) ;

-		else if (exp instanceof org.eclipse.papyrus.alf.alf.ParenthesizedExpression)

+					(org.eclipse.papyrus.uml.alf.alf.InstanceCreationExpression) exp) ;

+		else if (exp instanceof org.eclipse.papyrus.uml.alf.alf.ParenthesizedExpression)

 			return this.synthesizeExpression(

-					(org.eclipse.papyrus.alf.alf.ParenthesizedExpression) exp) ;

-		else if (exp instanceof org.eclipse.papyrus.alf.alf.NameExpression)

+					(org.eclipse.papyrus.uml.alf.alf.ParenthesizedExpression) exp) ;

+		else if (exp instanceof org.eclipse.papyrus.uml.alf.alf.NameExpression)

 			return this.synthesizeExpression(

-					(org.eclipse.papyrus.alf.alf.NameExpression) exp) ;

+					(org.eclipse.papyrus.uml.alf.alf.NameExpression) exp) ;

 		else // NullExpression

 			return this.synthesizeSequenceConstructionExpression(

-					(org.eclipse.papyrus.alf.alf.NullExpression) exp) ;

+					(org.eclipse.papyrus.uml.alf.alf.NullExpression) exp) ;

 	}

 

 	/*

@@ -922,21 +922,21 @@ public class ASTFactory {
 	 * Synthesizes a alf.syntax.expressions.Expression from a NonLiteralValueSpecification

 	 */

 	public Expression synthesizePrimaryExpression(NonLiteralValueSpecification exp) {

-		if (exp instanceof org.eclipse.papyrus.alf.alf.ThisExpression)

+		if (exp instanceof org.eclipse.papyrus.uml.alf.alf.ThisExpression)

 			return this.synthesizeThisExpression(

-					(org.eclipse.papyrus.alf.alf.ThisExpression) exp) ;

-		else if (exp instanceof org.eclipse.papyrus.alf.alf.SuperInvocationExpression)

+					(org.eclipse.papyrus.uml.alf.alf.ThisExpression) exp) ;

+		else if (exp instanceof org.eclipse.papyrus.uml.alf.alf.SuperInvocationExpression)

 			return this.synthesizeSuperInvocationExpression(

-					(org.eclipse.papyrus.alf.alf.SuperInvocationExpression) exp) ;

-		else if (exp instanceof org.eclipse.papyrus.alf.alf.InstanceCreationExpression)

+					(org.eclipse.papyrus.uml.alf.alf.SuperInvocationExpression) exp) ;

+		else if (exp instanceof org.eclipse.papyrus.uml.alf.alf.InstanceCreationExpression)

 			return this.synthesizeInstanceCreationExpression(

-					(org.eclipse.papyrus.alf.alf.InstanceCreationExpression) exp) ;

-		else if (exp instanceof org.eclipse.papyrus.alf.alf.ParenthesizedExpression)

+					(org.eclipse.papyrus.uml.alf.alf.InstanceCreationExpression) exp) ;

+		else if (exp instanceof org.eclipse.papyrus.uml.alf.alf.ParenthesizedExpression)

 			return this.synthesizeExpression(

-					(org.eclipse.papyrus.alf.alf.ParenthesizedExpression) exp) ;

+					(org.eclipse.papyrus.uml.alf.alf.ParenthesizedExpression) exp) ;

 		else // NameExpression

 			return this.synthesizeExpression(

-					(org.eclipse.papyrus.alf.alf.NameExpression) exp) ;

+					(org.eclipse.papyrus.uml.alf.alf.NameExpression) exp) ;

 	}

 	

 	/*

@@ -975,7 +975,7 @@ public class ASTFactory {
 	/*

 	 * Synthesizes a alf.syntax.expressions.Expression from a ThisExpression

 	 */

-	public Expression synthesizeThisExpression(org.eclipse.papyrus.alf.alf.ThisExpression parsed) {

+	public Expression synthesizeThisExpression(org.eclipse.papyrus.uml.alf.alf.ThisExpression parsed) {

 		ThisExpression synthesized = new ThisExpression() ;

 		/*. No properties to synthesize */

 		if (parsed.getSuffix() != null)

@@ -987,7 +987,7 @@ public class ASTFactory {
 	 * Synthesizes a alf.syntax.expressions.Expression from a SuperInvocationExpression

 	 */

 	public Expression synthesizeSuperInvocationExpression(

-			org.eclipse.papyrus.alf.alf.SuperInvocationExpression parsed) {

+			org.eclipse.papyrus.uml.alf.alf.SuperInvocationExpression parsed) {

 		SuperInvocationExpression synthesized = new  SuperInvocationExpression() ;

 		

 		/* 1. Synthesizes property target:QualifiedName */

@@ -1003,7 +1003,7 @@ public class ASTFactory {
 	/*

 	 * Synthesizes a alf.syntax.expressions.Tuple from a Tuple

 	 */

-	public Tuple synthesizeTuple(org.eclipse.papyrus.alf.alf.Tuple parsed,

+	public Tuple synthesizeTuple(org.eclipse.papyrus.uml.alf.alf.Tuple parsed,

 								 InvocationExpression invocation) {

 		// LIMITATION: This implementation of the Alf Parser only supports positional tuples

 		return this.synthesizePositionalTuple(parsed, invocation);

@@ -1013,7 +1013,7 @@ public class ASTFactory {
 	 * Synthesizes a alf.syntax.expressions.PositionalTuple from a Tuple

 	 */

 	public Tuple synthesizePositionalTuple(

-			org.eclipse.papyrus.alf.alf.Tuple parsed,

+			org.eclipse.papyrus.uml.alf.alf.Tuple parsed,

 			InvocationExpression invocation) {

 		PositionalTuple synthesized = new PositionalTuple() ;

 		

@@ -1064,7 +1064,7 @@ public class ASTFactory {
 	 * Synthesizes a alf.syntax.expressions.Expression from a InstanceCreationExpression

 	 */

 	public Expression synthesizeInstanceCreationExpression(

-			org.eclipse.papyrus.alf.alf.InstanceCreationExpression parsed) {

+			org.eclipse.papyrus.uml.alf.alf.InstanceCreationExpression parsed) {

 		InstanceCreationExpression synthesized = new InstanceCreationExpression() ;

 		

 		/* 1. Synthesizes property target:QualifiedName */

@@ -1085,34 +1085,34 @@ public class ASTFactory {
 	 */

 	public Expression synthesizeExpression(

 			Expression synthesized, SuffixExpression suffix) {

-		if (suffix instanceof org.eclipse.papyrus.alf.alf.OperationCallExpression)

+		if (suffix instanceof org.eclipse.papyrus.uml.alf.alf.OperationCallExpression)

 			return this.synthesizeFeatureInvocationExpression(

 					synthesized,

-					(org.eclipse.papyrus.alf.alf.OperationCallExpression)suffix) ;

-		if (suffix instanceof org.eclipse.papyrus.alf.alf.PropertyCallExpression)

+					(org.eclipse.papyrus.uml.alf.alf.OperationCallExpression)suffix) ;

+		if (suffix instanceof org.eclipse.papyrus.uml.alf.alf.PropertyCallExpression)

 			return this.synthesizePropertyAccessExpression(

 					synthesized,

-					(org.eclipse.papyrus.alf.alf.PropertyCallExpression)suffix) ;

-		if (suffix instanceof org.eclipse.papyrus.alf.alf.LinkOperationExpression)

+					(org.eclipse.papyrus.uml.alf.alf.PropertyCallExpression)suffix) ;

+		if (suffix instanceof org.eclipse.papyrus.uml.alf.alf.LinkOperationExpression)

 			return this.synthesizeLinkOperationExpression(

 					synthesized,

-					(org.eclipse.papyrus.alf.alf.LinkOperationExpression)suffix) ;

-		if (suffix instanceof org.eclipse.papyrus.alf.alf.SequenceOperationExpression)

+					(org.eclipse.papyrus.uml.alf.alf.LinkOperationExpression)suffix) ;

+		if (suffix instanceof org.eclipse.papyrus.uml.alf.alf.SequenceOperationExpression)

 			return this.synthesizeSequenceOperationExpression(

 					synthesized,

-					(org.eclipse.papyrus.alf.alf.SequenceOperationExpression)suffix) ;

-		if (suffix instanceof org.eclipse.papyrus.alf.alf.SequenceReductionExpression)

+					(org.eclipse.papyrus.uml.alf.alf.SequenceOperationExpression)suffix) ;

+		if (suffix instanceof org.eclipse.papyrus.uml.alf.alf.SequenceReductionExpression)

 			return this.synthesizeSequenceReductionExpression(

 					synthesized,

-					(org.eclipse.papyrus.alf.alf.SequenceReductionExpression)suffix) ;

-		if (suffix instanceof org.eclipse.papyrus.alf.alf.SequenceExpansionExpression)

+					(org.eclipse.papyrus.uml.alf.alf.SequenceReductionExpression)suffix) ;

+		if (suffix instanceof org.eclipse.papyrus.uml.alf.alf.SequenceExpansionExpression)

 			return this.synthesizeSequenceExpansionExpression(

 					synthesized,

-					(org.eclipse.papyrus.alf.alf.SequenceExpansionExpression)suffix) ;

-		else // org.eclipse.papyrus.alf.alf.ClassExtentExpression

+					(org.eclipse.papyrus.uml.alf.alf.SequenceExpansionExpression)suffix) ;

+		else // org.eclipse.papyrus.uml.alf.alf.ClassExtentExpression

 			return this.synthesizeClassExtentExpression(

 					synthesized,

-					(org.eclipse.papyrus.alf.alf.ClassExtentExpression)suffix) ;

+					(org.eclipse.papyrus.uml.alf.alf.ClassExtentExpression)suffix) ;

 	}

 

 	/*

@@ -1120,7 +1120,7 @@ public class ASTFactory {
 	 * and a suffix OperationCallExpression

 	 */

 	public Expression synthesizeFeatureInvocationExpression(

-			Expression target, org.eclipse.papyrus.alf.alf.OperationCallExpression suffix) {

+			Expression target, org.eclipse.papyrus.uml.alf.alf.OperationCallExpression suffix) {

 		FeatureInvocationExpression synthesized = new FeatureInvocationExpression() ;

 		

 		/*1. Synthesizes property tuple:Tuple */

@@ -1143,7 +1143,7 @@ public class ASTFactory {
 	 * and a suffix PropertyCallExpression

 	 */

 	public Expression synthesizePropertyAccessExpression(Expression target,

-			org.eclipse.papyrus.alf.alf.PropertyCallExpression suffix) {

+			org.eclipse.papyrus.uml.alf.alf.PropertyCallExpression suffix) {

 		PropertyAccessExpression synthesized = new PropertyAccessExpression() ;

 		/*1. Synthesize property featureReference */

 		FeatureReference featureReference = new FeatureReference() ;

@@ -1176,7 +1176,7 @@ public class ASTFactory {
 	 * and a suffix LinkCallExpression

 	 */

 	public Expression synthesizeLinkOperationExpression(

-			Expression target, org.eclipse.papyrus.alf.alf.LinkOperationExpression suffix) {

+			Expression target, org.eclipse.papyrus.uml.alf.alf.LinkOperationExpression suffix) {

 		LinkOperationExpression synthesized = new LinkOperationExpression() ;

 		

 		/*1. Synthesize property tuple:Tuple */

@@ -1206,7 +1206,7 @@ public class ASTFactory {
 	 * and a suffix SequenceOperationExpression

 	 */

 	public Expression synthesizeSequenceOperationExpression(

-			Expression target, org.eclipse.papyrus.alf.alf.SequenceOperationExpression suffix) {

+			Expression target, org.eclipse.papyrus.uml.alf.alf.SequenceOperationExpression suffix) {

 		SequenceOperationExpression synthesized = new SequenceOperationExpression() ;

 		

 		/*1. Synthesize property tuple:Tuple */

@@ -1227,7 +1227,7 @@ public class ASTFactory {
 	 * and a suffix SequenceReductionExpression

 	 */

 	public Expression synthesizeSequenceReductionExpression(

-			Expression target, org.eclipse.papyrus.alf.alf.SequenceReductionExpression suffix) {

+			Expression target, org.eclipse.papyrus.uml.alf.alf.SequenceReductionExpression suffix) {

 		SequenceReductionExpression synthesized = new SequenceReductionExpression() ;

 		

 		/*1. Synthesize property behaviorName:QualifiedName */

@@ -1250,22 +1250,22 @@ public class ASTFactory {
 	 * and a suffix SequenceExpansionExpression

 	 */

 	public Expression synthesizeSequenceExpansionExpression(

-			Expression target, org.eclipse.papyrus.alf.alf.SequenceExpansionExpression suffix) {

-		if (suffix instanceof org.eclipse.papyrus.alf.alf.SelectOrRejectOperation) {

+			Expression target, org.eclipse.papyrus.uml.alf.alf.SequenceExpansionExpression suffix) {

+		if (suffix instanceof org.eclipse.papyrus.uml.alf.alf.SelectOrRejectOperation) {

 			return this.synthesizeSelectOrRejectExpression(target, 

-									(org.eclipse.papyrus.alf.alf.SelectOrRejectOperation)suffix) ;

+									(org.eclipse.papyrus.uml.alf.alf.SelectOrRejectOperation)suffix) ;

 		}

-		else if (suffix instanceof org.eclipse.papyrus.alf.alf.ForAllOrExistsOrOneOperation) {

+		else if (suffix instanceof org.eclipse.papyrus.uml.alf.alf.ForAllOrExistsOrOneOperation) {

 			return this.synthesizeForAllOrExistsOrOneExpression(target, 

-					(org.eclipse.papyrus.alf.alf.ForAllOrExistsOrOneOperation)suffix) ;

+					(org.eclipse.papyrus.uml.alf.alf.ForAllOrExistsOrOneOperation)suffix) ;

 		}

-		else if (suffix instanceof org.eclipse.papyrus.alf.alf.CollectOrIterateOperation) {

+		else if (suffix instanceof org.eclipse.papyrus.uml.alf.alf.CollectOrIterateOperation) {

 			return this.synthesizeCollectOrIterateExpression(target, 

-					(org.eclipse.papyrus.alf.alf.CollectOrIterateOperation)suffix) ;

+					(org.eclipse.papyrus.uml.alf.alf.CollectOrIterateOperation)suffix) ;

 		}

-		else { // instanceof org.eclipse.papyrus.alf.alf.IsUniqueOperation

+		else { // instanceof org.eclipse.papyrus.uml.alf.alf.IsUniqueOperation

 			return this.synthesizeIsUniqueExpression(target, 

-					(org.eclipse.papyrus.alf.alf.IsUniqueOperation)suffix) ;

+					(org.eclipse.papyrus.uml.alf.alf.IsUniqueOperation)suffix) ;

 		}		

 	}

 

@@ -1405,7 +1405,7 @@ public class ASTFactory {
 	 * and a suffix ClassExtentExpression

 	 */

 	public Expression synthesizeClassExtentExpression(Expression target,

-			org.eclipse.papyrus.alf.alf.ClassExtentExpression suffix) {

+			org.eclipse.papyrus.uml.alf.alf.ClassExtentExpression suffix) {

 		ClassExtentExpression synthesized = new ClassExtentExpression() ;

 		

 		/*1. Synthesize property className:QualifiedName */

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/common/AssignedSource.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/common/AssignedSource.java
index 05ec0a8ae30..d701b598a71 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/common/AssignedSource.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/common/AssignedSource.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.common;

+package org.eclipse.papyrus.uml.alf.syntax.common;

 

 public class AssignedSource {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/common/DocumentedElement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/common/DocumentedElement.java
index d0be1aee192..b385bc6a075 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/common/DocumentedElement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/common/DocumentedElement.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.common;

+package org.eclipse.papyrus.uml.alf.syntax.common;

 

 import java.util.List;

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/common/ElementReference.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/common/ElementReference.java
new file mode 100644
index 00000000000..1890f70f5d8
--- /dev/null
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/common/ElementReference.java
@@ -0,0 +1,5 @@
+package org.eclipse.papyrus.uml.alf.syntax.common;

+

+public abstract class ElementReference {

+

+}

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/common/ExternalElementReference.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/common/ExternalElementReference.java
index 401e52affde..24ee78b5d81 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/common/ExternalElementReference.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/common/ExternalElementReference.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.common;

+package org.eclipse.papyrus.uml.alf.syntax.common;

 

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/common/InternalElementReference.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/common/InternalElementReference.java
index 2839da4a9f2..885682d7e17 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/common/InternalElementReference.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/common/InternalElementReference.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.common;

+package org.eclipse.papyrus.uml.alf.syntax.common;

 

 public class InternalElementReference extends ElementReference {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/common/SyntaxElement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/common/SyntaxElement.java
new file mode 100644
index 00000000000..a8f78ed9951
--- /dev/null
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/common/SyntaxElement.java
@@ -0,0 +1,5 @@
+package org.eclipse.papyrus.uml.alf.syntax.common;

+

+public abstract class SyntaxElement {

+

+}

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ArithmeticExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ArithmeticExpression.java
index 47fd23784ee..43b5cb4e6ec 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ArithmeticExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ArithmeticExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class ArithmeticExpression extends BinaryExpression {

 	

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/AssignmentExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/AssignmentExpression.java
index f0be211e824..7902a97c32b 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/AssignmentExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/AssignmentExpression.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

 

 public class AssignmentExpression extends Expression {

 	

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/BehaviorInvocationExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/BehaviorInvocationExpression.java
index 101ebea21c5..bf0d67325f0 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/BehaviorInvocationExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/BehaviorInvocationExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class BehaviorInvocationExpression extends InvocationExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/BinaryExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/BinaryExpression.java
index a90f4a1c9fb..8419c4bd460 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/BinaryExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/BinaryExpression.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

 

 public abstract class BinaryExpression extends Expression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/BitStringUnaryExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/BitStringUnaryExpression.java
index 5f5fbb60a87..c3b4e1a1b2c 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/BitStringUnaryExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/BitStringUnaryExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class BitStringUnaryExpression extends UnaryExpression {

 	

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/BooleanLiteralExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/BooleanLiteralExpression.java
index b17f88b7fc5..1715f2338e6 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/BooleanLiteralExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/BooleanLiteralExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class BooleanLiteralExpression extends LiteralExpression {

 	

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/BooleanUnaryExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/BooleanUnaryExpression.java
index 9469986d775..7304d6f692c 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/BooleanUnaryExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/BooleanUnaryExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class BooleanUnaryExpression extends UnaryExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/CastExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/CastExpression.java
index 8005c5e1b26..d6cce94a857 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/CastExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/CastExpression.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

 

 public class CastExpression extends Expression {

 	

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ClassExtentExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ClassExtentExpression.java
index 98b17e87f74..04cd8712a5c 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ClassExtentExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ClassExtentExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class ClassExtentExpression extends Expression {

 	

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ClassificationExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ClassificationExpression.java
index 5713d13c930..ca9b8541c56 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ClassificationExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ClassificationExpression.java
@@ -1,6 +1,6 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

 

 public class ClassificationExpression extends UnaryExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/CollectOrIterateExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/CollectOrIterateExpression.java
index 19299e2d6d3..f513cf57a53 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/CollectOrIterateExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/CollectOrIterateExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class CollectOrIterateExpression extends SequenceExpansionExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ConditionalLogicalExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ConditionalLogicalExpression.java
index 100b93ee5b4..9a59f4a5f59 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ConditionalLogicalExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ConditionalLogicalExpression.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

 

 public class ConditionalLogicalExpression extends BinaryExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ConditionalTestExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ConditionalTestExpression.java
index 22e450aa0c6..94b57edeee4 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ConditionalTestExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ConditionalTestExpression.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

 

 public class ConditionalTestExpression extends Expression {

 	

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/EqualityExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/EqualityExpression.java
index 580b05c8aac..e65f8d60e9e 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/EqualityExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/EqualityExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class EqualityExpression extends BinaryExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/Expression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/Expression.java
index 3bd6c4cd785..6ae55657bc4 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/Expression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/Expression.java
@@ -1,11 +1,11 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

 

 public class Expression extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ExtentOrExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ExtentOrExpression.java
index 58e11dfddf2..15244295e88 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ExtentOrExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ExtentOrExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class ExtentOrExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/FeatureInvocationExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/FeatureInvocationExpression.java
index 5da7801e6dd..ffe3af6c37d 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/FeatureInvocationExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/FeatureInvocationExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class FeatureInvocationExpression extends InvocationExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/FeatureLeftHandSide.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/FeatureLeftHandSide.java
index a7f2e9c4533..a2b7fa07292 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/FeatureLeftHandSide.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/FeatureLeftHandSide.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class FeatureLeftHandSide extends LeftHandSide {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/FeatureReference.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/FeatureReference.java
index 840167f5912..7d9e70898a0 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/FeatureReference.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/FeatureReference.java
@@ -1,7 +1,7 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

 

 public class FeatureReference extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ForAllOrExistsOrOneExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ForAllOrExistsOrOneExpression.java
index cd4fd852ebb..1730d379283 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ForAllOrExistsOrOneExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ForAllOrExistsOrOneExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class ForAllOrExistsOrOneExpression extends SequenceExpansionExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/IncrementOrDecrementExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/IncrementOrDecrementExpression.java
index edebf6a1a2a..fc073bd8457 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/IncrementOrDecrementExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/IncrementOrDecrementExpression.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

 

 public class IncrementOrDecrementExpression extends Expression {

 	

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/InstanceCreationExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/InstanceCreationExpression.java
index 85871b14ac5..51c3e2281a7 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/InstanceCreationExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/InstanceCreationExpression.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

 

 public class InstanceCreationExpression extends InvocationExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/InvocationExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/InvocationExpression.java
index 1d837e8f9f1..1cda6fe29ea 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/InvocationExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/InvocationExpression.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

 

 public abstract class InvocationExpression extends Expression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/IsUniqueExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/IsUniqueExpression.java
index 010bc860880..1481a46ccb9 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/IsUniqueExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/IsUniqueExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class IsUniqueExpression extends SequenceExpansionExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/IsolationExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/IsolationExpression.java
index d4c101614ec..7557874ccfb 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/IsolationExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/IsolationExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class IsolationExpression extends UnaryExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/LeftHandSide.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/LeftHandSide.java
index 48096bfab2b..96ce82d29c5 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/LeftHandSide.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/LeftHandSide.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

 

 public class LeftHandSide extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/LinkOperationExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/LinkOperationExpression.java
index 9581d71bc4c..3bc706d1461 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/LinkOperationExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/LinkOperationExpression.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

 

 public class LinkOperationExpression extends InvocationExpression {

 	

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/LiteralExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/LiteralExpression.java
index 2e6c91775c6..c73cdb0e8f6 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/LiteralExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/LiteralExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public abstract class LiteralExpression extends Expression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/LogicalExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/LogicalExpression.java
index 17b8f7af0a7..e71f8637e64 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/LogicalExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/LogicalExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class LogicalExpression extends BinaryExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NameBinding.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NameBinding.java
index d141f1fd766..da19afcfc6b 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NameBinding.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NameBinding.java
@@ -1,6 +1,6 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

 

 public class NameBinding extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NameExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NameExpression.java
index 1bf8fc84c51..3ca25f04881 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NameExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NameExpression.java
@@ -1,7 +1,7 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

 

 public class NameExpression extends Expression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NameLeftHandSide.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NameLeftHandSide.java
index 57acdaed30a..a3398e55c2b 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NameLeftHandSide.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NameLeftHandSide.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class NameLeftHandSide extends LeftHandSide {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NamedExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NamedExpression.java
index 13beb86f02a..9f588dca6bd 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NamedExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NamedExpression.java
@@ -1,6 +1,6 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

 

 public class NamedExpression extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NamedTemplateBinding.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NamedTemplateBinding.java
index aa341350a8c..8e230b4c975 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NamedTemplateBinding.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NamedTemplateBinding.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.List;

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NamedTuple.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NamedTuple.java
index 8228cd75bd7..96bcc8681c2 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NamedTuple.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NamedTuple.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.List;

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NaturalLiteralExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NaturalLiteralExpression.java
index d5feab60555..1ac533ca923 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NaturalLiteralExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NaturalLiteralExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class NaturalLiteralExpression extends LiteralExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NumericUnaryExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NumericUnaryExpression.java
index e8d7d5d8212..d7b760dc3f8 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/NumericUnaryExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/NumericUnaryExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class NumericUnaryExpression extends UnaryExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/OutputNamedExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/OutputNamedExpression.java
index 212c44c79d1..8af4ea39b74 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/OutputNamedExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/OutputNamedExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class OutputNamedExpression extends NamedExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/PositionalTemplateBinding.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/PositionalTemplateBinding.java
index 7e3578f8a4c..c563b07b56a 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/PositionalTemplateBinding.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/PositionalTemplateBinding.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class PositionalTemplateBinding extends TemplateBinding {

 	

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/PositionalTuple.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/PositionalTuple.java
index 7f8e5bff0cd..327559dc197 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/PositionalTuple.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/PositionalTuple.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.List;

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/PropertyAccessExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/PropertyAccessExpression.java
index 5900ea68a59..354cc4a9a19 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/PropertyAccessExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/PropertyAccessExpression.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

 

 public class PropertyAccessExpression extends Expression {

 	

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/QualifiedName.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/QualifiedName.java
index 9c1d082b44a..42187c595be 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/QualifiedName.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/QualifiedName.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

 

 public class QualifiedName extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/RelationalExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/RelationalExpression.java
index 9b8b6b7eefe..681f5168f40 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/RelationalExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/RelationalExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class RelationalExpression extends BinaryExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SelectOrRejectExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SelectOrRejectExpression.java
index a5d97ff873b..6d1d57ce602 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SelectOrRejectExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SelectOrRejectExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class SelectOrRejectExpression extends SequenceExpansionExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceAccessExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceAccessExpression.java
index 4b2952dc6c2..a0a857ed50b 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceAccessExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceAccessExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class SequenceAccessExpression extends Expression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceConstructionExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceConstructionExpression.java
index 36d84c7317c..8512769a83a 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceConstructionExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceConstructionExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class SequenceConstructionExpression extends Expression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceElements.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceElements.java
index 8988ff0f43a..81499600070 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceElements.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceElements.java
@@ -1,6 +1,6 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

 

 public abstract class SequenceElements extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceExpansionExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceExpansionExpression.java
index ae1a653f14e..983b9260b8c 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceExpansionExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceExpansionExpression.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

 

 public abstract class SequenceExpansionExpression extends Expression {

 	

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceExpressionList.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceExpressionList.java
index 9532f7ac336..37f594b8ef4 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceExpressionList.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceExpressionList.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.List;

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceOperationExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceOperationExpression.java
index ecf06684668..520f3d4608d 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceOperationExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceOperationExpression.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

 

 public class SequenceOperationExpression extends InvocationExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceRange.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceRange.java
index ffcfa277489..113bb381d3f 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceRange.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceRange.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class SequenceRange extends SequenceElements {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceReductionExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceReductionExpression.java
index 9ecb5a7a475..cb87e83bff5 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SequenceReductionExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SequenceReductionExpression.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

 

 public class SequenceReductionExpression extends Expression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ShiftExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ShiftExpression.java
index d842f546dea..3d445da2e02 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ShiftExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ShiftExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class ShiftExpression extends BinaryExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/StringLiteralExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/StringLiteralExpression.java
index 73f2cac34aa..3fde03a3d96 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/StringLiteralExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/StringLiteralExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class StringLiteralExpression extends LiteralExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SuperInvocationExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SuperInvocationExpression.java
index d3dcc3cf744..7a5ddd4addb 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/SuperInvocationExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/SuperInvocationExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class SuperInvocationExpression extends InvocationExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/TemplateBinding.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/TemplateBinding.java
new file mode 100644
index 00000000000..e89c7566a78
--- /dev/null
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/TemplateBinding.java
@@ -0,0 +1,7 @@
+package org.eclipse.papyrus.uml.alf.syntax.expressions;

+

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

+

+public abstract class TemplateBinding extends SyntaxElement {

+	

+}

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/TemplateParameterSubstitution.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/TemplateParameterSubstitution.java
index bb0861e28cf..636d8a05153 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/TemplateParameterSubstitution.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/TemplateParameterSubstitution.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import org.eclipse.internal.xtend.expression.ast.SyntaxElement;

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ThisExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ThisExpression.java
index c7eced154ae..522f35caaca 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/ThisExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/ThisExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class ThisExpression extends Expression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/Tuple.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/Tuple.java
index 3ac95c8d06a..f90d6592328 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/Tuple.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/Tuple.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

 

 public abstract class Tuple extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/UnaryExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/UnaryExpression.java
index 53e22260150..96127e5be9c 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/UnaryExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/UnaryExpression.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

 

 public class UnaryExpression extends Expression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/UnboundedLiteralExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/UnboundedLiteralExpression.java
index decb332e203..23762f0e51e 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/expressions/UnboundedLiteralExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/expressions/UnboundedLiteralExpression.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.expressions;

+package org.eclipse.papyrus.uml.alf.syntax.expressions;

 

 public class UnboundedLiteralExpression extends LiteralExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/AcceptBlock.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/AcceptBlock.java
index 3a3acfc6b90..30c23209a95 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/AcceptBlock.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/AcceptBlock.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

 

 public class AcceptBlock extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/AcceptStatement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/AcceptStatement.java
index b93fdbd69d9..f8c61dfa92f 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/AcceptStatement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/AcceptStatement.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

 

 public class AcceptStatement extends Statement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/Annotation.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/Annotation.java
index 455b116839c..0f07533df6b 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/Annotation.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/Annotation.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

 

 public class Annotation extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/Block.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/Block.java
index e19a31f72b6..5093432f592 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/Block.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/Block.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

 

 public class Block extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/BlockStatement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/BlockStatement.java
index c7ad3221848..0587bd9b084 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/BlockStatement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/BlockStatement.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 public class BlockStatement extends Statement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/BreakStatement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/BreakStatement.java
index e60973c4262..897d393cc92 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/BreakStatement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/BreakStatement.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 public class BreakStatement extends Statement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/ClassifyStatement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/ClassifyStatement.java
index 43bfec48620..7bdf10f5d4b 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/ClassifyStatement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/ClassifyStatement.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

-import org.eclipse.papyrus.alf.syntax.expressions.Expression;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.Expression;

 

 public class ClassifyStatement extends Statement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/ConcurrentClauses.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/ConcurrentClauses.java
index 50c436a71d9..5572e325ebe 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/ConcurrentClauses.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/ConcurrentClauses.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

 

 public class ConcurrentClauses extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/DoStatement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/DoStatement.java
index 825ab1ab245..bcc62dd4f3b 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/DoStatement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/DoStatement.java
@@ -1,6 +1,6 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

-import org.eclipse.papyrus.alf.syntax.expressions.Expression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.Expression;

 

 public class DoStatement extends Statement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/EmptyStatement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/EmptyStatement.java
index d3a599ec31f..5708cbf768b 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/EmptyStatement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/EmptyStatement.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 public class EmptyStatement extends Statement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/ExpressionStatement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/ExpressionStatement.java
index 49a5f05cead..d39b8f9c1f6 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/ExpressionStatement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/ExpressionStatement.java
@@ -1,6 +1,6 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

-import org.eclipse.papyrus.alf.syntax.expressions.Expression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.Expression;

 

 public class ExpressionStatement extends Statement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/ForStatement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/ForStatement.java
index c1e4d91cecd..2c807d92a02 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/ForStatement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/ForStatement.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 import java.util.List;

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/IfStatement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/IfStatement.java
index e47e27665ab..5a26f816640 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/IfStatement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/IfStatement.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 import java.util.List;

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/InLineStatement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/InLineStatement.java
index 69318c8c8e4..5ed0df0ae95 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/InLineStatement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/InLineStatement.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 public class InLineStatement extends Statement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/LocalNameDeclarationStatement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/LocalNameDeclarationStatement.java
index 928eaad5f0b..98a96d2083d 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/LocalNameDeclarationStatement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/LocalNameDeclarationStatement.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

-import org.eclipse.papyrus.alf.syntax.expressions.Expression;

-import org.eclipse.papyrus.alf.syntax.expressions.QualifiedName;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.Expression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.QualifiedName;

 

 public class LocalNameDeclarationStatement extends Statement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/LoopVariableDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/LoopVariableDefinition.java
index a68fa33b710..9c5d4a3c7fe 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/LoopVariableDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/LoopVariableDefinition.java
@@ -1,12 +1,12 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

-import org.eclipse.papyrus.alf.syntax.expressions.Expression;

-import org.eclipse.papyrus.alf.syntax.expressions.QualifiedName;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.Expression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.QualifiedName;

 

 public class LoopVariableDefinition extends SyntaxElement{

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/NonFinalClause.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/NonFinalClause.java
index dce8a9c2ee9..99e41481318 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/NonFinalClause.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/NonFinalClause.java
@@ -1,11 +1,11 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

-import org.eclipse.papyrus.alf.syntax.expressions.Expression;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.Expression;

 

 public class NonFinalClause extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/QualifiedNameList.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/QualifiedNameList.java
new file mode 100644
index 00000000000..f4584ad1738
--- /dev/null
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/QualifiedNameList.java
@@ -0,0 +1,13 @@
+package org.eclipse.papyrus.uml.alf.syntax.statements;

+

+import java.util.List;

+

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.QualifiedName;

+

+public class QualifiedNameList extends SyntaxElement {

+

+	// Synthesized Properties

+	public List<QualifiedName> name ;

+	

+}

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/ReturnStatement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/ReturnStatement.java
index 479ab9b12cc..a14f81ce63a 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/ReturnStatement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/ReturnStatement.java
@@ -1,7 +1,7 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

-import org.eclipse.papyrus.alf.syntax.expressions.Expression;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.Expression;

 

 public class ReturnStatement extends Statement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/Statement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/Statement.java
index 3ef3309ec85..8246612d852 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/Statement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/Statement.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

-import org.eclipse.papyrus.alf.syntax.common.DocumentedElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.DocumentedElement;

 

 public abstract class Statement extends DocumentedElement{

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/SwitchClause.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/SwitchClause.java
index 29a4e0dd451..61f477870e5 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/SwitchClause.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/SwitchClause.java
@@ -1,11 +1,11 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.AssignedSource;

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

-import org.eclipse.papyrus.alf.syntax.expressions.Expression;

+import org.eclipse.papyrus.uml.alf.syntax.common.AssignedSource;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.Expression;

 

 public class SwitchClause extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/SwitchStatement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/SwitchStatement.java
index f0c465e99f8..6a99050afd4 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/SwitchStatement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/SwitchStatement.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.expressions.Expression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.Expression;

 

 public class SwitchStatement extends Statement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/WhileStatement.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/WhileStatement.java
index f89aec0bc56..01be74c4bae 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/statements/WhileStatement.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/statements/WhileStatement.java
@@ -1,6 +1,6 @@
-package org.eclipse.papyrus.alf.syntax.statements;

+package org.eclipse.papyrus.uml.alf.syntax.statements;

 

-import org.eclipse.papyrus.alf.syntax.expressions.Expression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.Expression;

 

 public class WhileStatement extends Statement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ActiveClassDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ActiveClassDefinition.java
index fd4b695e40d..b18ba19c97f 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ActiveClassDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ActiveClassDefinition.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 public class ActiveClassDefinition extends ClassDefinition {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ActivityDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ActivityDefinition.java
index e40522bc2e0..f1eac7bcee8 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ActivityDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ActivityDefinition.java
@@ -1,6 +1,6 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

-import org.eclipse.papyrus.alf.syntax.statements.Block;

+import org.eclipse.papyrus.uml.alf.syntax.statements.Block;

 

 public class ActivityDefinition extends ClassifierDefinition {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/AssociationDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/AssociationDefinition.java
index 0acab8500c0..2ab58f742f3 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/AssociationDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/AssociationDefinition.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 public class AssociationDefinition extends ClassifierDefinition {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ClassDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ClassDefinition.java
index ad04db319fe..cc241d3c3fa 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ClassDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ClassDefinition.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 public class ClassDefinition extends ClassifierDefinition {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ClassifierDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ClassifierDefinition.java
index 5e15a172615..4fa869fd4db 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ClassifierDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ClassifierDefinition.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

-import org.eclipse.papyrus.alf.syntax.expressions.QualifiedName;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.QualifiedName;

 

 public class ClassifierDefinition extends NamespaceDefinition {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ClassifierTemplateParameter.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ClassifierTemplateParameter.java
index b1f6e954d77..160225a17d3 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ClassifierTemplateParameter.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ClassifierTemplateParameter.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 public class ClassifierTemplateParameter extends ClassifierDefinition {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/DataTypeDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/DataTypeDefinition.java
index 019b67f9b68..28daba2b545 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/DataTypeDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/DataTypeDefinition.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 public class DataTypeDefinition extends ClassifierDefinition {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ElementImportReference.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ElementImportReference.java
index f9070b941d7..5f5addd3289 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ElementImportReference.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ElementImportReference.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 public class ElementImportReference extends ImportReference {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/EnumerationDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/EnumerationDefinition.java
index fbb9a509ac4..f710a295a91 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/EnumerationDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/EnumerationDefinition.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 public class EnumerationDefinition extends ClassifierDefinition {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/EnumerationLiteralName.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/EnumerationLiteralName.java
index ad08cdc367a..e5896c7451f 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/EnumerationLiteralName.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/EnumerationLiteralName.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 public class EnumerationLiteralName {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/FormalParameter.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/FormalParameter.java
index c982a0d9e8e..fc094fa1a95 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/FormalParameter.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/FormalParameter.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 public class FormalParameter extends TypedElementDefinition {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ImportReference.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ImportReference.java
index c1a0b5284ed..eab932e6974 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ImportReference.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ImportReference.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

-import org.eclipse.papyrus.alf.syntax.expressions.QualifiedName;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.QualifiedName;

 

 public class ImportReference extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ImportedMember.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ImportedMember.java
index 7bc24fbcce5..5813e842849 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ImportedMember.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ImportedMember.java
@@ -1,6 +1,6 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

 

 public class ImportedMember extends Member {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/Member.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/Member.java
index 9fb7a18d8b1..2bbd57d4b73 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/Member.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/Member.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.DocumentedElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.DocumentedElement;

 

 public class Member extends DocumentedElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/NamespaceDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/NamespaceDefinition.java
index fe0d57172b9..86f9ef69454 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/NamespaceDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/NamespaceDefinition.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 import java.util.List;

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/OperationDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/OperationDefinition.java
index 54410d82719..1ad40f67223 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/OperationDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/OperationDefinition.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

-import org.eclipse.papyrus.alf.syntax.statements.Block;

-import org.eclipse.papyrus.alf.syntax.statements.QualifiedNameList;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.statements.Block;

+import org.eclipse.papyrus.uml.alf.syntax.statements.QualifiedNameList;

 

 public class OperationDefinition extends NamespaceDefinition{

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/PackageDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/PackageDefinition.java
index 8ad47c8eb0a..1748540ad64 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/PackageDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/PackageDefinition.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 import java.util.List;

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/PackageImportReference.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/PackageImportReference.java
index f92cdfc0e63..5fd97fdb270 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/PackageImportReference.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/PackageImportReference.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 public class PackageImportReference extends ImportReference {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/PropertyDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/PropertyDefinition.java
index 375106a0286..df288f2732b 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/PropertyDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/PropertyDefinition.java
@@ -1,6 +1,6 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

-import org.eclipse.papyrus.alf.syntax.expressions.Expression;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.Expression;

 

 public class PropertyDefinition extends TypedElementDefinition {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ReceptionDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ReceptionDefinition.java
index 3b08f836e89..d64c02a56a8 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/ReceptionDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/ReceptionDefinition.java
@@ -1,7 +1,7 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

-import org.eclipse.papyrus.alf.syntax.expressions.QualifiedName;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.QualifiedName;

 

 public class ReceptionDefinition extends Member {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/SignalDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/SignalDefinition.java
index ce708a4137e..06cb7a10797 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/SignalDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/SignalDefinition.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 public class SignalDefinition extends ClassifierDefinition {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/SignalReceptionDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/SignalReceptionDefinition.java
index 1a1a8751111..05a5682fc17 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/SignalReceptionDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/SignalReceptionDefinition.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 public class SignalReceptionDefinition extends SignalDefinition {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/StereotypeAnnotation.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/StereotypeAnnotation.java
index 5150764af4d..bd1801f47f2 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/StereotypeAnnotation.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/StereotypeAnnotation.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

-import org.eclipse.papyrus.alf.syntax.expressions.QualifiedName;

-import org.eclipse.papyrus.alf.syntax.statements.QualifiedNameList;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.QualifiedName;

+import org.eclipse.papyrus.uml.alf.syntax.statements.QualifiedNameList;

 import org.eclipse.uml2.uml.Stereotype;

 

 public class StereotypeAnnotation extends SyntaxElement {

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/TaggedValue.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/TaggedValue.java
index d47a941f2ef..53a7708e683 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/TaggedValue.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/TaggedValue.java
@@ -1,6 +1,6 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

 

 public class TaggedValue extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/TaggedValueList.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/TaggedValueList.java
index de246ae84bc..c6af377336d 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/TaggedValueList.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/TaggedValueList.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.SyntaxElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.SyntaxElement;

 

 public class TaggedValueList extends SyntaxElement {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/TypedElementDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/TypedElementDefinition.java
index 6a85d0eaa75..65722dc76f4 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/TypedElementDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/TypedElementDefinition.java
@@ -1,7 +1,7 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

-import org.eclipse.papyrus.alf.syntax.expressions.QualifiedName;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.QualifiedName;

 

 public class TypedElementDefinition extends Member {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/UnitDefinition.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/UnitDefinition.java
index 0f2be6f59d2..385d64bf692 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/syntax/units/UnitDefinition.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/syntax/units/UnitDefinition.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.alf.syntax.units;

+package org.eclipse.papyrus.uml.alf.syntax.units;

 

 import java.util.List;

 

-import org.eclipse.papyrus.alf.syntax.common.DocumentedElement;

-import org.eclipse.papyrus.alf.syntax.common.ElementReference;

-import org.eclipse.papyrus.alf.syntax.expressions.QualifiedName;

+import org.eclipse.papyrus.uml.alf.syntax.common.DocumentedElement;

+import org.eclipse.papyrus.uml.alf.syntax.common.ElementReference;

+import org.eclipse.papyrus.uml.alf.syntax.expressions.QualifiedName;

 import org.eclipse.uml2.uml.Profile;

 

 public class UnitDefinition extends DocumentedElement {

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/AlfJavaValidator.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/AlfJavaValidator.java
index 66d9fcaaa54..b30b4dc0c32 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/AlfJavaValidator.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/AlfJavaValidator.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.alf.validation;
+package org.eclipse.papyrus.uml.alf.validation;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,52 +33,53 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.papyrus.alf.alf.AcceptBlock;
-import org.eclipse.papyrus.alf.alf.AcceptStatement;
-import org.eclipse.papyrus.alf.alf.AlfPackage;
-import org.eclipse.papyrus.alf.alf.AssignmentOperator;
-import org.eclipse.papyrus.alf.alf.ClassificationClause;
-import org.eclipse.papyrus.alf.alf.ClassificationFromClause;
-import org.eclipse.papyrus.alf.alf.ClassificationToClause;
-import org.eclipse.papyrus.alf.alf.ClassifyStatement;
-import org.eclipse.papyrus.alf.alf.ConcurrentClauses;
-import org.eclipse.papyrus.alf.alf.DoStatement;
-import org.eclipse.papyrus.alf.alf.DocumentedStatement;
-import org.eclipse.papyrus.alf.alf.ForStatement;
-import org.eclipse.papyrus.alf.alf.IfStatement;
-import org.eclipse.papyrus.alf.alf.InstanceCreationInvocationStatement;
-import org.eclipse.papyrus.alf.alf.InvocationOrAssignementOrDeclarationStatement;
-import org.eclipse.papyrus.alf.alf.LocalNameDeclarationStatement;
-import org.eclipse.papyrus.alf.alf.LoopVariableDefinition;
-import org.eclipse.papyrus.alf.alf.NameExpression;
-import org.eclipse.papyrus.alf.alf.NonEmptyStatementSequence;
-import org.eclipse.papyrus.alf.alf.NonFinalClause;
-import org.eclipse.papyrus.alf.alf.PropertyCallExpression;
-import org.eclipse.papyrus.alf.alf.QualifiedNameList;
-import org.eclipse.papyrus.alf.alf.QualifiedNameWithBinding;
-import org.eclipse.papyrus.alf.alf.ReturnStatement;
-import org.eclipse.papyrus.alf.alf.StatementSequence;
-import org.eclipse.papyrus.alf.alf.SuffixExpression;
-import org.eclipse.papyrus.alf.alf.SuperInvocationStatement;
-import org.eclipse.papyrus.alf.alf.ThisInvocationStatement;
-import org.eclipse.papyrus.alf.alf.TupleElement;
-import org.eclipse.papyrus.alf.alf.UnqualifiedName;
-import org.eclipse.papyrus.alf.alf.VariableDeclarationCompletion;
-import org.eclipse.papyrus.alf.alf.WhileStatement;
-import org.eclipse.papyrus.alf.scoping.AlfPartialScope;
-import org.eclipse.papyrus.alf.scoping.AlfScopeProvider;
-import org.eclipse.papyrus.alf.validation.typing.AssignmentPolicy;
-import org.eclipse.papyrus.alf.validation.typing.ErrorTypeFacade;
-import org.eclipse.papyrus.alf.validation.typing.MultiplicityFacade;
-import org.eclipse.papyrus.alf.validation.typing.MultiplicityFacadeFactory;
-import org.eclipse.papyrus.alf.validation.typing.SignatureFacade;
-import org.eclipse.papyrus.alf.validation.typing.TypeExpression;
-import org.eclipse.papyrus.alf.validation.typing.TypeExpressionFactory;
-import org.eclipse.papyrus.alf.validation.typing.TypeFacade;
-import org.eclipse.papyrus.alf.validation.typing.TypeFacadeFactory;
-import org.eclipse.papyrus.alf.validation.typing.TypeUtils;
-import org.eclipse.papyrus.alf.validation.typing.VoidFacade;
 import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.uml.alf.alf.AcceptBlock;
+import org.eclipse.papyrus.uml.alf.alf.AcceptStatement;
+import org.eclipse.papyrus.uml.alf.alf.AlfPackage;
+import org.eclipse.papyrus.uml.alf.alf.AssignmentOperator;
+import org.eclipse.papyrus.uml.alf.alf.ClassificationClause;
+import org.eclipse.papyrus.uml.alf.alf.ClassificationFromClause;
+import org.eclipse.papyrus.uml.alf.alf.ClassificationToClause;
+import org.eclipse.papyrus.uml.alf.alf.ClassifyStatement;
+import org.eclipse.papyrus.uml.alf.alf.ConcurrentClauses;
+import org.eclipse.papyrus.uml.alf.alf.DoStatement;
+import org.eclipse.papyrus.uml.alf.alf.DocumentedStatement;
+import org.eclipse.papyrus.uml.alf.alf.ForStatement;
+import org.eclipse.papyrus.uml.alf.alf.IfStatement;
+import org.eclipse.papyrus.uml.alf.alf.InstanceCreationInvocationStatement;
+import org.eclipse.papyrus.uml.alf.alf.InvocationOrAssignementOrDeclarationStatement;
+import org.eclipse.papyrus.uml.alf.alf.LocalNameDeclarationStatement;
+import org.eclipse.papyrus.uml.alf.alf.LoopVariableDefinition;
+import org.eclipse.papyrus.uml.alf.alf.NameExpression;
+import org.eclipse.papyrus.uml.alf.alf.NonEmptyStatementSequence;
+import org.eclipse.papyrus.uml.alf.alf.NonFinalClause;
+import org.eclipse.papyrus.uml.alf.alf.PropertyCallExpression;
+import org.eclipse.papyrus.uml.alf.alf.QualifiedNameList;
+import org.eclipse.papyrus.uml.alf.alf.QualifiedNameWithBinding;
+import org.eclipse.papyrus.uml.alf.alf.ReturnStatement;
+import org.eclipse.papyrus.uml.alf.alf.StatementSequence;
+import org.eclipse.papyrus.uml.alf.alf.SuffixExpression;
+import org.eclipse.papyrus.uml.alf.alf.SuperInvocationStatement;
+import org.eclipse.papyrus.uml.alf.alf.ThisInvocationStatement;
+import org.eclipse.papyrus.uml.alf.alf.TupleElement;
+import org.eclipse.papyrus.uml.alf.alf.UnqualifiedName;
+import org.eclipse.papyrus.uml.alf.alf.VariableDeclarationCompletion;
+import org.eclipse.papyrus.uml.alf.alf.WhileStatement;
+import org.eclipse.papyrus.uml.alf.scoping.AlfPartialScope;
+import org.eclipse.papyrus.uml.alf.scoping.AlfScopeProvider;
+import org.eclipse.papyrus.uml.alf.validation.AbstractAlfJavaValidator;
+import org.eclipse.papyrus.uml.alf.validation.typing.AssignmentPolicy;
+import org.eclipse.papyrus.uml.alf.validation.typing.ErrorTypeFacade;
+import org.eclipse.papyrus.uml.alf.validation.typing.MultiplicityFacade;
+import org.eclipse.papyrus.uml.alf.validation.typing.MultiplicityFacadeFactory;
+import org.eclipse.papyrus.uml.alf.validation.typing.SignatureFacade;
+import org.eclipse.papyrus.uml.alf.validation.typing.TypeExpression;
+import org.eclipse.papyrus.uml.alf.validation.typing.TypeExpressionFactory;
+import org.eclipse.papyrus.uml.alf.validation.typing.TypeFacade;
+import org.eclipse.papyrus.uml.alf.validation.typing.TypeFacadeFactory;
+import org.eclipse.papyrus.uml.alf.validation.typing.TypeUtils;
+import org.eclipse.papyrus.uml.alf.validation.typing.VoidFacade;
 import org.eclipse.papyrus.uml.extensionpoints.library.RegisteredLibrary;
 import org.eclipse.papyrus.uml.extensionpoints.utils.Util;
 import org.eclipse.swt.widgets.Shell;
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/NamingUtils.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/NamingUtils.java
index f273545ce48..2eb639a5539 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/NamingUtils.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/NamingUtils.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.validation;

+package org.eclipse.papyrus.uml.alf.validation;

 

 public class NamingUtils {

 	

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/PredefinedBehaviorsAndTypesUtils.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/PredefinedBehaviorsAndTypesUtils.java
index 33482dd32d9..0ccc5a5001d 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/PredefinedBehaviorsAndTypesUtils.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/PredefinedBehaviorsAndTypesUtils.java
@@ -11,19 +11,19 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation;

+package org.eclipse.papyrus.uml.alf.validation;

 

 import java.util.ArrayList;

 import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

 

-import org.eclipse.papyrus.alf.validation.typing.SignatureFacade;

-import org.eclipse.papyrus.alf.validation.typing.SignatureFacadeFactory;

-import org.eclipse.papyrus.alf.validation.typing.TypeExpressionFactory;

-import org.eclipse.papyrus.alf.validation.typing.TypeFacade;

-import org.eclipse.papyrus.alf.validation.typing.TypeFacadeFactory;

-import org.eclipse.papyrus.alf.validation.typing.TypeUtils;

+import org.eclipse.papyrus.uml.alf.validation.typing.SignatureFacade;

+import org.eclipse.papyrus.uml.alf.validation.typing.SignatureFacadeFactory;

+import org.eclipse.papyrus.uml.alf.validation.typing.TypeExpressionFactory;

+import org.eclipse.papyrus.uml.alf.validation.typing.TypeFacade;

+import org.eclipse.papyrus.uml.alf.validation.typing.TypeFacadeFactory;

+import org.eclipse.papyrus.uml.alf.validation.typing.TypeUtils;

 import org.eclipse.uml2.uml.Behavior;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.ElementImport;

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/AssignmentPolicy.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/AssignmentPolicy.java
index 0f950835c5a..380b5d1145c 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/AssignmentPolicy.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/AssignmentPolicy.java
@@ -11,14 +11,14 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.alf.alf.AcceptClause;

-import org.eclipse.papyrus.alf.alf.AcceptStatement;

-import org.eclipse.papyrus.alf.alf.InvocationOrAssignementOrDeclarationStatement;

-import org.eclipse.papyrus.alf.alf.LocalNameDeclarationStatement;

-import org.eclipse.papyrus.alf.alf.LoopVariableDefinition;

+import org.eclipse.papyrus.uml.alf.alf.AcceptClause;

+import org.eclipse.papyrus.uml.alf.alf.AcceptStatement;

+import org.eclipse.papyrus.uml.alf.alf.InvocationOrAssignementOrDeclarationStatement;

+import org.eclipse.papyrus.uml.alf.alf.LocalNameDeclarationStatement;

+import org.eclipse.papyrus.uml.alf.alf.LoopVariableDefinition;

 import org.eclipse.uml2.uml.Property;

 

 public class AssignmentPolicy {

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/DefaultConstructorFacade.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/DefaultConstructorFacade.java
index 965ce551f6d..f7536e0dff1 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/DefaultConstructorFacade.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/DefaultConstructorFacade.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.DataType;

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/DefaultDestructorFacade.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/DefaultDestructorFacade.java
index b9be485e640..9836c0c6154 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/DefaultDestructorFacade.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/DefaultDestructorFacade.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 public class DefaultDestructorFacade extends SignatureFacade {

 	

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/ErrorTypeFacade.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/ErrorTypeFacade.java
index 2ae720aea18..46c52b79995 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/ErrorTypeFacade.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/ErrorTypeFacade.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/MultiplicityFacade.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/MultiplicityFacade.java
index 4ab7b6363c4..ec2e15d6af9 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/MultiplicityFacade.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/MultiplicityFacade.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 public class MultiplicityFacade {

 	private int lowerBound = 0;

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/MultiplicityFacadeFactory.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/MultiplicityFacadeFactory.java
index d300085f056..4e54d96677f 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/MultiplicityFacadeFactory.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/MultiplicityFacadeFactory.java
@@ -11,11 +11,11 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.alf.alf.LocalNameDeclarationStatement;

-import org.eclipse.papyrus.alf.alf.LoopVariableDefinition;

+import org.eclipse.papyrus.uml.alf.alf.LocalNameDeclarationStatement;

+import org.eclipse.papyrus.uml.alf.alf.LoopVariableDefinition;

 import org.eclipse.uml2.uml.MultiplicityElement;

 

 public class MultiplicityFacadeFactory {

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/OperationFacade.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/OperationFacade.java
index 7ad3c700a33..5f24dfc194c 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/OperationFacade.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/OperationFacade.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 public class OperationFacade {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/PropertyFacade.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/PropertyFacade.java
index bb152c23f22..0d2f45e5114 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/PropertyFacade.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/PropertyFacade.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 public class PropertyFacade {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/SignatureFacade.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/SignatureFacade.java
index 7df4c008993..39cb468431b 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/SignatureFacade.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/SignatureFacade.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 import java.util.ArrayList;

 import java.util.HashMap;

@@ -19,8 +19,8 @@ import java.util.List;
 import java.util.Map;

 

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.alf.alf.InstanceCreationTupleElement;

-import org.eclipse.papyrus.alf.alf.QualifiedNameWithBinding;

+import org.eclipse.papyrus.uml.alf.alf.InstanceCreationTupleElement;

+import org.eclipse.papyrus.uml.alf.alf.QualifiedNameWithBinding;

 import org.eclipse.uml2.uml.Activity;

 import org.eclipse.uml2.uml.Behavior;

 import org.eclipse.uml2.uml.Classifier;

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/SignatureFacadeFactory.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/SignatureFacadeFactory.java
index 1065abea3d9..911c6b4a56a 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/SignatureFacadeFactory.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/SignatureFacadeFactory.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 import java.util.ArrayList;

 import java.util.HashMap;

@@ -19,11 +19,11 @@ import java.util.List;
 import java.util.Map;

 

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.alf.alf.InstanceCreationExpression;

-import org.eclipse.papyrus.alf.alf.InstanceCreationTupleElement;

-import org.eclipse.papyrus.alf.alf.QualifiedNameWithBinding;

-import org.eclipse.papyrus.alf.alf.TupleElement;

-import org.eclipse.papyrus.alf.scoping.AlfScopeProvider;

+import org.eclipse.papyrus.uml.alf.alf.InstanceCreationExpression;

+import org.eclipse.papyrus.uml.alf.alf.InstanceCreationTupleElement;

+import org.eclipse.papyrus.uml.alf.alf.QualifiedNameWithBinding;

+import org.eclipse.papyrus.uml.alf.alf.TupleElement;

+import org.eclipse.papyrus.uml.alf.scoping.AlfScopeProvider;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.DataType;

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/TypeExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/TypeExpression.java
index 281fab4fd91..2902253cb5a 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/TypeExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/TypeExpression.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 public class TypeExpression {

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/TypeExpressionFactory.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/TypeExpressionFactory.java
index d004049eab2..27e873ea0dd 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/TypeExpressionFactory.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/TypeExpressionFactory.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 import org.eclipse.emf.ecore.EObject;

 

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/TypeFacade.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/TypeFacade.java
index cbcb5f5b3b8..5d773360b25 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/TypeFacade.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/TypeFacade.java
@@ -11,19 +11,19 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 import java.util.List;

 import java.util.Map;

 

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.alf.alf.AcceptClause;

-import org.eclipse.papyrus.alf.alf.AcceptStatement;

-import org.eclipse.papyrus.alf.alf.Expression;

-import org.eclipse.papyrus.alf.alf.SequenceExpansionExpression;

-import org.eclipse.papyrus.alf.alf.SuffixExpression;

-import org.eclipse.papyrus.alf.alf.TemplateBinding;

-import org.eclipse.papyrus.alf.validation.AlfJavaValidator;

+import org.eclipse.papyrus.uml.alf.alf.AcceptClause;

+import org.eclipse.papyrus.uml.alf.alf.AcceptStatement;

+import org.eclipse.papyrus.uml.alf.alf.Expression;

+import org.eclipse.papyrus.uml.alf.alf.SequenceExpansionExpression;

+import org.eclipse.papyrus.uml.alf.alf.SuffixExpression;

+import org.eclipse.papyrus.uml.alf.alf.TemplateBinding;

+import org.eclipse.papyrus.uml.alf.validation.AlfJavaValidator;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.ElementImport;

 import org.eclipse.uml2.uml.NamedElement;

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/TypeFacadeFactory.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/TypeFacadeFactory.java
index 21636e1f449..d321ddc5965 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/TypeFacadeFactory.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/TypeFacadeFactory.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 import java.util.ArrayList;

 import java.util.HashMap;

@@ -21,21 +21,21 @@ import java.util.Map;
 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.alf.alf.AcceptClause;

-import org.eclipse.papyrus.alf.alf.AcceptStatement;

-import org.eclipse.papyrus.alf.alf.AlfPackage;

-import org.eclipse.papyrus.alf.alf.ClassificationExpression;

-import org.eclipse.papyrus.alf.alf.Expression;

-import org.eclipse.papyrus.alf.alf.InvocationOrAssignementOrDeclarationStatement;

-import org.eclipse.papyrus.alf.alf.LocalNameDeclarationStatement;

-import org.eclipse.papyrus.alf.alf.LoopVariableDefinition;

-import org.eclipse.papyrus.alf.alf.NameExpression;

-import org.eclipse.papyrus.alf.alf.NamedTemplateBinding;

-import org.eclipse.papyrus.alf.alf.QualifiedNameWithBinding;

-import org.eclipse.papyrus.alf.alf.SequenceExpansionExpression;

-import org.eclipse.papyrus.alf.alf.SuperInvocationExpression;

-import org.eclipse.papyrus.alf.alf.UnqualifiedName;

-import org.eclipse.papyrus.alf.scoping.AlfScopeProvider;

+import org.eclipse.papyrus.uml.alf.alf.AcceptClause;

+import org.eclipse.papyrus.uml.alf.alf.AcceptStatement;

+import org.eclipse.papyrus.uml.alf.alf.AlfPackage;

+import org.eclipse.papyrus.uml.alf.alf.ClassificationExpression;

+import org.eclipse.papyrus.uml.alf.alf.Expression;

+import org.eclipse.papyrus.uml.alf.alf.InvocationOrAssignementOrDeclarationStatement;

+import org.eclipse.papyrus.uml.alf.alf.LocalNameDeclarationStatement;

+import org.eclipse.papyrus.uml.alf.alf.LoopVariableDefinition;

+import org.eclipse.papyrus.uml.alf.alf.NameExpression;

+import org.eclipse.papyrus.uml.alf.alf.NamedTemplateBinding;

+import org.eclipse.papyrus.uml.alf.alf.QualifiedNameWithBinding;

+import org.eclipse.papyrus.uml.alf.alf.SequenceExpansionExpression;

+import org.eclipse.papyrus.uml.alf.alf.SuperInvocationExpression;

+import org.eclipse.papyrus.uml.alf.alf.UnqualifiedName;

+import org.eclipse.papyrus.uml.alf.scoping.AlfScopeProvider;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.ElementImport;

 import org.eclipse.uml2.uml.NamedElement;

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/TypeInferenceException.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/TypeInferenceException.java
index ead36e1263d..bebb280b9a3 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/TypeInferenceException.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/TypeInferenceException.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/TypeUtils.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/TypeUtils.java
index 12aa77933ad..c96eebe017a 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/TypeUtils.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/TypeUtils.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 import java.util.ArrayList;

 import java.util.HashMap;

@@ -21,57 +21,57 @@ import java.util.Map;
 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.alf.alf.AdditiveExpression;

-import org.eclipse.papyrus.alf.alf.AlfPackage;

-import org.eclipse.papyrus.alf.alf.AndExpression;

-import org.eclipse.papyrus.alf.alf.BOOLEAN_LITERAL;

-import org.eclipse.papyrus.alf.alf.ClassExtentExpression;

-import org.eclipse.papyrus.alf.alf.ClassificationExpression;

-import org.eclipse.papyrus.alf.alf.CollectOrIterateOperation;

-import org.eclipse.papyrus.alf.alf.ConditionalAndExpression;

-import org.eclipse.papyrus.alf.alf.ConditionalOrExpression;

-import org.eclipse.papyrus.alf.alf.ConditionalTestExpression;

-import org.eclipse.papyrus.alf.alf.EqualityExpression;

-import org.eclipse.papyrus.alf.alf.ExclusiveOrExpression;

-import org.eclipse.papyrus.alf.alf.Expression;

-import org.eclipse.papyrus.alf.alf.ForAllOrExistsOrOneOperation;

-import org.eclipse.papyrus.alf.alf.INTEGER_LITERAL;

-import org.eclipse.papyrus.alf.alf.InclusiveOrExpression;

-import org.eclipse.papyrus.alf.alf.InstanceCreationExpression;

-import org.eclipse.papyrus.alf.alf.IsUniqueOperation;

-import org.eclipse.papyrus.alf.alf.LITERAL;

-import org.eclipse.papyrus.alf.alf.LinkOperationExpression;

-import org.eclipse.papyrus.alf.alf.MultiplicativeExpression;

-import org.eclipse.papyrus.alf.alf.NameExpression;

-import org.eclipse.papyrus.alf.alf.NonLiteralValueSpecification;

-import org.eclipse.papyrus.alf.alf.NullExpression;

-import org.eclipse.papyrus.alf.alf.OperationCallExpression;

-import org.eclipse.papyrus.alf.alf.Tuple;

-//import org.eclipse.papyrus.alf.alf.OperationCallExpressionWithoutDot;

-import org.eclipse.papyrus.alf.alf.ParenthesizedExpression;

-import org.eclipse.papyrus.alf.alf.PrimaryExpression;

-import org.eclipse.papyrus.alf.alf.PropertyCallExpression;

-import org.eclipse.papyrus.alf.alf.RelationalExpression;

-import org.eclipse.papyrus.alf.alf.STRING_LITERAL;

-import org.eclipse.papyrus.alf.alf.SelectOrRejectOperation;

-import org.eclipse.papyrus.alf.alf.SequenceConstructionExpression;

-import org.eclipse.papyrus.alf.alf.SequenceConstructionOrAccessCompletion;

-import org.eclipse.papyrus.alf.alf.SequenceElement;

-import org.eclipse.papyrus.alf.alf.SequenceExpansionExpression;

-import org.eclipse.papyrus.alf.alf.SequenceOperationExpression;

-import org.eclipse.papyrus.alf.alf.SequenceReductionExpression;

-import org.eclipse.papyrus.alf.alf.ShiftExpression;

-import org.eclipse.papyrus.alf.alf.SuffixExpression;

-import org.eclipse.papyrus.alf.alf.SuperInvocationExpression;

-import org.eclipse.papyrus.alf.alf.ThisExpression;

-import org.eclipse.papyrus.alf.alf.TupleElement;

-import org.eclipse.papyrus.alf.alf.UNLIMITED_LITERAL;

-import org.eclipse.papyrus.alf.alf.UnaryExpression;

-import org.eclipse.papyrus.alf.alf.UnqualifiedName;

-import org.eclipse.papyrus.alf.alf.ValueSpecification;

-import org.eclipse.papyrus.alf.scoping.AlfScopeProvider;

-import org.eclipse.papyrus.alf.validation.AlfJavaValidator;

-import org.eclipse.papyrus.alf.validation.PredefinedBehaviorsAndTypesUtils;

+//import org.eclipse.papyrus.uml.alf.alf.OperationCallExpressionWithoutDot;

+import org.eclipse.papyrus.uml.alf.alf.AdditiveExpression;

+import org.eclipse.papyrus.uml.alf.alf.AlfPackage;

+import org.eclipse.papyrus.uml.alf.alf.AndExpression;

+import org.eclipse.papyrus.uml.alf.alf.BOOLEAN_LITERAL;

+import org.eclipse.papyrus.uml.alf.alf.ClassExtentExpression;

+import org.eclipse.papyrus.uml.alf.alf.ClassificationExpression;

+import org.eclipse.papyrus.uml.alf.alf.CollectOrIterateOperation;

+import org.eclipse.papyrus.uml.alf.alf.ConditionalAndExpression;

+import org.eclipse.papyrus.uml.alf.alf.ConditionalOrExpression;

+import org.eclipse.papyrus.uml.alf.alf.ConditionalTestExpression;

+import org.eclipse.papyrus.uml.alf.alf.EqualityExpression;

+import org.eclipse.papyrus.uml.alf.alf.ExclusiveOrExpression;

+import org.eclipse.papyrus.uml.alf.alf.Expression;

+import org.eclipse.papyrus.uml.alf.alf.ForAllOrExistsOrOneOperation;

+import org.eclipse.papyrus.uml.alf.alf.INTEGER_LITERAL;

+import org.eclipse.papyrus.uml.alf.alf.InclusiveOrExpression;

+import org.eclipse.papyrus.uml.alf.alf.InstanceCreationExpression;

+import org.eclipse.papyrus.uml.alf.alf.IsUniqueOperation;

+import org.eclipse.papyrus.uml.alf.alf.LITERAL;

+import org.eclipse.papyrus.uml.alf.alf.LinkOperationExpression;

+import org.eclipse.papyrus.uml.alf.alf.MultiplicativeExpression;

+import org.eclipse.papyrus.uml.alf.alf.NameExpression;

+import org.eclipse.papyrus.uml.alf.alf.NonLiteralValueSpecification;

+import org.eclipse.papyrus.uml.alf.alf.NullExpression;

+import org.eclipse.papyrus.uml.alf.alf.OperationCallExpression;

+import org.eclipse.papyrus.uml.alf.alf.ParenthesizedExpression;

+import org.eclipse.papyrus.uml.alf.alf.PrimaryExpression;

+import org.eclipse.papyrus.uml.alf.alf.PropertyCallExpression;

+import org.eclipse.papyrus.uml.alf.alf.RelationalExpression;

+import org.eclipse.papyrus.uml.alf.alf.STRING_LITERAL;

+import org.eclipse.papyrus.uml.alf.alf.SelectOrRejectOperation;

+import org.eclipse.papyrus.uml.alf.alf.SequenceConstructionExpression;

+import org.eclipse.papyrus.uml.alf.alf.SequenceConstructionOrAccessCompletion;

+import org.eclipse.papyrus.uml.alf.alf.SequenceElement;

+import org.eclipse.papyrus.uml.alf.alf.SequenceExpansionExpression;

+import org.eclipse.papyrus.uml.alf.alf.SequenceOperationExpression;

+import org.eclipse.papyrus.uml.alf.alf.SequenceReductionExpression;

+import org.eclipse.papyrus.uml.alf.alf.ShiftExpression;

+import org.eclipse.papyrus.uml.alf.alf.SuffixExpression;

+import org.eclipse.papyrus.uml.alf.alf.SuperInvocationExpression;

+import org.eclipse.papyrus.uml.alf.alf.ThisExpression;

+import org.eclipse.papyrus.uml.alf.alf.Tuple;

+import org.eclipse.papyrus.uml.alf.alf.TupleElement;

+import org.eclipse.papyrus.uml.alf.alf.UNLIMITED_LITERAL;

+import org.eclipse.papyrus.uml.alf.alf.UnaryExpression;

+import org.eclipse.papyrus.uml.alf.alf.UnqualifiedName;

+import org.eclipse.papyrus.uml.alf.alf.ValueSpecification;

+import org.eclipse.papyrus.uml.alf.scoping.AlfScopeProvider;

+import org.eclipse.papyrus.uml.alf.validation.AlfJavaValidator;

+import org.eclipse.papyrus.uml.alf.validation.PredefinedBehaviorsAndTypesUtils;

 import org.eclipse.uml2.common.util.UML2Util;

 import org.eclipse.uml2.uml.Behavior;

 import org.eclipse.uml2.uml.Classifier;

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/VoidFacade.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/VoidFacade.java
index c3e5613a44a..035c0e82842 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/alf/validation/typing/VoidFacade.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/validation/typing/VoidFacade.java
@@ -11,7 +11,7 @@
  *  CEA LIST - Initial API and implementation

  *

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

-package org.eclipse.papyrus.alf.validation.typing;

+package org.eclipse.papyrus.uml.alf.validation.typing;

 

 

 public class VoidFacade extends TypeFacade {