472 files changed, 1077 insertions, 1005 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/Environment.xmi b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/Environment.xmi
index d04217c67f1..d3e3228c806 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/Environment.xmi
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/Environment.xmi
@@ -10,5 +10,6 @@
   <propertyEditorTypes label="ExpressionEditor" widgetClass="ExpressionEditor" namespace="//@namespaces.0" multiplicity="-1"/>
   <propertyEditorTypes label="Profile Application Editor" widgetClass="ProfileApplicationPropertyEditor" namespace="//@namespaces.0" type="Reference" multiplicity="-1"/>
   <propertyEditorTypes label="StereotypeDisplayEditor" widgetClass="StereotypeDisplay" namespace="//@namespaces.0" type="Reference"/>
+  <propertyEditorTypes label="Stereotype Application Editor" widgetClass="StereotypeApplication" namespace="//@namespaces.0" type="Reference" multiplicity="-1"/>
   <namespaces prefix="clr-namespace" name="uml" value="org.eclipse.papyrus.properties.uml.widgets"/>
 </environment:Environment>
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/UML.ctx b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/UML.ctx
index cad4cf4e3db..032863cc659 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/UML.ctx
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/UML.ctx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts" name="UML">
-  <tabs label="UML" id="basicTab" category="org.eclipse.papyrus" image="">
+  <tabs label="UML" id="uml" category="org.eclipse.papyrus" image="">
     <sections name="SinglePackage" sectionFile="ui/SinglePackage.xwt">
       <widget href="ui/SinglePackage.xwt#/"/>
     </sections>
@@ -1398,2780 +1398,2780 @@
   </tabs>
   <views name="SinglePackageProfile" sections="//@tabs.1/@sections.0" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePackage" overrideable="false">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Package"/>
     </constraints>
   </views>
   <views name="SingleElement" sections="//@tabs.1/@sections.1">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleElement" overrideable="false">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Element"/>
     </constraints>
   </views>
   <views name="MultipleElement" sections="//@tabs.0/@sections.461" elementMultiplicity="-1">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleElement">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Element"/>
     </constraints>
   </views>
   <views name="SinglePackage" sections="//@tabs.0/@sections.0" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePackage">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Package"/>
     </constraints>
   </views>
   <views name="MultiplePackage" sections="//@tabs.0/@sections.1" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePackage">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Package"/>
     </constraints>
   </views>
   <views name="SinglePackageableElement" sections="//@tabs.0/@sections.2" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePackageableElement">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="PackageableElement"/>
     </constraints>
   </views>
   <views name="MultiplePackageableElement" sections="//@tabs.0/@sections.3" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePackageableElement">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="PackageableElement"/>
     </constraints>
   </views>
   <views name="SingleNamedElement" sections="//@tabs.0/@sections.4" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleNamedElement">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="NamedElement"/>
     </constraints>
   </views>
   <views name="MultipleNamedElement" sections="//@tabs.0/@sections.5" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleNamedElement">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="NamedElement"/>
     </constraints>
   </views>
   <views name="SingleNamespace" sections="//@tabs.0/@sections.6" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleNamespace">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Namespace"/>
     </constraints>
   </views>
   <views name="MultipleNamespace" sections="//@tabs.0/@sections.7" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleNamespace">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Namespace"/>
     </constraints>
   </views>
   <views name="SingleElementImport" sections="//@tabs.0/@sections.8" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleElementImport">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ElementImport"/>
     </constraints>
   </views>
   <views name="MultipleElementImport" sections="//@tabs.0/@sections.9" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleElementImport">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ElementImport"/>
     </constraints>
   </views>
   <views name="SinglePackageImport" sections="//@tabs.0/@sections.10" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePackageImport">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="PackageImport"/>
     </constraints>
   </views>
   <views name="MultiplePackageImport" sections="//@tabs.0/@sections.11" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePackageImport">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="PackageImport"/>
     </constraints>
   </views>
   <views name="SingleConstraint" sections="//@tabs.0/@sections.12" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConstraint">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Constraint"/>
     </constraints>
   </views>
   <views name="MultipleConstraint" sections="//@tabs.0/@sections.13" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConstraint">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Constraint"/>
     </constraints>
   </views>
   <views name="SingleValueSpecification" sections="//@tabs.0/@sections.14" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleValueSpecification" overriddenConstraints="//@views.1/@constraints.0">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ValueSpecification"/>
     </constraints>
   </views>
   <views name="MultipleValueSpecification" sections="//@tabs.0/@sections.15" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleValueSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ValueSpecification"/>
     </constraints>
   </views>
   <views name="SingleTypedElement" sections="//@tabs.0/@sections.16" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTypedElement">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TypedElement"/>
     </constraints>
   </views>
   <views name="MultipleTypedElement" sections="//@tabs.0/@sections.17" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTypedElement">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TypedElement"/>
     </constraints>
   </views>
   <views name="SingleType" sections="//@tabs.0/@sections.18" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleType">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Type"/>
     </constraints>
   </views>
   <views name="MultipleType" sections="//@tabs.0/@sections.19" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleType">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Type"/>
     </constraints>
   </views>
   <views name="SingleAssociation" sections="//@tabs.0/@sections.20" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAssociation">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Association"/>
     </constraints>
   </views>
   <views name="MultipleAssociation" sections="//@tabs.0/@sections.21" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAssociation">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Association"/>
     </constraints>
   </views>
   <views name="MemberEnd" sections="//@tabs.0/@sections.459"/>
   <views name="SingleClassifier" sections="//@tabs.0/@sections.22" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleClassifier">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Classifier"/>
     </constraints>
   </views>
   <views name="MultipleClassifier" sections="//@tabs.0/@sections.23" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleClassifier">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Classifier"/>
     </constraints>
   </views>
   <views name="SingleRedefinableElement" sections="//@tabs.0/@sections.24" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRedefinableElement">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RedefinableElement"/>
     </constraints>
   </views>
   <views name="MultipleRedefinableElement" sections="//@tabs.0/@sections.25" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRedefinableElement">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RedefinableElement"/>
     </constraints>
   </views>
   <views name="SingleTemplateParameter" sections="//@tabs.0/@sections.26" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTemplateParameter">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TemplateParameter"/>
     </constraints>
   </views>
   <views name="SingleGeneralization" sections="//@tabs.0/@sections.27" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleGeneralization">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Generalization"/>
     </constraints>
   </views>
   <views name="MultipleGeneralization" sections="//@tabs.0/@sections.28" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleGeneralization">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Generalization"/>
     </constraints>
   </views>
   <views name="SingleGeneralizationSet" sections="//@tabs.0/@sections.29" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleGeneralizationSet">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="GeneralizationSet"/>
     </constraints>
   </views>
   <views name="MultipleGeneralizationSet" sections="//@tabs.0/@sections.30" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleGeneralizationSet">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="GeneralizationSet"/>
     </constraints>
   </views>
   <views name="SingleFeature" sections="//@tabs.0/@sections.31" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFeature">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Feature"/>
     </constraints>
   </views>
   <views name="MultipleFeature" sections="//@tabs.0/@sections.32" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFeature">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Feature"/>
     </constraints>
   </views>
   <views name="SingleSubstitution" sections="//@tabs.0/@sections.33" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSubstitution">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Substitution"/>
     </constraints>
   </views>
   <views name="MultipleSubstitution" sections="//@tabs.0/@sections.34" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSubstitution">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Substitution"/>
     </constraints>
   </views>
   <views name="SingleRealization" sections="//@tabs.0/@sections.35" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRealization">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Realization"/>
     </constraints>
   </views>
   <views name="MultipleRealization" sections="//@tabs.0/@sections.36" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRealization">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Realization"/>
     </constraints>
   </views>
   <views name="SingleAbstraction" sections="//@tabs.0/@sections.37" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAbstraction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Abstraction"/>
     </constraints>
   </views>
   <views name="MultipleAbstraction" sections="//@tabs.0/@sections.38" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAbstraction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Abstraction"/>
     </constraints>
   </views>
   <views name="SingleOpaqueExpression" sections="//@tabs.0/@sections.39" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleOpaqueExpression">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="OpaqueExpression"/>
     </constraints>
   </views>
   <views name="MultipleOpaqueExpression" sections="//@tabs.0/@sections.40" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleOpaqueExpression">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="OpaqueExpression"/>
     </constraints>
   </views>
   <views name="SingleParameter" sections="//@tabs.0/@sections.41" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleParameter">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Parameter"/>
     </constraints>
   </views>
   <views name="MultipleParameter" sections="//@tabs.0/@sections.42" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleParameter">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Parameter"/>
     </constraints>
   </views>
   <views name="SingleMultiplicityElement" sections="//@tabs.0/@sections.43" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleMultiplicityElement">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MultiplicityElement"/>
     </constraints>
   </views>
   <views name="MultipleMultiplicityElement" sections="//@tabs.0/@sections.44" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleMultiplicityElement">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MultiplicityElement"/>
     </constraints>
   </views>
   <views name="SingleConnectableElement" sections="//@tabs.0/@sections.45" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConnectableElement">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConnectableElement"/>
     </constraints>
   </views>
   <views name="MultipleConnectableElement" sections="//@tabs.0/@sections.46" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConnectableElement">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConnectableElement"/>
     </constraints>
   </views>
   <views name="SingleConnectorEnd" sections="//@tabs.0/@sections.47" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConnectorEnd">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConnectorEnd"/>
     </constraints>
   </views>
   <views name="MultipleConnectorEnd" sections="//@tabs.0/@sections.48" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConnectorEnd">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConnectorEnd"/>
     </constraints>
   </views>
   <views name="SingleProperty" sections="//@tabs.0/@sections.49" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleProperty">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Property"/>
     </constraints>
   </views>
   <views name="MultipleProperty" sections="//@tabs.0/@sections.50" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleProperty">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Property"/>
     </constraints>
   </views>
   <views name="SingleDeploymentTarget" sections="//@tabs.0/@sections.51" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDeploymentTarget">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DeploymentTarget"/>
     </constraints>
   </views>
   <views name="MultipleDeploymentTarget" sections="//@tabs.0/@sections.52" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDeploymentTarget">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DeploymentTarget"/>
     </constraints>
   </views>
   <views name="SingleDeployment" sections="//@tabs.0/@sections.53" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDeployment">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Deployment"/>
     </constraints>
   </views>
   <views name="MultipleDeployment" sections="//@tabs.0/@sections.54" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDeployment">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Deployment"/>
     </constraints>
   </views>
   <views name="SingleDeployedArtifact" sections="//@tabs.0/@sections.55" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDeployedArtifact">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DeployedArtifact"/>
     </constraints>
   </views>
   <views name="MultipleDeployedArtifact" sections="//@tabs.0/@sections.56" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDeployedArtifact">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DeployedArtifact"/>
     </constraints>
   </views>
   <views name="SingleDeploymentSpecification" sections="//@tabs.0/@sections.57" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDeploymentSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DeploymentSpecification"/>
     </constraints>
   </views>
   <views name="MultipleDeploymentSpecification" sections="//@tabs.0/@sections.58" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDeploymentSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DeploymentSpecification"/>
     </constraints>
   </views>
   <views name="SingleArtifact" sections="//@tabs.0/@sections.59" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleArtifact">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Artifact"/>
     </constraints>
   </views>
   <views name="MultipleArtifact" sections="//@tabs.0/@sections.60" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleArtifact">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Artifact"/>
     </constraints>
   </views>
   <views name="SingleManifestation" sections="//@tabs.0/@sections.61" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleManifestation">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Manifestation"/>
     </constraints>
   </views>
   <views name="MultipleManifestation" sections="//@tabs.0/@sections.62" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleManifestation">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Manifestation"/>
     </constraints>
   </views>
   <views name="SingleOperation" sections="//@tabs.0/@sections.63" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleOperation">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Operation"/>
     </constraints>
   </views>
   <views name="MultipleOperation" sections="//@tabs.0/@sections.64" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleOperation">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Operation"/>
     </constraints>
   </views>
   <views name="SingleBehavioralFeature" sections="//@tabs.0/@sections.65" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBehavioralFeature">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="BehavioralFeature"/>
     </constraints>
   </views>
   <views name="MultipleBehavioralFeature" sections="//@tabs.0/@sections.66" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBehavioralFeature">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="BehavioralFeature"/>
     </constraints>
   </views>
   <views name="SingleBehavior" sections="//@tabs.0/@sections.67" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBehavior">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Behavior"/>
     </constraints>
   </views>
   <views name="MultipleBehavior" sections="//@tabs.0/@sections.68" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBehavior">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Behavior"/>
     </constraints>
   </views>
   <views name="SingleClass" sections="//@tabs.0/@sections.69" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleClass">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Class"/>
     </constraints>
   </views>
   <views name="MultipleClass" sections="//@tabs.0/@sections.70" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleClass">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Class"/>
     </constraints>
   </views>
   <views name="SingleBehavioredClassifier" sections="//@tabs.0/@sections.71" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBehavioredClassifier">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="BehavioredClassifier"/>
     </constraints>
   </views>
   <views name="MultipleBehavioredClassifier" sections="//@tabs.0/@sections.72" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBehavioredClassifier">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="BehavioredClassifier"/>
     </constraints>
   </views>
   <views name="SingleInterfaceRealization" sections="//@tabs.0/@sections.73" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInterfaceRealization">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InterfaceRealization"/>
     </constraints>
   </views>
   <views name="MultipleInterfaceRealization" sections="//@tabs.0/@sections.74" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInterfaceRealization">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InterfaceRealization"/>
     </constraints>
   </views>
   <views name="SingleInterface" sections="//@tabs.0/@sections.75" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInterface">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Interface"/>
     </constraints>
   </views>
   <views name="MultipleInterface" sections="//@tabs.0/@sections.76" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInterface">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Interface"/>
     </constraints>
   </views>
   <views name="SingleReception" sections="//@tabs.0/@sections.77" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReception">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Reception"/>
     </constraints>
   </views>
   <views name="MultipleReception" sections="//@tabs.0/@sections.78" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReception">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Reception"/>
     </constraints>
   </views>
   <views name="SingleSignal" sections="//@tabs.0/@sections.79" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSignal">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Signal"/>
     </constraints>
   </views>
   <views name="MultipleSignal" sections="//@tabs.0/@sections.80" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSignal">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Signal"/>
     </constraints>
   </views>
   <views name="SingleProtocolStateMachine" sections="//@tabs.0/@sections.81" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleProtocolStateMachine">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ProtocolStateMachine"/>
     </constraints>
   </views>
   <views name="MultipleProtocolStateMachine" sections="//@tabs.0/@sections.82" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleProtocolStateMachine">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ProtocolStateMachine"/>
     </constraints>
   </views>
   <views name="SingleStateMachine" sections="//@tabs.0/@sections.83" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStateMachine">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StateMachine"/>
     </constraints>
   </views>
   <views name="MultipleStateMachine" sections="//@tabs.0/@sections.84" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStateMachine">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StateMachine"/>
     </constraints>
   </views>
   <views name="SingleRegion" sections="//@tabs.0/@sections.85" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRegion">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Region"/>
     </constraints>
   </views>
   <views name="MultipleRegion" sections="//@tabs.0/@sections.86" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRegion">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Region"/>
     </constraints>
   </views>
   <views name="SingleVertex" sections="//@tabs.0/@sections.87" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleVertex">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Vertex"/>
     </constraints>
   </views>
   <views name="MultipleVertex" sections="//@tabs.0/@sections.88" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleVertex">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Vertex"/>
     </constraints>
   </views>
   <views name="SingleTransition" sections="//@tabs.0/@sections.89" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTransition">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Transition"/>
     </constraints>
   </views>
   <views name="MultipleTransition" sections="//@tabs.0/@sections.90" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTransition">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Transition"/>
     </constraints>
   </views>
   <views name="SingleTrigger" sections="//@tabs.0/@sections.91" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTrigger">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Trigger"/>
     </constraints>
   </views>
   <views name="MultipleTrigger" sections="//@tabs.0/@sections.92" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTrigger">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Trigger"/>
     </constraints>
   </views>
   <views name="SingleEvent" sections="//@tabs.0/@sections.93" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Event"/>
     </constraints>
   </views>
   <views name="MultipleEvent" sections="//@tabs.0/@sections.94" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Event"/>
     </constraints>
   </views>
   <views name="SinglePort" sections="//@tabs.0/@sections.95" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePort">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Port"/>
     </constraints>
   </views>
   <views name="MultiplePort" sections="//@tabs.0/@sections.96" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePort">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Port"/>
     </constraints>
   </views>
   <views name="SingleState" sections="//@tabs.0/@sections.97" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleState">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="State"/>
     </constraints>
   </views>
   <views name="MultipleState" sections="//@tabs.0/@sections.98" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleState">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="State"/>
     </constraints>
   </views>
   <views name="SingleConnectionPointReference" sections="//@tabs.0/@sections.99" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConnectionPointReference">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConnectionPointReference"/>
     </constraints>
   </views>
   <views name="MultipleConnectionPointReference" sections="//@tabs.0/@sections.100" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConnectionPointReference">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConnectionPointReference"/>
     </constraints>
   </views>
   <views name="SinglePseudostate" sections="//@tabs.0/@sections.101" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePseudostate">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Pseudostate"/>
     </constraints>
   </views>
   <views name="MultiplePseudostate" sections="//@tabs.0/@sections.102" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePseudostate">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Pseudostate"/>
     </constraints>
   </views>
   <views name="SingleEncapsulatedClassifier" sections="//@tabs.0/@sections.103" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleEncapsulatedClassifier">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="EncapsulatedClassifier"/>
     </constraints>
   </views>
   <views name="MultipleEncapsulatedClassifier" sections="//@tabs.0/@sections.104" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleEncapsulatedClassifier">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="EncapsulatedClassifier"/>
     </constraints>
   </views>
   <views name="SingleStructuredClassifier" sections="//@tabs.0/@sections.105" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStructuredClassifier">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StructuredClassifier"/>
     </constraints>
   </views>
   <views name="MultipleStructuredClassifier" sections="//@tabs.0/@sections.106" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStructuredClassifier">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StructuredClassifier"/>
     </constraints>
   </views>
   <views name="SingleConnector" sections="//@tabs.0/@sections.107" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConnector">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Connector"/>
     </constraints>
   </views>
   <views name="MultipleConnector" sections="//@tabs.0/@sections.108" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConnector">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Connector"/>
     </constraints>
   </views>
   <views name="SingleExtension" sections="//@tabs.0/@sections.109" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExtension">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Extension"/>
     </constraints>
   </views>
   <views name="MultipleExtension" sections="//@tabs.0/@sections.110" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExtension">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Extension"/>
     </constraints>
   </views>
   <views name="SingleExtensionEnd" sections="//@tabs.0/@sections.111" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExtensionEnd">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExtensionEnd"/>
     </constraints>
   </views>
   <views name="MultipleExtensionEnd" sections="//@tabs.0/@sections.112" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExtensionEnd">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExtensionEnd"/>
     </constraints>
   </views>
   <views name="SingleStereotype" sections="//@tabs.0/@sections.113" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStereotype">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Stereotype"/>
     </constraints>
   </views>
   <views name="MultipleStereotype" sections="//@tabs.0/@sections.114" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStereotype">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Stereotype"/>
     </constraints>
   </views>
   <views name="SingleProfile" sections="//@tabs.0/@sections.115" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleProfile">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Profile"/>
     </constraints>
   </views>
   <views name="MultipleProfile" sections="//@tabs.0/@sections.116" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleProfile">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Profile"/>
     </constraints>
   </views>
   <views name="SingleModel" sections="//@tabs.0/@sections.117" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleModel">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Model"/>
     </constraints>
   </views>
   <views name="MultipleModel" sections="//@tabs.0/@sections.118" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleModel">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Model"/>
     </constraints>
   </views>
   <views name="SingleParameterSet" sections="//@tabs.0/@sections.119" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleParameterSet">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ParameterSet"/>
     </constraints>
   </views>
   <views name="MultipleParameterSet" sections="//@tabs.0/@sections.120" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleParameterSet">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ParameterSet"/>
     </constraints>
   </views>
   <views name="SingleDataType" sections="//@tabs.0/@sections.121" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDataType">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DataType"/>
     </constraints>
   </views>
   <views name="MultipleDataType" sections="//@tabs.0/@sections.122" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDataType">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DataType"/>
     </constraints>
   </views>
   <views name="SingleOperationTemplateParameter" sections="//@tabs.0/@sections.123" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleOperationTemplateParameter">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="OperationTemplateParameter"/>
     </constraints>
   </views>
   <views name="SingleStructuralFeature" sections="//@tabs.0/@sections.124" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStructuralFeature">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StructuralFeature"/>
     </constraints>
   </views>
   <views name="MultipleStructuralFeature" sections="//@tabs.0/@sections.125" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStructuralFeature">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StructuralFeature"/>
     </constraints>
   </views>
   <views name="SingleConnectableElementTemplateParameter" sections="//@tabs.0/@sections.126" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConnectableElementTemplateParameter">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConnectableElementTemplateParameter"/>
     </constraints>
   </views>
   <views name="SingleCollaborationUse" sections="//@tabs.0/@sections.127" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCollaborationUse">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CollaborationUse"/>
     </constraints>
   </views>
   <views name="MultipleCollaborationUse" sections="//@tabs.0/@sections.128" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCollaborationUse">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CollaborationUse"/>
     </constraints>
   </views>
   <views name="SingleCollaboration" sections="//@tabs.0/@sections.129" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCollaboration">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Collaboration"/>
     </constraints>
   </views>
   <views name="MultipleCollaboration" sections="//@tabs.0/@sections.130" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCollaboration">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Collaboration"/>
     </constraints>
   </views>
   <views name="SingleUseCase" sections="//@tabs.0/@sections.131" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleUseCase">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="UseCase"/>
     </constraints>
   </views>
   <views name="MultipleUseCase" sections="//@tabs.0/@sections.132" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleUseCase">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="UseCase"/>
     </constraints>
   </views>
   <views name="SingleInclude" sections="//@tabs.0/@sections.133" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInclude">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Include"/>
     </constraints>
   </views>
   <views name="MultipleInclude" sections="//@tabs.0/@sections.134" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInclude">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Include"/>
     </constraints>
   </views>
   <views name="SingleExtend" sections="//@tabs.0/@sections.135" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExtend">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Extend"/>
     </constraints>
   </views>
   <views name="MultipleExtend" sections="//@tabs.0/@sections.136" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExtend">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Extend"/>
     </constraints>
   </views>
   <views name="SingleExtensionPoint" sections="//@tabs.0/@sections.137" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExtensionPoint">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExtensionPoint"/>
     </constraints>
   </views>
   <views name="MultipleExtensionPoint" sections="//@tabs.0/@sections.138" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExtensionPoint">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExtensionPoint"/>
     </constraints>
   </views>
   <views name="SingleRedefinableTemplateSignature" sections="//@tabs.0/@sections.139" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRedefinableTemplateSignature">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RedefinableTemplateSignature"/>
     </constraints>
   </views>
   <views name="MultipleRedefinableTemplateSignature" sections="//@tabs.0/@sections.140" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRedefinableTemplateSignature">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RedefinableTemplateSignature"/>
     </constraints>
   </views>
   <views name="SingleClassifierTemplateParameter" sections="//@tabs.0/@sections.141" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleClassifierTemplateParameter">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ClassifierTemplateParameter"/>
     </constraints>
   </views>
   <views name="MultipleClassifierTemplateParameter" sections="//@tabs.0/@sections.142" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleClassifierTemplateParameter">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ClassifierTemplateParameter"/>
     </constraints>
   </views>
   <views name="SingleStringExpression" sections="//@tabs.0/@sections.143" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStringExpression">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StringExpression"/>
     </constraints>
   </views>
   <views name="MultipleStringExpression" sections="//@tabs.0/@sections.144" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStringExpression">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StringExpression"/>
     </constraints>
   </views>
   <views name="SingleExpression" sections="//@tabs.0/@sections.145" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExpression">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Expression"/>
     </constraints>
   </views>
   <views name="MultipleExpression" sections="//@tabs.0/@sections.146" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExpression">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Expression"/>
     </constraints>
   </views>
   <views name="SingleUsage" sections="//@tabs.0/@sections.147" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleUsage">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Usage"/>
     </constraints>
   </views>
   <views name="MultipleUsage" sections="//@tabs.0/@sections.148" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleUsage">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Usage"/>
     </constraints>
   </views>
   <views name="SingleProfileApplication" sections="//@tabs.0/@sections.149" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleProfileApplication">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ProfileApplication"/>
     </constraints>
   </views>
   <views name="MultipleProfileApplication" sections="//@tabs.0/@sections.150" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleProfileApplication">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ProfileApplication"/>
     </constraints>
   </views>
   <views name="SingleEnumeration" sections="//@tabs.0/@sections.151" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleEnumeration">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Enumeration"/>
     </constraints>
   </views>
   <views name="MultipleEnumeration" sections="//@tabs.0/@sections.152" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleEnumeration">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Enumeration"/>
     </constraints>
   </views>
   <views name="SingleEnumerationLiteral" sections="//@tabs.0/@sections.153" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleEnumerationLiteral">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="EnumerationLiteral"/>
     </constraints>
   </views>
   <views name="MultipleEnumerationLiteral" sections="//@tabs.0/@sections.154" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleEnumerationLiteral">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="EnumerationLiteral"/>
     </constraints>
   </views>
   <views name="SingleInstanceSpecification" sections="//@tabs.0/@sections.155" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInstanceSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InstanceSpecification"/>
     </constraints>
   </views>
   <views name="MultipleInstanceSpecification" sections="//@tabs.0/@sections.156" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInstanceSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InstanceSpecification"/>
     </constraints>
   </views>
   <views name="SingleSlot" sections="//@tabs.0/@sections.157" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSlot">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Slot"/>
     </constraints>
   </views>
   <views name="SinglePrimitiveType" sections="//@tabs.0/@sections.158" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePrimitiveType">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="PrimitiveType"/>
     </constraints>
   </views>
   <views name="MultiplePrimitiveType" sections="//@tabs.0/@sections.159" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePrimitiveType">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="PrimitiveType"/>
     </constraints>
   </views>
   <views name="SingleLiteralSpecification" sections="//@tabs.0/@sections.160" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLiteralSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LiteralSpecification"/>
     </constraints>
   </views>
   <views name="MultipleLiteralSpecification" sections="//@tabs.0/@sections.161" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLiteralSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LiteralSpecification"/>
     </constraints>
   </views>
   <views name="SingleLiteralInteger" sections="//@tabs.0/@sections.162" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLiteralInteger">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LiteralInteger"/>
     </constraints>
   </views>
   <views name="MultipleLiteralInteger" sections="//@tabs.0/@sections.163" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLiteralInteger">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LiteralInteger"/>
     </constraints>
   </views>
   <views name="SingleLiteralString" sections="//@tabs.0/@sections.164" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLiteralString">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LiteralString"/>
     </constraints>
   </views>
   <views name="MultipleLiteralString" sections="//@tabs.0/@sections.165" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLiteralString">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LiteralString"/>
     </constraints>
   </views>
   <views name="SingleLiteralBoolean" sections="//@tabs.0/@sections.166" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLiteralBoolean">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LiteralBoolean"/>
     </constraints>
   </views>
   <views name="MultipleLiteralBoolean" sections="//@tabs.0/@sections.167" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLiteralBoolean">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LiteralBoolean"/>
     </constraints>
   </views>
   <views name="SingleLiteralNull" sections="//@tabs.0/@sections.168" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLiteralNull">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LiteralNull"/>
     </constraints>
   </views>
   <views name="MultipleLiteralNull" sections="//@tabs.0/@sections.169" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLiteralNull">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LiteralNull"/>
     </constraints>
   </views>
   <views name="SingleInstanceValue" sections="//@tabs.0/@sections.170" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInstanceValue">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InstanceValue"/>
     </constraints>
   </views>
   <views name="MultipleInstanceValue" sections="//@tabs.0/@sections.171" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInstanceValue">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InstanceValue"/>
     </constraints>
   </views>
   <views name="SingleLiteralUnlimitedNatural" sections="//@tabs.0/@sections.172" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLiteralUnlimitedNatural">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LiteralUnlimitedNatural"/>
     </constraints>
   </views>
   <views name="MultipleLiteralUnlimitedNatural" sections="//@tabs.0/@sections.173" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLiteralUnlimitedNatural">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LiteralUnlimitedNatural"/>
     </constraints>
   </views>
   <views name="SingleOpaqueBehavior" sections="//@tabs.0/@sections.174" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleOpaqueBehavior">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="OpaqueBehavior"/>
     </constraints>
   </views>
   <views name="MultipleOpaqueBehavior" sections="//@tabs.0/@sections.175" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleOpaqueBehavior">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="OpaqueBehavior"/>
     </constraints>
   </views>
   <views name="SingleFunctionBehavior" sections="//@tabs.0/@sections.176" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFunctionBehavior">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="FunctionBehavior"/>
     </constraints>
   </views>
   <views name="MultipleFunctionBehavior" sections="//@tabs.0/@sections.177" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFunctionBehavior">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="FunctionBehavior"/>
     </constraints>
   </views>
   <views name="SingleOpaqueAction" sections="//@tabs.0/@sections.178" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleOpaqueAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="OpaqueAction"/>
     </constraints>
   </views>
   <views name="MultipleOpaqueAction" sections="//@tabs.0/@sections.179" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleOpaqueAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="OpaqueAction"/>
     </constraints>
   </views>
   <views name="SingleAction" sections="//@tabs.0/@sections.180" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Action"/>
     </constraints>
   </views>
   <views name="MultipleAction" sections="//@tabs.0/@sections.181" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Action"/>
     </constraints>
   </views>
   <views name="SingleExecutableNode" sections="//@tabs.0/@sections.182" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExecutableNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutableNode"/>
     </constraints>
   </views>
   <views name="MultipleExecutableNode" sections="//@tabs.0/@sections.183" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExecutableNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutableNode"/>
     </constraints>
   </views>
   <views name="SingleActivityNode" sections="//@tabs.0/@sections.184" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleActivityNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActivityNode"/>
     </constraints>
   </views>
   <views name="MultipleActivityNode" sections="//@tabs.0/@sections.185" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleActivityNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActivityNode"/>
     </constraints>
   </views>
   <views name="SingleStructuredActivityNode" sections="//@tabs.0/@sections.186" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStructuredActivityNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StructuredActivityNode"/>
     </constraints>
   </views>
   <views name="MultipleStructuredActivityNode" sections="//@tabs.0/@sections.187" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStructuredActivityNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StructuredActivityNode"/>
     </constraints>
   </views>
   <views name="SingleActivity" sections="//@tabs.0/@sections.188" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleActivity">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Activity"/>
     </constraints>
   </views>
   <views name="MultipleActivity" sections="//@tabs.0/@sections.189" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleActivity">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Activity"/>
     </constraints>
   </views>
   <views name="SingleVariable" sections="//@tabs.0/@sections.190" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleVariable">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Variable"/>
     </constraints>
   </views>
   <views name="MultipleVariable" sections="//@tabs.0/@sections.191" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleVariable">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Variable"/>
     </constraints>
   </views>
   <views name="SingleActivityEdge" sections="//@tabs.0/@sections.192" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleActivityEdge">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActivityEdge"/>
     </constraints>
   </views>
   <views name="MultipleActivityEdge" sections="//@tabs.0/@sections.193" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleActivityEdge">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActivityEdge"/>
     </constraints>
   </views>
   <views name="SingleActivityPartition" sections="//@tabs.0/@sections.194" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleActivityPartition">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActivityPartition"/>
     </constraints>
   </views>
   <views name="MultipleActivityPartition" sections="//@tabs.0/@sections.195" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleActivityPartition">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActivityPartition"/>
     </constraints>
   </views>
   <views name="SingleInterruptibleActivityRegion" sections="//@tabs.0/@sections.196" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInterruptibleActivityRegion">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InterruptibleActivityRegion"/>
     </constraints>
   </views>
   <views name="SingleExceptionHandler" sections="//@tabs.0/@sections.197" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExceptionHandler">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExceptionHandler"/>
     </constraints>
   </views>
   <views name="SingleObjectNode" sections="//@tabs.0/@sections.198" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleObjectNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ObjectNode"/>
     </constraints>
   </views>
   <views name="MultipleObjectNode" sections="//@tabs.0/@sections.199" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleObjectNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ObjectNode"/>
     </constraints>
   </views>
   <views name="SingleOutputPin" sections="//@tabs.0/@sections.200" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleOutputPin">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="OutputPin"/>
     </constraints>
   </views>
   <views name="MultipleOutputPin" sections="//@tabs.0/@sections.201" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleOutputPin">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="OutputPin"/>
     </constraints>
   </views>
   <views name="SinglePin" sections="//@tabs.0/@sections.202" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePin">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Pin"/>
     </constraints>
   </views>
   <views name="MultiplePin" sections="//@tabs.0/@sections.203" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePin">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Pin"/>
     </constraints>
   </views>
   <views name="SingleInputPin" sections="//@tabs.0/@sections.204" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInputPin">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InputPin"/>
     </constraints>
   </views>
   <views name="MultipleInputPin" sections="//@tabs.0/@sections.205" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInputPin">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InputPin"/>
     </constraints>
   </views>
   <views name="SingleCallAction" sections="//@tabs.0/@sections.206" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCallAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CallAction"/>
     </constraints>
   </views>
   <views name="MultipleCallAction" sections="//@tabs.0/@sections.207" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCallAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CallAction"/>
     </constraints>
   </views>
   <views name="SingleInvocationAction" sections="//@tabs.0/@sections.208" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInvocationAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InvocationAction"/>
     </constraints>
   </views>
   <views name="MultipleInvocationAction" sections="//@tabs.0/@sections.209" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInvocationAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InvocationAction"/>
     </constraints>
   </views>
   <views name="SingleSendSignalAction" sections="//@tabs.0/@sections.210" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSendSignalAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SendSignalAction"/>
     </constraints>
   </views>
   <views name="MultipleSendSignalAction" sections="//@tabs.0/@sections.211" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSendSignalAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SendSignalAction"/>
     </constraints>
   </views>
   <views name="SingleCallOperationAction" sections="//@tabs.0/@sections.212" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCallOperationAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CallOperationAction"/>
     </constraints>
   </views>
   <views name="MultipleCallOperationAction" sections="//@tabs.0/@sections.213" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCallOperationAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CallOperationAction"/>
     </constraints>
   </views>
   <views name="SingleCallBehaviorAction" sections="//@tabs.0/@sections.214" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCallBehaviorAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CallBehaviorAction"/>
     </constraints>
   </views>
   <views name="MultipleCallBehaviorAction" sections="//@tabs.0/@sections.215" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCallBehaviorAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CallBehaviorAction"/>
     </constraints>
   </views>
   <views name="SingleSequenceNode" sections="//@tabs.0/@sections.216" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSequenceNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SequenceNode"/>
     </constraints>
   </views>
   <views name="MultipleSequenceNode" sections="//@tabs.0/@sections.217" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSequenceNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SequenceNode"/>
     </constraints>
   </views>
   <views name="SingleControlNode" sections="//@tabs.0/@sections.218" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleControlNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ControlNode"/>
     </constraints>
   </views>
   <views name="MultipleControlNode" sections="//@tabs.0/@sections.219" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleControlNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ControlNode"/>
     </constraints>
   </views>
   <views name="SingleControlFlow" sections="//@tabs.0/@sections.220" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleControlFlow">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ControlFlow"/>
     </constraints>
   </views>
   <views name="MultipleControlFlow" sections="//@tabs.0/@sections.221" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleControlFlow">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ControlFlow"/>
     </constraints>
   </views>
   <views name="SingleInitialNode" sections="//@tabs.0/@sections.222" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInitialNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InitialNode"/>
     </constraints>
   </views>
   <views name="MultipleInitialNode" sections="//@tabs.0/@sections.223" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInitialNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InitialNode"/>
     </constraints>
   </views>
   <views name="SingleActivityParameterNode" sections="//@tabs.0/@sections.224" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleActivityParameterNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActivityParameterNode"/>
     </constraints>
   </views>
   <views name="MultipleActivityParameterNode" sections="//@tabs.0/@sections.225" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleActivityParameterNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActivityParameterNode"/>
     </constraints>
   </views>
   <views name="SingleValuePin" sections="//@tabs.0/@sections.226" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleValuePin">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ValuePin"/>
     </constraints>
   </views>
   <views name="MultipleValuePin" sections="//@tabs.0/@sections.227" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleValuePin">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ValuePin"/>
     </constraints>
   </views>
   <views name="SingleMessage" sections="//@tabs.0/@sections.228" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleMessage">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Message"/>
     </constraints>
   </views>
   <views name="MultipleMessage" sections="//@tabs.0/@sections.229" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleMessage">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Message"/>
     </constraints>
   </views>
   <views name="SingleMessageEnd" sections="//@tabs.0/@sections.230" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleMessageEnd">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MessageEnd"/>
     </constraints>
   </views>
   <views name="MultipleMessageEnd" sections="//@tabs.0/@sections.231" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleMessageEnd">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MessageEnd"/>
     </constraints>
   </views>
   <views name="SingleInteraction" sections="//@tabs.0/@sections.232" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInteraction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Interaction"/>
     </constraints>
   </views>
   <views name="MultipleInteraction" sections="//@tabs.0/@sections.233" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInteraction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Interaction"/>
     </constraints>
   </views>
   <views name="SingleInteractionFragment" sections="//@tabs.0/@sections.234" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInteractionFragment">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InteractionFragment"/>
     </constraints>
   </views>
   <views name="MultipleInteractionFragment" sections="//@tabs.0/@sections.235" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInteractionFragment">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InteractionFragment"/>
     </constraints>
   </views>
   <views name="SingleLifeline" sections="//@tabs.0/@sections.236" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLifeline">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Lifeline"/>
     </constraints>
   </views>
   <views name="MultipleLifeline" sections="//@tabs.0/@sections.237" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLifeline">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Lifeline"/>
     </constraints>
   </views>
   <views name="SinglePartDecomposition" sections="//@tabs.0/@sections.238" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePartDecomposition">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="PartDecomposition"/>
     </constraints>
   </views>
   <views name="MultiplePartDecomposition" sections="//@tabs.0/@sections.239" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePartDecomposition">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="PartDecomposition"/>
     </constraints>
   </views>
   <views name="SingleInteractionUse" sections="//@tabs.0/@sections.240" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInteractionUse">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InteractionUse"/>
     </constraints>
   </views>
   <views name="MultipleInteractionUse" sections="//@tabs.0/@sections.241" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInteractionUse">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InteractionUse"/>
     </constraints>
   </views>
   <views name="SingleGate" sections="//@tabs.0/@sections.242" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleGate">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Gate"/>
     </constraints>
   </views>
   <views name="MultipleGate" sections="//@tabs.0/@sections.243" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleGate">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Gate"/>
     </constraints>
   </views>
   <views name="SingleGeneralOrdering" sections="//@tabs.0/@sections.244" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleGeneralOrdering">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="GeneralOrdering"/>
     </constraints>
   </views>
   <views name="MultipleGeneralOrdering" sections="//@tabs.0/@sections.245" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleGeneralOrdering">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="GeneralOrdering"/>
     </constraints>
   </views>
   <views name="SingleOccurrenceSpecification" sections="//@tabs.0/@sections.246" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleOccurrenceSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="OccurrenceSpecification"/>
     </constraints>
   </views>
   <views name="MultipleOccurrenceSpecification" sections="//@tabs.0/@sections.247" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleOccurrenceSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="OccurrenceSpecification"/>
     </constraints>
   </views>
   <views name="SingleInteractionOperand" sections="//@tabs.0/@sections.248" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInteractionOperand">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InteractionOperand"/>
     </constraints>
   </views>
   <views name="MultipleInteractionOperand" sections="//@tabs.0/@sections.249" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInteractionOperand">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InteractionOperand"/>
     </constraints>
   </views>
   <views name="SingleInteractionConstraint" sections="//@tabs.0/@sections.250" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInteractionConstraint">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InteractionConstraint"/>
     </constraints>
   </views>
   <views name="MultipleInteractionConstraint" sections="//@tabs.0/@sections.251" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInteractionConstraint">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InteractionConstraint"/>
     </constraints>
   </views>
   <views name="SingleExecutionSpecification" sections="//@tabs.0/@sections.252" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExecutionSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutionSpecification"/>
     </constraints>
   </views>
   <views name="MultipleExecutionSpecification" sections="//@tabs.0/@sections.253" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExecutionSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutionSpecification"/>
     </constraints>
   </views>
   <views name="SingleStateInvariant" sections="//@tabs.0/@sections.254" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStateInvariant">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StateInvariant"/>
     </constraints>
   </views>
   <views name="MultipleStateInvariant" sections="//@tabs.0/@sections.255" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStateInvariant">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StateInvariant"/>
     </constraints>
   </views>
   <views name="SingleActionExecutionSpecification" sections="//@tabs.0/@sections.256" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleActionExecutionSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActionExecutionSpecification"/>
     </constraints>
   </views>
   <views name="MultipleActionExecutionSpecification" sections="//@tabs.0/@sections.257" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleActionExecutionSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActionExecutionSpecification"/>
     </constraints>
   </views>
   <views name="SingleBehaviorExecutionSpecification" sections="//@tabs.0/@sections.258" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBehaviorExecutionSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="BehaviorExecutionSpecification"/>
     </constraints>
   </views>
   <views name="MultipleBehaviorExecutionSpecification" sections="//@tabs.0/@sections.259" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBehaviorExecutionSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="BehaviorExecutionSpecification"/>
     </constraints>
   </views>
   <views name="SingleExecutionEvent" sections="//@tabs.0/@sections.260" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExecutionEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutionEvent"/>
     </constraints>
   </views>
   <views name="MultipleExecutionEvent" sections="//@tabs.0/@sections.261" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExecutionEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutionEvent"/>
     </constraints>
   </views>
   <views name="SingleCreationEvent" sections="//@tabs.0/@sections.262" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCreationEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreationEvent"/>
     </constraints>
   </views>
   <views name="MultipleCreationEvent" sections="//@tabs.0/@sections.263" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCreationEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreationEvent"/>
     </constraints>
   </views>
   <views name="SingleDestructionEvent" sections="//@tabs.0/@sections.264" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDestructionEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DestructionEvent"/>
     </constraints>
   </views>
   <views name="MultipleDestructionEvent" sections="//@tabs.0/@sections.265" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDestructionEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DestructionEvent"/>
     </constraints>
   </views>
   <views name="SingleSendOperationEvent" sections="//@tabs.0/@sections.266" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSendOperationEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SendOperationEvent"/>
     </constraints>
   </views>
   <views name="MultipleSendOperationEvent" sections="//@tabs.0/@sections.267" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSendOperationEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SendOperationEvent"/>
     </constraints>
   </views>
   <views name="SingleMessageEvent" sections="//@tabs.0/@sections.268" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleMessageEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MessageEvent"/>
     </constraints>
   </views>
   <views name="MultipleMessageEvent" sections="//@tabs.0/@sections.269" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleMessageEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MessageEvent"/>
     </constraints>
   </views>
   <views name="SingleSendSignalEvent" sections="//@tabs.0/@sections.270" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSendSignalEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SendSignalEvent"/>
     </constraints>
   </views>
   <views name="MultipleSendSignalEvent" sections="//@tabs.0/@sections.271" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSendSignalEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SendSignalEvent"/>
     </constraints>
   </views>
   <views name="SingleMessageOccurrenceSpecification" sections="//@tabs.0/@sections.272" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleMessageOccurrenceSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MessageOccurrenceSpecification"/>
     </constraints>
   </views>
   <views name="MultipleMessageOccurrenceSpecification" sections="//@tabs.0/@sections.273" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleMessageOccurrenceSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MessageOccurrenceSpecification"/>
     </constraints>
   </views>
   <views name="SingleExecutionOccurrenceSpecification" sections="//@tabs.0/@sections.274" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExecutionOccurrenceSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutionOccurrenceSpecification"/>
     </constraints>
   </views>
   <views name="MultipleExecutionOccurrenceSpecification" sections="//@tabs.0/@sections.275" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExecutionOccurrenceSpecification">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutionOccurrenceSpecification"/>
     </constraints>
   </views>
   <views name="SingleReceiveOperationEvent" sections="//@tabs.0/@sections.276" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReceiveOperationEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReceiveOperationEvent"/>
     </constraints>
   </views>
   <views name="MultipleReceiveOperationEvent" sections="//@tabs.0/@sections.277" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReceiveOperationEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReceiveOperationEvent"/>
     </constraints>
   </views>
   <views name="SingleReceiveSignalEvent" sections="//@tabs.0/@sections.278" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReceiveSignalEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReceiveSignalEvent"/>
     </constraints>
   </views>
   <views name="MultipleReceiveSignalEvent" sections="//@tabs.0/@sections.279" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReceiveSignalEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReceiveSignalEvent"/>
     </constraints>
   </views>
   <views name="SingleActor" sections="//@tabs.0/@sections.280" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleActor">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Actor"/>
     </constraints>
   </views>
   <views name="MultipleActor" sections="//@tabs.0/@sections.281" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleActor">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Actor"/>
     </constraints>
   </views>
   <views name="SingleCallEvent" sections="//@tabs.0/@sections.282" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCallEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CallEvent"/>
     </constraints>
   </views>
   <views name="MultipleCallEvent" sections="//@tabs.0/@sections.283" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCallEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CallEvent"/>
     </constraints>
   </views>
   <views name="SingleChangeEvent" sections="//@tabs.0/@sections.284" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleChangeEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ChangeEvent"/>
     </constraints>
   </views>
   <views name="MultipleChangeEvent" sections="//@tabs.0/@sections.285" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleChangeEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ChangeEvent"/>
     </constraints>
   </views>
   <views name="SingleSignalEvent" sections="//@tabs.0/@sections.286" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSignalEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SignalEvent"/>
     </constraints>
   </views>
   <views name="MultipleSignalEvent" sections="//@tabs.0/@sections.287" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSignalEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SignalEvent"/>
     </constraints>
   </views>
   <views name="SingleAnyReceiveEvent" sections="//@tabs.0/@sections.288" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAnyReceiveEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AnyReceiveEvent"/>
     </constraints>
   </views>
   <views name="MultipleAnyReceiveEvent" sections="//@tabs.0/@sections.289" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAnyReceiveEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AnyReceiveEvent"/>
     </constraints>
   </views>
   <views name="SingleForkNode" sections="//@tabs.0/@sections.290" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleForkNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ForkNode"/>
     </constraints>
   </views>
   <views name="MultipleForkNode" sections="//@tabs.0/@sections.291" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleForkNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ForkNode"/>
     </constraints>
   </views>
   <views name="SingleFlowFinalNode" sections="//@tabs.0/@sections.292" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFlowFinalNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="FlowFinalNode"/>
     </constraints>
   </views>
   <views name="MultipleFlowFinalNode" sections="//@tabs.0/@sections.293" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFlowFinalNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="FlowFinalNode"/>
     </constraints>
   </views>
   <views name="SingleFinalNode" sections="//@tabs.0/@sections.294" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFinalNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="FinalNode"/>
     </constraints>
   </views>
   <views name="MultipleFinalNode" sections="//@tabs.0/@sections.295" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFinalNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="FinalNode"/>
     </constraints>
   </views>
   <views name="SingleCentralBufferNode" sections="//@tabs.0/@sections.296" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCentralBufferNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CentralBufferNode"/>
     </constraints>
   </views>
   <views name="MultipleCentralBufferNode" sections="//@tabs.0/@sections.297" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCentralBufferNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CentralBufferNode"/>
     </constraints>
   </views>
   <views name="SingleMergeNode" sections="//@tabs.0/@sections.298" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleMergeNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MergeNode"/>
     </constraints>
   </views>
   <views name="MultipleMergeNode" sections="//@tabs.0/@sections.299" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleMergeNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MergeNode"/>
     </constraints>
   </views>
   <views name="SingleDecisionNode" sections="//@tabs.0/@sections.300" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDecisionNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DecisionNode"/>
     </constraints>
   </views>
   <views name="MultipleDecisionNode" sections="//@tabs.0/@sections.301" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDecisionNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DecisionNode"/>
     </constraints>
   </views>
   <views name="SingleObjectFlow" sections="//@tabs.0/@sections.302" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleObjectFlow">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ObjectFlow"/>
     </constraints>
   </views>
   <views name="MultipleObjectFlow" sections="//@tabs.0/@sections.303" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleObjectFlow">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ObjectFlow"/>
     </constraints>
   </views>
   <views name="SingleActivityFinalNode" sections="//@tabs.0/@sections.304" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleActivityFinalNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActivityFinalNode"/>
     </constraints>
   </views>
   <views name="MultipleActivityFinalNode" sections="//@tabs.0/@sections.305" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleActivityFinalNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActivityFinalNode"/>
     </constraints>
   </views>
   <views name="SingleComponentRealization" sections="//@tabs.0/@sections.306" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleComponentRealization">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ComponentRealization"/>
     </constraints>
   </views>
   <views name="MultipleComponentRealization" sections="//@tabs.0/@sections.307" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleComponentRealization">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ComponentRealization"/>
     </constraints>
   </views>
   <views name="SingleComponent" sections="//@tabs.0/@sections.308" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleComponent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Component"/>
     </constraints>
   </views>
   <views name="MultipleComponent" sections="//@tabs.0/@sections.309" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleComponent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Component"/>
     </constraints>
   </views>
   <views name="SingleNode" sections="//@tabs.0/@sections.310" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Node"/>
     </constraints>
   </views>
   <views name="MultipleNode" sections="//@tabs.0/@sections.311" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Node"/>
     </constraints>
   </views>
   <views name="SingleCommunicationPath" sections="//@tabs.0/@sections.312" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCommunicationPath">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CommunicationPath"/>
     </constraints>
   </views>
   <views name="MultipleCommunicationPath" sections="//@tabs.0/@sections.313" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCommunicationPath">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CommunicationPath"/>
     </constraints>
   </views>
   <views name="SingleDevice" sections="//@tabs.0/@sections.314" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDevice">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Device"/>
     </constraints>
   </views>
   <views name="MultipleDevice" sections="//@tabs.0/@sections.315" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDevice">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Device"/>
     </constraints>
   </views>
   <views name="SingleExecutionEnvironment" sections="//@tabs.0/@sections.316" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExecutionEnvironment">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutionEnvironment"/>
     </constraints>
   </views>
   <views name="MultipleExecutionEnvironment" sections="//@tabs.0/@sections.317" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExecutionEnvironment">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutionEnvironment"/>
     </constraints>
   </views>
   <views name="SingleCombinedFragment" sections="//@tabs.0/@sections.318" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCombinedFragment">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CombinedFragment"/>
     </constraints>
   </views>
   <views name="MultipleCombinedFragment" sections="//@tabs.0/@sections.319" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCombinedFragment">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CombinedFragment"/>
     </constraints>
   </views>
   <views name="SingleContinuation" sections="//@tabs.0/@sections.320" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleContinuation">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Continuation"/>
     </constraints>
   </views>
   <views name="MultipleContinuation" sections="//@tabs.0/@sections.321" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleContinuation">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Continuation"/>
     </constraints>
   </views>
   <views name="SingleConsiderIgnoreFragment" sections="//@tabs.0/@sections.322" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConsiderIgnoreFragment">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConsiderIgnoreFragment"/>
     </constraints>
   </views>
   <views name="MultipleConsiderIgnoreFragment" sections="//@tabs.0/@sections.323" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConsiderIgnoreFragment">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConsiderIgnoreFragment"/>
     </constraints>
   </views>
   <views name="SingleCreateObjectAction" sections="//@tabs.0/@sections.324" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCreateObjectAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreateObjectAction"/>
     </constraints>
   </views>
   <views name="MultipleCreateObjectAction" sections="//@tabs.0/@sections.325" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCreateObjectAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreateObjectAction"/>
     </constraints>
   </views>
   <views name="SingleDestroyObjectAction" sections="//@tabs.0/@sections.326" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDestroyObjectAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DestroyObjectAction"/>
     </constraints>
   </views>
   <views name="MultipleDestroyObjectAction" sections="//@tabs.0/@sections.327" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDestroyObjectAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DestroyObjectAction"/>
     </constraints>
   </views>
   <views name="SingleTestIdentityAction" sections="//@tabs.0/@sections.328" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTestIdentityAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TestIdentityAction"/>
     </constraints>
   </views>
   <views name="MultipleTestIdentityAction" sections="//@tabs.0/@sections.329" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTestIdentityAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TestIdentityAction"/>
     </constraints>
   </views>
   <views name="SingleReadSelfAction" sections="//@tabs.0/@sections.330" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadSelfAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadSelfAction"/>
     </constraints>
   </views>
   <views name="MultipleReadSelfAction" sections="//@tabs.0/@sections.331" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadSelfAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadSelfAction"/>
     </constraints>
   </views>
   <views name="SingleStructuralFeatureAction" sections="//@tabs.0/@sections.332" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStructuralFeatureAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StructuralFeatureAction"/>
     </constraints>
   </views>
   <views name="MultipleStructuralFeatureAction" sections="//@tabs.0/@sections.333" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStructuralFeatureAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StructuralFeatureAction"/>
     </constraints>
   </views>
   <views name="SingleReadStructuralFeatureAction" sections="//@tabs.0/@sections.334" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadStructuralFeatureAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadStructuralFeatureAction"/>
     </constraints>
   </views>
   <views name="MultipleReadStructuralFeatureAction" sections="//@tabs.0/@sections.335" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadStructuralFeatureAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadStructuralFeatureAction"/>
     </constraints>
   </views>
   <views name="SingleWriteStructuralFeatureAction" sections="//@tabs.0/@sections.336" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleWriteStructuralFeatureAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="WriteStructuralFeatureAction"/>
     </constraints>
   </views>
   <views name="MultipleWriteStructuralFeatureAction" sections="//@tabs.0/@sections.337" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleWriteStructuralFeatureAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="WriteStructuralFeatureAction"/>
     </constraints>
   </views>
   <views name="SingleClearStructuralFeatureAction" sections="//@tabs.0/@sections.338" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleClearStructuralFeatureAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ClearStructuralFeatureAction"/>
     </constraints>
   </views>
   <views name="MultipleClearStructuralFeatureAction" sections="//@tabs.0/@sections.339" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleClearStructuralFeatureAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ClearStructuralFeatureAction"/>
     </constraints>
   </views>
   <views name="SingleRemoveStructuralFeatureValueAction" sections="//@tabs.0/@sections.340" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRemoveStructuralFeatureValueAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RemoveStructuralFeatureValueAction"/>
     </constraints>
   </views>
   <views name="MultipleRemoveStructuralFeatureValueAction" sections="//@tabs.0/@sections.341" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRemoveStructuralFeatureValueAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RemoveStructuralFeatureValueAction"/>
     </constraints>
   </views>
   <views name="SingleAddStructuralFeatureValueAction" sections="//@tabs.0/@sections.342" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAddStructuralFeatureValueAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AddStructuralFeatureValueAction"/>
     </constraints>
   </views>
   <views name="MultipleAddStructuralFeatureValueAction" sections="//@tabs.0/@sections.343" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAddStructuralFeatureValueAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AddStructuralFeatureValueAction"/>
     </constraints>
   </views>
   <views name="SingleLinkAction" sections="//@tabs.0/@sections.344" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLinkAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LinkAction"/>
     </constraints>
   </views>
   <views name="MultipleLinkAction" sections="//@tabs.0/@sections.345" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLinkAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LinkAction"/>
     </constraints>
   </views>
   <views name="SingleLinkEndData" sections="//@tabs.0/@sections.346" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLinkEndData">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LinkEndData"/>
     </constraints>
   </views>
   <views name="SingleQualifierValue" sections="//@tabs.0/@sections.347" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleQualifierValue">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="QualifierValue"/>
     </constraints>
   </views>
   <views name="SingleReadLinkAction" sections="//@tabs.0/@sections.348" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadLinkAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadLinkAction"/>
     </constraints>
   </views>
   <views name="MultipleReadLinkAction" sections="//@tabs.0/@sections.349" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadLinkAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadLinkAction"/>
     </constraints>
   </views>
   <views name="SingleLinkEndCreationData" sections="//@tabs.0/@sections.350" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLinkEndCreationData">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LinkEndCreationData"/>
     </constraints>
   </views>
   <views name="MultipleLinkEndCreationData" sections="//@tabs.0/@sections.351" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLinkEndCreationData">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LinkEndCreationData"/>
     </constraints>
   </views>
   <views name="SingleCreateLinkAction" sections="//@tabs.0/@sections.352" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCreateLinkAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreateLinkAction"/>
     </constraints>
   </views>
   <views name="MultipleCreateLinkAction" sections="//@tabs.0/@sections.353" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCreateLinkAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreateLinkAction"/>
     </constraints>
   </views>
   <views name="SingleWriteLinkAction" sections="//@tabs.0/@sections.354" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleWriteLinkAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="WriteLinkAction"/>
     </constraints>
   </views>
   <views name="MultipleWriteLinkAction" sections="//@tabs.0/@sections.355" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleWriteLinkAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="WriteLinkAction"/>
     </constraints>
   </views>
   <views name="SingleDestroyLinkAction" sections="//@tabs.0/@sections.356" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDestroyLinkAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DestroyLinkAction"/>
     </constraints>
   </views>
   <views name="MultipleDestroyLinkAction" sections="//@tabs.0/@sections.357" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDestroyLinkAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DestroyLinkAction"/>
     </constraints>
   </views>
   <views name="SingleLinkEndDestructionData" sections="//@tabs.0/@sections.358" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLinkEndDestructionData">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LinkEndDestructionData"/>
     </constraints>
   </views>
   <views name="MultipleLinkEndDestructionData" sections="//@tabs.0/@sections.359" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLinkEndDestructionData">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LinkEndDestructionData"/>
     </constraints>
   </views>
   <views name="SingleClearAssociationAction" sections="//@tabs.0/@sections.360" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleClearAssociationAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ClearAssociationAction"/>
     </constraints>
   </views>
   <views name="MultipleClearAssociationAction" sections="//@tabs.0/@sections.361" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleClearAssociationAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ClearAssociationAction"/>
     </constraints>
   </views>
   <views name="SingleBroadcastSignalAction" sections="//@tabs.0/@sections.362" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBroadcastSignalAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="BroadcastSignalAction"/>
     </constraints>
   </views>
   <views name="MultipleBroadcastSignalAction" sections="//@tabs.0/@sections.363" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBroadcastSignalAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="BroadcastSignalAction"/>
     </constraints>
   </views>
   <views name="SingleSendObjectAction" sections="//@tabs.0/@sections.364" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSendObjectAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SendObjectAction"/>
     </constraints>
   </views>
   <views name="MultipleSendObjectAction" sections="//@tabs.0/@sections.365" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSendObjectAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SendObjectAction"/>
     </constraints>
   </views>
   <views name="SingleValueSpecificationAction" sections="//@tabs.0/@sections.366" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleValueSpecificationAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ValueSpecificationAction"/>
     </constraints>
   </views>
   <views name="MultipleValueSpecificationAction" sections="//@tabs.0/@sections.367" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleValueSpecificationAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ValueSpecificationAction"/>
     </constraints>
   </views>
   <views name="SingleTimeExpression" sections="//@tabs.0/@sections.368" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTimeExpression">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeExpression"/>
     </constraints>
   </views>
   <views name="MultipleTimeExpression" sections="//@tabs.0/@sections.369" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTimeExpression">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeExpression"/>
     </constraints>
   </views>
   <views name="SingleObservation" sections="//@tabs.0/@sections.370" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleObservation">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Observation"/>
     </constraints>
   </views>
   <views name="MultipleObservation" sections="//@tabs.0/@sections.371" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleObservation">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Observation"/>
     </constraints>
   </views>
   <views name="SingleDuration" sections="//@tabs.0/@sections.372" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDuration">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Duration"/>
     </constraints>
   </views>
   <views name="MultipleDuration" sections="//@tabs.0/@sections.373" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDuration">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Duration"/>
     </constraints>
   </views>
   <views name="SingleDurationInterval" sections="//@tabs.0/@sections.374" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDurationInterval">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DurationInterval"/>
     </constraints>
   </views>
   <views name="MultipleDurationInterval" sections="//@tabs.0/@sections.375" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDurationInterval">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DurationInterval"/>
     </constraints>
   </views>
   <views name="SingleInterval" sections="//@tabs.0/@sections.376" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInterval">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Interval"/>
     </constraints>
   </views>
   <views name="MultipleInterval" sections="//@tabs.0/@sections.377" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInterval">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Interval"/>
     </constraints>
   </views>
   <views name="SingleTimeConstraint" sections="//@tabs.0/@sections.378" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTimeConstraint">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeConstraint"/>
     </constraints>
   </views>
   <views name="MultipleTimeConstraint" sections="//@tabs.0/@sections.379" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTimeConstraint">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeConstraint"/>
     </constraints>
   </views>
   <views name="SingleIntervalConstraint" sections="//@tabs.0/@sections.380" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleIntervalConstraint">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="IntervalConstraint"/>
     </constraints>
   </views>
   <views name="MultipleIntervalConstraint" sections="//@tabs.0/@sections.381" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleIntervalConstraint">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="IntervalConstraint"/>
     </constraints>
   </views>
   <views name="SingleTimeInterval" sections="//@tabs.0/@sections.382" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTimeInterval">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeInterval"/>
     </constraints>
   </views>
   <views name="MultipleTimeInterval" sections="//@tabs.0/@sections.383" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTimeInterval">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeInterval"/>
     </constraints>
   </views>
   <views name="SingleDurationConstraint" sections="//@tabs.0/@sections.384" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDurationConstraint">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DurationConstraint"/>
     </constraints>
   </views>
   <views name="MultipleDurationConstraint" sections="//@tabs.0/@sections.385" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDurationConstraint">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DurationConstraint"/>
     </constraints>
   </views>
   <views name="SingleTimeObservation" sections="//@tabs.0/@sections.386" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTimeObservation">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeObservation"/>
     </constraints>
   </views>
   <views name="MultipleTimeObservation" sections="//@tabs.0/@sections.387" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTimeObservation">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeObservation"/>
     </constraints>
   </views>
   <views name="SingleDurationObservation" sections="//@tabs.0/@sections.388" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDurationObservation">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DurationObservation"/>
     </constraints>
   </views>
   <views name="MultipleDurationObservation" sections="//@tabs.0/@sections.389" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDurationObservation">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DurationObservation"/>
     </constraints>
   </views>
   <views name="SingleFinalState" sections="//@tabs.0/@sections.390" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFinalState">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="FinalState"/>
     </constraints>
   </views>
   <views name="MultipleFinalState" sections="//@tabs.0/@sections.391" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFinalState">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="FinalState"/>
     </constraints>
   </views>
   <views name="SingleTimeEvent" sections="//@tabs.0/@sections.392" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTimeEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeEvent"/>
     </constraints>
   </views>
   <views name="MultipleTimeEvent" sections="//@tabs.0/@sections.393" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTimeEvent">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeEvent"/>
     </constraints>
   </views>
   <views name="SingleVariableAction" sections="//@tabs.0/@sections.394" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleVariableAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="VariableAction"/>
     </constraints>
   </views>
   <views name="MultipleVariableAction" sections="//@tabs.0/@sections.395" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleVariableAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="VariableAction"/>
     </constraints>
   </views>
   <views name="SingleReadVariableAction" sections="//@tabs.0/@sections.396" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadVariableAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadVariableAction"/>
     </constraints>
   </views>
   <views name="MultipleReadVariableAction" sections="//@tabs.0/@sections.397" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadVariableAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadVariableAction"/>
     </constraints>
   </views>
   <views name="SingleWriteVariableAction" sections="//@tabs.0/@sections.398" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleWriteVariableAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="WriteVariableAction"/>
     </constraints>
   </views>
   <views name="MultipleWriteVariableAction" sections="//@tabs.0/@sections.399" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleWriteVariableAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="WriteVariableAction"/>
     </constraints>
   </views>
   <views name="SingleClearVariableAction" sections="//@tabs.0/@sections.400" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleClearVariableAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ClearVariableAction"/>
     </constraints>
   </views>
   <views name="MultipleClearVariableAction" sections="//@tabs.0/@sections.401" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleClearVariableAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ClearVariableAction"/>
     </constraints>
   </views>
   <views name="SingleAddVariableValueAction" sections="//@tabs.0/@sections.402" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAddVariableValueAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AddVariableValueAction"/>
     </constraints>
   </views>
   <views name="MultipleAddVariableValueAction" sections="//@tabs.0/@sections.403" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAddVariableValueAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AddVariableValueAction"/>
     </constraints>
   </views>
   <views name="SingleRemoveVariableValueAction" sections="//@tabs.0/@sections.404" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRemoveVariableValueAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RemoveVariableValueAction"/>
     </constraints>
   </views>
   <views name="MultipleRemoveVariableValueAction" sections="//@tabs.0/@sections.405" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRemoveVariableValueAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RemoveVariableValueAction"/>
     </constraints>
   </views>
   <views name="SingleRaiseExceptionAction" sections="//@tabs.0/@sections.406" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRaiseExceptionAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RaiseExceptionAction"/>
     </constraints>
   </views>
   <views name="MultipleRaiseExceptionAction" sections="//@tabs.0/@sections.407" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRaiseExceptionAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RaiseExceptionAction"/>
     </constraints>
   </views>
   <views name="SingleActionInputPin" sections="//@tabs.0/@sections.408" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleActionInputPin">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActionInputPin"/>
     </constraints>
   </views>
   <views name="MultipleActionInputPin" sections="//@tabs.0/@sections.409" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleActionInputPin">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActionInputPin"/>
     </constraints>
   </views>
   <views name="SingleInformationItem" sections="//@tabs.0/@sections.410" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInformationItem">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InformationItem"/>
     </constraints>
   </views>
   <views name="MultipleInformationItem" sections="//@tabs.0/@sections.411" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInformationItem">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InformationItem"/>
     </constraints>
   </views>
   <views name="SingleInformationFlow" sections="//@tabs.0/@sections.412" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInformationFlow">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InformationFlow"/>
     </constraints>
   </views>
   <views name="MultipleInformationFlow" sections="//@tabs.0/@sections.413" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInformationFlow">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InformationFlow"/>
     </constraints>
   </views>
   <views name="SingleReadExtentAction" sections="//@tabs.0/@sections.414" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadExtentAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadExtentAction"/>
     </constraints>
   </views>
   <views name="MultipleReadExtentAction" sections="//@tabs.0/@sections.415" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadExtentAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadExtentAction"/>
     </constraints>
   </views>
   <views name="SingleReclassifyObjectAction" sections="//@tabs.0/@sections.416" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReclassifyObjectAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReclassifyObjectAction"/>
     </constraints>
   </views>
   <views name="MultipleReclassifyObjectAction" sections="//@tabs.0/@sections.417" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReclassifyObjectAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReclassifyObjectAction"/>
     </constraints>
   </views>
   <views name="SingleReadIsClassifiedObjectAction" sections="//@tabs.0/@sections.418" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadIsClassifiedObjectAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadIsClassifiedObjectAction"/>
     </constraints>
   </views>
   <views name="MultipleReadIsClassifiedObjectAction" sections="//@tabs.0/@sections.419" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadIsClassifiedObjectAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadIsClassifiedObjectAction"/>
     </constraints>
   </views>
   <views name="SingleStartClassifierBehaviorAction" sections="//@tabs.0/@sections.420" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStartClassifierBehaviorAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StartClassifierBehaviorAction"/>
     </constraints>
   </views>
   <views name="MultipleStartClassifierBehaviorAction" sections="//@tabs.0/@sections.421" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStartClassifierBehaviorAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StartClassifierBehaviorAction"/>
     </constraints>
   </views>
   <views name="SingleReadLinkObjectEndAction" sections="//@tabs.0/@sections.422" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadLinkObjectEndAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadLinkObjectEndAction"/>
     </constraints>
   </views>
   <views name="MultipleReadLinkObjectEndAction" sections="//@tabs.0/@sections.423" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadLinkObjectEndAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadLinkObjectEndAction"/>
     </constraints>
   </views>
   <views name="SingleReadLinkObjectEndQualifierAction" sections="//@tabs.0/@sections.424" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadLinkObjectEndQualifierAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadLinkObjectEndQualifierAction"/>
     </constraints>
   </views>
   <views name="MultipleReadLinkObjectEndQualifierAction" sections="//@tabs.0/@sections.425" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadLinkObjectEndQualifierAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadLinkObjectEndQualifierAction"/>
     </constraints>
   </views>
   <views name="SingleCreateLinkObjectAction" sections="//@tabs.0/@sections.426" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCreateLinkObjectAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreateLinkObjectAction"/>
     </constraints>
   </views>
   <views name="MultipleCreateLinkObjectAction" sections="//@tabs.0/@sections.427" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCreateLinkObjectAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreateLinkObjectAction"/>
     </constraints>
   </views>
   <views name="SingleAcceptEventAction" sections="//@tabs.0/@sections.428" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAcceptEventAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AcceptEventAction"/>
     </constraints>
   </views>
   <views name="MultipleAcceptEventAction" sections="//@tabs.0/@sections.429" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAcceptEventAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AcceptEventAction"/>
     </constraints>
   </views>
   <views name="SingleAcceptCallAction" sections="//@tabs.0/@sections.430" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAcceptCallAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AcceptCallAction"/>
     </constraints>
   </views>
   <views name="MultipleAcceptCallAction" sections="//@tabs.0/@sections.431" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAcceptCallAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AcceptCallAction"/>
     </constraints>
   </views>
   <views name="SingleReplyAction" sections="//@tabs.0/@sections.432" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReplyAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReplyAction"/>
     </constraints>
   </views>
   <views name="MultipleReplyAction" sections="//@tabs.0/@sections.433" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReplyAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReplyAction"/>
     </constraints>
   </views>
   <views name="SingleUnmarshallAction" sections="//@tabs.0/@sections.434" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleUnmarshallAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="UnmarshallAction"/>
     </constraints>
   </views>
   <views name="MultipleUnmarshallAction" sections="//@tabs.0/@sections.435" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleUnmarshallAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="UnmarshallAction"/>
     </constraints>
   </views>
   <views name="SingleReduceAction" sections="//@tabs.0/@sections.436" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReduceAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReduceAction"/>
     </constraints>
   </views>
   <views name="MultipleReduceAction" sections="//@tabs.0/@sections.437" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReduceAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReduceAction"/>
     </constraints>
   </views>
   <views name="SingleStartObjectBehaviorAction" sections="//@tabs.0/@sections.438" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStartObjectBehaviorAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StartObjectBehaviorAction"/>
     </constraints>
   </views>
   <views name="MultipleStartObjectBehaviorAction" sections="//@tabs.0/@sections.439" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStartObjectBehaviorAction">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StartObjectBehaviorAction"/>
     </constraints>
   </views>
   <views name="SingleJoinNode" sections="//@tabs.0/@sections.440" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleJoinNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="JoinNode"/>
     </constraints>
   </views>
   <views name="MultipleJoinNode" sections="//@tabs.0/@sections.441" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleJoinNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="JoinNode"/>
     </constraints>
   </views>
   <views name="SingleDataStoreNode" sections="//@tabs.0/@sections.442" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDataStoreNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DataStoreNode"/>
     </constraints>
   </views>
   <views name="MultipleDataStoreNode" sections="//@tabs.0/@sections.443" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDataStoreNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DataStoreNode"/>
     </constraints>
   </views>
   <views name="SingleConditionalNode" sections="//@tabs.0/@sections.444" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConditionalNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConditionalNode"/>
     </constraints>
   </views>
   <views name="MultipleConditionalNode" sections="//@tabs.0/@sections.445" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConditionalNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConditionalNode"/>
     </constraints>
   </views>
   <views name="SingleClause" sections="//@tabs.0/@sections.446" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleClause">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Clause"/>
     </constraints>
   </views>
   <views name="SingleLoopNode" sections="//@tabs.0/@sections.447" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLoopNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LoopNode"/>
     </constraints>
   </views>
   <views name="MultipleLoopNode" sections="//@tabs.0/@sections.448" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLoopNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LoopNode"/>
     </constraints>
   </views>
   <views name="SingleExpansionNode" sections="//@tabs.0/@sections.449" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExpansionNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExpansionNode"/>
     </constraints>
   </views>
   <views name="MultipleExpansionNode" sections="//@tabs.0/@sections.450" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExpansionNode">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExpansionNode"/>
     </constraints>
   </views>
   <views name="SingleExpansionRegion" sections="//@tabs.0/@sections.451" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExpansionRegion">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExpansionRegion"/>
     </constraints>
   </views>
   <views name="MultipleExpansionRegion" sections="//@tabs.0/@sections.452" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExpansionRegion">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExpansionRegion"/>
     </constraints>
   </views>
   <views name="SingleProtocolTransition" sections="//@tabs.0/@sections.453" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleProtocolTransition">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ProtocolTransition"/>
     </constraints>
   </views>
   <views name="MultipleProtocolTransition" sections="//@tabs.0/@sections.454" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleProtocolTransition">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ProtocolTransition"/>
     </constraints>
   </views>
   <views name="SingleAssociationClass" sections="//@tabs.0/@sections.455" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAssociationClass">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AssociationClass"/>
     </constraints>
   </views>
   <views name="MultipleAssociationClass" sections="//@tabs.0/@sections.456" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAssociationClass">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AssociationClass"/>
     </constraints>
   </views>
   <views name="SingleDependency" sections="//@tabs.0/@sections.457" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDependency">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Dependency"/>
     </constraints>
   </views>
   <views name="MultipleDependency" sections="//@tabs.0/@sections.458" elementMultiplicity="-1" automaticContext="true">
     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDependency">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Dependency"/>
     </constraints>
   </views>
   <views name="SingleComment" sections="//@tabs.0/@sections.460">
     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleComment">
-      <constraintType href="pathmap://UML_CONTEXT/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Comment"/>
     </constraints>
   </views>
@@ -5212,20 +5212,20 @@
     <elements name="EModelElement">
       <properties name="eAnnotations" type="Reference"/>
     </elements>
-    <modelElementFactory href="pathmap://UML_CONTEXT/Environment.xmi#//@modelElementFactories.1"/>
+    <modelElementFactory href="Environment.xmi#//@modelElementFactories.1"/>
   </dataContexts>
   <dataContexts name="MemberEnd" label="Multiplicity">
     <properties name="owner" label="Owner" type="Enumeration"/>
     <properties name="navigable" label="Navigable" type="Boolean"/>
-    <modelElementFactory href="pathmap://UML_CONTEXT/Environment.xmi#//@modelElementFactories.0"/>
+    <modelElementFactory href="Environment.xmi#//@modelElementFactories.0"/>
   </dataContexts>
   <dataContexts name="Multiplicity" label="Multiplicity">
     <properties name="multiplicity" label="Multiplicity" type="Enumeration"/>
-    <modelElementFactory href="pathmap://UML_CONTEXT/Environment.xmi#//@modelElementFactories.0"/>
+    <modelElementFactory href="Environment.xmi#//@modelElementFactories.0"/>
   </dataContexts>
   <dataContexts name="StereotypeApplication" label="Stereotype application">
     <properties name="stereotypeApplication" label="" type="Reference" multiplicity="-1"/>
     <properties name="profileApplication" type="Reference" multiplicity="-1"/>
-    <modelElementFactory href="pathmap://UML_CONTEXT/Environment.xmi#//@modelElementFactories.3"/>
+    <modelElementFactory href="Environment.xmi#//@modelElementFactories.3"/>
   </dataContexts>
 </contexts:Context>
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MemberEnd.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MemberEnd.xwt
index 5eb1423f166..5dc67b9eb4f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MemberEnd.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MemberEnd.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" text="Member End"><Group.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Group.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:EnumCombo input="{Binding}" property="MemberEnd:owner"></ppe:EnumCombo><ppe:BooleanRadio input="{Binding}" property="MemberEnd:navigable"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumCombo></Composite></Group>
-\ No newline at end of file
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" text="Member End"><Group.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Group.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:EnumCombo input="{Binding}" property="MemberEnd:owner"></ppe:EnumCombo><ppe:BooleanRadio input="{Binding}" property="MemberEnd:navigable"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumCombo></Composite></Group>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAbstraction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAbstraction.xwt
index 4b026898859..b7eb066cb13 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAbstraction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAbstraction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAcceptCallAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAcceptCallAction.xwt
index f67e7bacfb5..162d90d583d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAcceptCallAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAcceptCallAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AcceptEventAction:isUnmarshall"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AcceptEventAction:isUnmarshall"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAcceptEventAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAcceptEventAction.xwt
index 18b3bae34ae..3502b0f22de 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAcceptEventAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAcceptEventAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AcceptEventAction:isUnmarshall"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AcceptEventAction:isUnmarshall"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAction.xwt
index 31ad0d0b241..40586f9cd32 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActionExecutionSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActionExecutionSpecification.xwt
index fec36adf111..b90d138a53a 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActionExecutionSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActionExecutionSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActionInputPin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActionInputPin.xwt
index d85f0d09e34..33085ae3b65 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActionInputPin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActionInputPin.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivity.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivity.xwt
index 02545fb6dc5..d9f40f6f9eb 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivity.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivity.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Activity:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Activity:isSingleExecution"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Activity:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Activity:isSingleExecution"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityEdge.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityEdge.xwt
index 41e80f00fcd..27d5d21b961 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityEdge.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityEdge.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityFinalNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityFinalNode.xwt
index 9c521291bee..be0077f3b9f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityFinalNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityFinalNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityNode.xwt
index a8c368ca334..677ff8b65ac 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityParameterNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityParameterNode.xwt
index de17ecf1697..a40d027c5b4 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityParameterNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityParameterNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityPartition.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityPartition.xwt
index 130f6bdc43e..427636072de 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityPartition.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActivityPartition.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ActivityPartition:isDimension"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ActivityPartition:isExternal"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ActivityPartition:isDimension"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ActivityPartition:isExternal"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActor.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActor.xwt
index 6b46af28db7..169742d4398 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActor.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleActor.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAddStructuralFeatureValueAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAddStructuralFeatureValueAction.xwt
index f7d96436ced..efa5499afd8 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAddStructuralFeatureValueAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAddStructuralFeatureValueAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AddStructuralFeatureValueAction:isReplaceAll"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AddStructuralFeatureValueAction:isReplaceAll"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAddVariableValueAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAddVariableValueAction.xwt
index 4674241eeda..2c786ed8553 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAddVariableValueAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAddVariableValueAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AddVariableValueAction:isReplaceAll"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AddVariableValueAction:isReplaceAll"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAnyReceiveEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAnyReceiveEvent.xwt
index 84bd52198af..40c992f2aca 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAnyReceiveEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAnyReceiveEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleArtifact.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleArtifact.xwt
index ab3650c0a71..75f2a011510 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleArtifact.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleArtifact.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAssociation.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAssociation.xwt
index da1d6af48e1..f508f5f7632 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAssociation.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAssociation.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Association:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Association:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAssociationClass.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAssociationClass.xwt
index 069d6050277..f3d65130084 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAssociationClass.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleAssociationClass.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Association:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Association:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehavior.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehavior.xwt
index 2a7087f2853..9f388d474ff 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehavior.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehavior.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehaviorExecutionSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehaviorExecutionSpecification.xwt
index afbb37c8773..0252be42024 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehaviorExecutionSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehaviorExecutionSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehavioralFeature.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehavioralFeature.xwt
index 174400a1f13..a39b7026bcc 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehavioralFeature.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehavioralFeature.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehavioredClassifier.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehavioredClassifier.xwt
index 5a174488f3b..90af7404cbf 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehavioredClassifier.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBehavioredClassifier.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBroadcastSignalAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBroadcastSignalAction.xwt
index a321b4fd0fe..a8c368ca334 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBroadcastSignalAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleBroadcastSignalAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallAction.xwt
index d759ff09274..b9b2e1cad89 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallBehaviorAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallBehaviorAction.xwt
index ed8bb338dd0..bba008874be 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallBehaviorAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallBehaviorAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallEvent.xwt
index 0aa20c99521..cac2c934393 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallOperationAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallOperationAction.xwt
index b4e17db8097..92f0ab1c20f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallOperationAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCallOperationAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCentralBufferNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCentralBufferNode.xwt
index 170d543b8bf..3160e96d156 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCentralBufferNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCentralBufferNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleChangeEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleChangeEvent.xwt
index c848b8cc6a2..8dcf0a360ee 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleChangeEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleChangeEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClass.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClass.xwt
index 16665f172b8..68c6787e3a3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClass.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClass.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClassifier.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClassifier.xwt
index d1dd32d2503..c866cc18e92 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClassifier.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClassifier.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClassifierTemplateParameter.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClassifierTemplateParameter.xwt
index 98809b4080c..c33b023605d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClassifierTemplateParameter.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClassifierTemplateParameter.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ClassifierTemplateParameter:allowSubstitutable"></ppe:BooleanRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ClassifierTemplateParameter:allowSubstitutable"></ppe:BooleanRadio></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClearAssociationAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClearAssociationAction.xwt
index 47e6cd0d84b..0e02805e702 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClearAssociationAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClearAssociationAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClearStructuralFeatureAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClearStructuralFeatureAction.xwt
index 29fb6c59fd6..cdf6ecce840 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClearStructuralFeatureAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClearStructuralFeatureAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClearVariableAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClearVariableAction.xwt
index b586239abea..276c04a9099 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClearVariableAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleClearVariableAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCollaboration.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCollaboration.xwt
index 8eece89a0f2..0ce262eb172 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCollaboration.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCollaboration.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCollaborationUse.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCollaborationUse.xwt
index 74f10e506c8..994e065b553 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCollaborationUse.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCollaborationUse.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCombinedFragment.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCombinedFragment.xwt
index 7b18b399051..e992518e343 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCombinedFragment.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCombinedFragment.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:CombinedFragment:interactionOperator"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:CombinedFragment:interactionOperator"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCommunicationPath.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCommunicationPath.xwt
index 0b5222e6b53..324c60b5f90 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCommunicationPath.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCommunicationPath.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Association:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Association:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleComponent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleComponent.xwt
index b13d587aab7..b8e15b27b19 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleComponent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleComponent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Component:isIndirectlyInstantiated"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Component:isIndirectlyInstantiated"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleComponentRealization.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleComponentRealization.xwt
index 2457915ea88..74ba7bb623f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleComponentRealization.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleComponentRealization.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConditionalNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConditionalNode.xwt
index 00cfdeb28eb..2d52dd124cb 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConditionalNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConditionalNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ConditionalNode:isAssured"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ConditionalNode:isDeterminate"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ConditionalNode:isAssured"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ConditionalNode:isDeterminate"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnectableElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnectableElement.xwt
index 06384ba8566..c49689e0078 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnectableElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnectableElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnectionPointReference.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnectionPointReference.xwt
index fbb920397d7..85f042bb93d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnectionPointReference.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnectionPointReference.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnector.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnector.xwt
index e2e8add216a..1ca2d1037c2 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnector.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnector.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Connector:kind"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Connector:kind"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnectorEnd.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnectorEnd.xwt
index c1c9ff2b534..f1cf3080b2a 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnectorEnd.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConnectorEnd.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConsiderIgnoreFragment.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConsiderIgnoreFragment.xwt
index 3528f300931..9f7c4f3e441 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConsiderIgnoreFragment.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConsiderIgnoreFragment.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:CombinedFragment:interactionOperator"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:CombinedFragment:interactionOperator"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConstraint.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConstraint.xwt
index fb1b33b259a..45724657c41 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConstraint.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleConstraint.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleContinuation.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleContinuation.xwt
index b3dcb889ac3..20372139288 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleContinuation.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleContinuation.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Continuation:setting"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Continuation:setting"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleControlFlow.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleControlFlow.xwt
index be4689c106b..9c521291bee 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleControlFlow.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleControlFlow.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleControlNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleControlNode.xwt
index 0e02805e702..405832102f9 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleControlNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleControlNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreateLinkAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreateLinkAction.xwt
index c6a5d0ebed8..19b97fdf2d8 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreateLinkAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreateLinkAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreateLinkObjectAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreateLinkObjectAction.xwt
index 0b36341d7c7..2a11cf19bc5 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreateLinkObjectAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreateLinkObjectAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreateObjectAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreateObjectAction.xwt
index 9594a59f5cc..6a7c0dbc70c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreateObjectAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreateObjectAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreationEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreationEvent.xwt
index f74de08bb27..28b2121404d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreationEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleCreationEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDataStoreNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDataStoreNode.xwt
index e2fb49fa146..2f60cdc278c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDataStoreNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDataStoreNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDataType.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDataType.xwt
index 1f1502756ad..ace4c5cb8d9 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDataType.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDataType.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDecisionNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDecisionNode.xwt
index 47e6cd0d84b..e618b4060a0 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDecisionNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDecisionNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDependency.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDependency.xwt
index 0352e490c6e..a30b15552fe 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDependency.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDependency.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeployedArtifact.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeployedArtifact.xwt
index fb1b33b259a..db0b39195fa 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeployedArtifact.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeployedArtifact.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeployment.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeployment.xwt
index fec36adf111..63ae9e4e72c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeployment.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeployment.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeploymentSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeploymentSpecification.xwt
index 68a0001a1d0..90af7404cbf 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeploymentSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeploymentSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeploymentTarget.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeploymentTarget.xwt
index ae9933d3d09..ca129d4b852 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeploymentTarget.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDeploymentTarget.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDestroyLinkAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDestroyLinkAction.xwt
index b30925312ae..09c58b9c3db 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDestroyLinkAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDestroyLinkAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDestroyObjectAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDestroyObjectAction.xwt
index 810dd7a40a3..ddca33abf28 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDestroyObjectAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDestroyObjectAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:DestroyObjectAction:isDestroyLinks"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:DestroyObjectAction:isDestroyOwnedObjects"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:DestroyObjectAction:isDestroyLinks"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:DestroyObjectAction:isDestroyOwnedObjects"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDestructionEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDestructionEvent.xwt
index 0b5234b8074..bfa0bace918 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDestructionEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDestructionEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDevice.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDevice.xwt
index a0d92bff6bc..7e298668577 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDevice.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDevice.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDuration.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDuration.xwt
index 147a62416c0..ae9933d3d09 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDuration.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDuration.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDurationConstraint.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDurationConstraint.xwt
index 9f9f6e08145..2a0f36d3ca4 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDurationConstraint.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDurationConstraint.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:DurationConstraint:firstEvent"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:DurationConstraint:firstEvent"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDurationInterval.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDurationInterval.xwt
index 6231f15f9a6..5a16dbfbdca 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDurationInterval.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDurationInterval.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDurationObservation.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDurationObservation.xwt
index 519954fec21..caaae86f9ad 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDurationObservation.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleDurationObservation.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:DurationObservation:firstEvent"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:DurationObservation:firstEvent"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleElement.xwt
index c42af8507ee..bf5b2414a33 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleElementImport.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleElementImport.xwt
index 35da27b0c9a..d0214c29ef5 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleElementImport.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleElementImport.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ElementImport:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ElementImport:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEncapsulatedClassifier.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEncapsulatedClassifier.xwt
index 5a174488f3b..39b30cb8ea3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEncapsulatedClassifier.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEncapsulatedClassifier.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEnumeration.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEnumeration.xwt
index 09beba6944e..fa9a5824fa1 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEnumeration.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEnumeration.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEnumerationLiteral.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEnumerationLiteral.xwt
index 174ea0d9789..6924e52d9ee 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEnumerationLiteral.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEnumerationLiteral.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEvent.xwt
index f74de08bb27..57e4a268198 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutableNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutableNode.xwt
index 9004526d323..32d1e84ea06 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutableNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutableNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutionEnvironment.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutionEnvironment.xwt
index 741f0570756..0dd9e77c1c3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutionEnvironment.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutionEnvironment.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutionEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutionEvent.xwt
index da2da97cf99..a7fbcd36f91 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutionEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutionEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutionOccurrenceSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutionOccurrenceSpecification.xwt
index 84bd52198af..c1c7bdf779a 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutionOccurrenceSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExecutionOccurrenceSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExpansionNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExpansionNode.xwt
index d5d984997ab..33d0bfbd6a8 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExpansionNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExpansionNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExpansionRegion.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExpansionRegion.xwt
index a7d4f3e3675..a7a4ed10bac 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExpansionRegion.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExpansionRegion.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ExpansionRegion:mode"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ExpansionRegion:mode"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExpression.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExpression.xwt
index 81b1cb6f752..977476b523f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExpression.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExpression.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtend.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtend.xwt
index 81b1cb6f752..6dee9459e83 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtend.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtend.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtension.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtension.xwt
index 80636d4eaa4..00724e444d3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtension.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtension.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Association:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Association:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtensionEnd.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtensionEnd.xwt
index aedaac42fd9..f36af2dfa1d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtensionEnd.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtensionEnd.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:aggregation"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:aggregation"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtensionPoint.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtensionPoint.xwt
index a5a21d6142d..fe483d49f7c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtensionPoint.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleExtensionPoint.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFeature.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFeature.xwt
index e6afb8fa3be..113683aa2c6 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFeature.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFeature.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFinalNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFinalNode.xwt
index dd769c96f8e..58a7ca352a3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFinalNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFinalNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFinalState.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFinalState.xwt
index 41e80f00fcd..b30925312ae 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFinalState.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFinalState.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFlowFinalNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFlowFinalNode.xwt
index 2515407fbbe..41e80f00fcd 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFlowFinalNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFlowFinalNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleForkNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleForkNode.xwt
index f1138e4d941..2aceaaf9e3b 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleForkNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleForkNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFunctionBehavior.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFunctionBehavior.xwt
index f691f1731c2..1151254a4bf 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFunctionBehavior.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleFunctionBehavior.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGate.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGate.xwt
index bfa4ac738f8..6dee9459e83 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGate.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGate.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGeneralOrdering.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGeneralOrdering.xwt
index 5a16dbfbdca..497d8e2f7f9 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGeneralOrdering.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGeneralOrdering.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGeneralization.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGeneralization.xwt
index c2f02262ed3..88d4f9d33c5 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGeneralization.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGeneralization.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Generalization:isSubstitutable"></ppe:BooleanRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Generalization:isSubstitutable"></ppe:BooleanRadio></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGeneralizationSet.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGeneralizationSet.xwt
index 53d0b03c4ef..56ae47cce42 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGeneralizationSet.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleGeneralizationSet.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:GeneralizationSet:isCovering"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:GeneralizationSet:isDisjoint"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:GeneralizationSet:isCovering"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:GeneralizationSet:isDisjoint"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInclude.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInclude.xwt
index 6924e52d9ee..8d4d64ff060 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInclude.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInclude.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInformationFlow.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInformationFlow.xwt
index bb00c477bd3..9a440860587 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInformationFlow.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInformationFlow.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInformationItem.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInformationItem.xwt
index d158f42ffa0..a2861fa54d1 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInformationItem.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInformationItem.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInitialNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInitialNode.xwt
index 61f911f609a..58a7ca352a3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInitialNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInitialNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInputPin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInputPin.xwt
index 0857f4cb734..d94c12808b0 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInputPin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInputPin.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInstanceSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInstanceSpecification.xwt
index 8ca16678fe9..45724657c41 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInstanceSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInstanceSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInstanceValue.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInstanceValue.xwt
index 2f4dbc7954b..6be57d79e43 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInstanceValue.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInstanceValue.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteraction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteraction.xwt
index 9df39c399d3..d2352411bd0 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteraction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteraction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionConstraint.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionConstraint.xwt
index 57e4a268198..b7eb066cb13 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionConstraint.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionConstraint.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionFragment.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionFragment.xwt
index 23fb21637d5..0aa20c99521 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionFragment.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionFragment.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionOperand.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionOperand.xwt
index 4b026898859..afbb37c8773 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionOperand.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionOperand.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionUse.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionUse.xwt
index c1c7bdf779a..c49689e0078 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionUse.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInteractionUse.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInterface.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInterface.xwt
index fa9a5824fa1..9574e233770 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInterface.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInterface.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInterfaceRealization.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInterfaceRealization.xwt
index 0352e490c6e..2f50f48c0a4 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInterfaceRealization.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInterfaceRealization.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInterval.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInterval.xwt
index d0373ba1f62..ca129d4b852 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInterval.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInterval.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleIntervalConstraint.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleIntervalConstraint.xwt
index 10184a2fcbd..7bb82d972a4 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleIntervalConstraint.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleIntervalConstraint.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInvocationAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInvocationAction.xwt
index 2a11cf19bc5..7cc16eba9e0 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInvocationAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleInvocationAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleJoinNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleJoinNode.xwt
index 782c60c70e2..177e9535578 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleJoinNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleJoinNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:JoinNode:isCombineDuplicate"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:JoinNode:isCombineDuplicate"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLifeline.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLifeline.xwt
index 8ca16678fe9..e604321aff9 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLifeline.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLifeline.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLinkAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLinkAction.xwt
index 27d5d21b961..348c17eed7b 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLinkAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLinkAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLinkEndCreationData.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLinkEndCreationData.xwt
index 983ece02c01..90752dab3f6 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLinkEndCreationData.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLinkEndCreationData.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:LinkEndCreationData:isReplaceAll"></ppe:BooleanRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:LinkEndCreationData:isReplaceAll"></ppe:BooleanRadio></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLinkEndDestructionData.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLinkEndDestructionData.xwt
index fe069eace78..6011000c963 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLinkEndDestructionData.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLinkEndDestructionData.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:LinkEndDestructionData:isDestroyDuplicates"></ppe:BooleanRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:LinkEndDestructionData:isDestroyDuplicates"></ppe:BooleanRadio></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralBoolean.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralBoolean.xwt
index 4e66126e7c5..a9b2fbc8c83 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralBoolean.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralBoolean.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:LiteralBoolean:value"></ppe:BooleanRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:LiteralBoolean:value"></ppe:BooleanRadio></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralInteger.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralInteger.xwt
index c88f5554972..a3a20a5cb12 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralInteger.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralInteger.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor property="UML:LiteralInteger:value" input="{Binding}"></ppe:IntegerEditor></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="UML:LiteralInteger:value"></ppe:IntegerEditor></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralNull.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralNull.xwt
index 415ac24a4e1..386c86d31ba 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralNull.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralNull.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralSpecification.xwt
index 63003f72308..0b037e0790c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralString.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralString.xwt
index 3e39cff9d02..e681a08516d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralString.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralString.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringMultiline property="UML:LiteralString:value" input="{Binding}"></ppe:StringMultiline></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringMultiline input="{Binding}" property="UML:LiteralString:value"></ppe:StringMultiline></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralUnlimitedNatural.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralUnlimitedNatural.xwt
index b32965edbd1..2d7d11e1760 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralUnlimitedNatural.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLiteralUnlimitedNatural.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor property="UML:LiteralUnlimitedNatural:value" input="{Binding}"></ppe:IntegerEditor></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="UML:LiteralUnlimitedNatural:value"></ppe:IntegerEditor></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLoopNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLoopNode.xwt
index d7654d07e15..05ff05af9ef 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLoopNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleLoopNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:LoopNode:isTestedFirst"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:LoopNode:isTestedFirst"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleManifestation.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleManifestation.xwt
index 6231f15f9a6..84212515f10 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleManifestation.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleManifestation.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMergeNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMergeNode.xwt
index 4a17de77196..953c7ba7025 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMergeNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMergeNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessage.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessage.xwt
index 64be95429b2..426d0271a24 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessage.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessage.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Message:messageSort"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Message:messageSort"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessageEnd.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessageEnd.xwt
index 977476b523f..c492675c104 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessageEnd.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessageEnd.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessageEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessageEvent.xwt
index 8dcf0a360ee..f5e48725d36 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessageEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessageEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessageOccurrenceSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessageOccurrenceSpecification.xwt
index 188ef0d952d..aa7c176195e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessageOccurrenceSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMessageOccurrenceSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleModel.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleModel.xwt
index b7eb066cb13..977476b523f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleModel.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleModel.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMultiplicityElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMultiplicityElement.xwt
index aee41a06e79..3f71c5f93c0 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMultiplicityElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleMultiplicityElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleNamedElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleNamedElement.xwt
index 74f10e506c8..0252be42024 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleNamedElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleNamedElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleNamespace.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleNamespace.xwt
index 960bae216bc..497d8e2f7f9 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleNamespace.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleNamespace.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleNode.xwt
index 9c4846aad9f..7455e002167 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleObjectFlow.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleObjectFlow.xwt
index 2f0a587f5eb..41143509cb8 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleObjectFlow.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleObjectFlow.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectFlow:isMulticast"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectFlow:isMultireceive"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectFlow:isMulticast"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectFlow:isMultireceive"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleObjectNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleObjectNode.xwt
index a40d027c5b4..f951f5baabc 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleObjectNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleObjectNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleObservation.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleObservation.xwt
index 076f0fe4869..826cf4015ce 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleObservation.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleObservation.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOccurrenceSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOccurrenceSpecification.xwt
index 1d239fa63f4..6dee9459e83 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOccurrenceSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOccurrenceSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOpaqueAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOpaqueAction.xwt
index 3baeae82009..b3cea07698d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOpaqueAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOpaqueAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOpaqueBehavior.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOpaqueBehavior.xwt
index e09c1f3bfac..418785dca7e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOpaqueBehavior.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOpaqueBehavior.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOpaqueExpression.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOpaqueExpression.xwt
index 994e065b553..74ba7bb623f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOpaqueExpression.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOpaqueExpression.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOperation.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOperation.xwt
index a4b800bd214..77c18be7479 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOperation.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOperation.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Operation:isQuery"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Operation:isQuery"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOutputPin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOutputPin.xwt
index 36556778e61..cee3d0bc063 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOutputPin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleOutputPin.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackage.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackage.xwt
index 52607032539..2f4dbc7954b 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackage.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackage.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackageImport.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackageImport.xwt
index 540af42fa0c..977c0bec852 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackageImport.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackageImport.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:PackageImport:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:PackageImport:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackageableElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackageableElement.xwt
index c97736f17a5..98030a278bc 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackageableElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackageableElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleParameter.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleParameter.xwt
index 27637df0452..12133e25fcc 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleParameter.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleParameter.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleParameterSet.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleParameterSet.xwt
index 46314ba5e5e..affcc5d1f20 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleParameterSet.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleParameterSet.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePartDecomposition.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePartDecomposition.xwt
index 63003f72308..ed834961af0 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePartDecomposition.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePartDecomposition.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePin.xwt
index 42f817003a3..c16548ed76a 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePin.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePort.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePort.xwt
index b7990855072..7018025d479 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePort.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePort.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Port:isBehavior"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Port:isService"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:aggregation"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Port:isBehavior"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Port:isService"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:aggregation"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePrimitiveType.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePrimitiveType.xwt
index 838fb19ede9..68a0001a1d0 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePrimitiveType.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePrimitiveType.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProfile.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProfile.xwt
index 0252be42024..64fa004480c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProfile.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProfile.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProfileApplication.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProfileApplication.xwt
index 8382208d2a0..aa85a1a2d93 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProfileApplication.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProfileApplication.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ProfileApplication:isStrict"></ppe:BooleanRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ProfileApplication:isStrict"></ppe:BooleanRadio></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProperty.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProperty.xwt
index 33b765a875a..be72db0a1c2 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProperty.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProperty.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProtocolStateMachine.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProtocolStateMachine.xwt
index b9ddfc6ff12..f5ac19dc9b5 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProtocolStateMachine.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProtocolStateMachine.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProtocolTransition.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProtocolTransition.xwt
index 26ed597888f..ff614e297f9 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProtocolTransition.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleProtocolTransition.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Transition:kind"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Transition:kind"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePseudostate.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePseudostate.xwt
index cba131da477..02c8094194a 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePseudostate.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePseudostate.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Pseudostate:kind"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Pseudostate:kind"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRaiseExceptionAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRaiseExceptionAction.xwt
index f20d410f2f6..68e816e511b 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRaiseExceptionAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRaiseExceptionAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadExtentAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadExtentAction.xwt
index 9f1deecb767..b23906d9ec2 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadExtentAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadExtentAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadIsClassifiedObjectAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadIsClassifiedObjectAction.xwt
index 9663666eb4f..f4a675f4254 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadIsClassifiedObjectAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadIsClassifiedObjectAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ReadIsClassifiedObjectAction:isDirect"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ReadIsClassifiedObjectAction:isDirect"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadLinkAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadLinkAction.xwt
index b06573d6d90..72e0fc4ee73 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadLinkAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadLinkAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadLinkObjectEndAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadLinkObjectEndAction.xwt
index 8a0a7265065..41e80f00fcd 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadLinkObjectEndAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadLinkObjectEndAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadLinkObjectEndQualifierAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadLinkObjectEndQualifierAction.xwt
index caac760513a..62a4f49b0a3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadLinkObjectEndQualifierAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadLinkObjectEndQualifierAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadSelfAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadSelfAction.xwt
index fe483d49f7c..b30925312ae 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadSelfAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadSelfAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadStructuralFeatureAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadStructuralFeatureAction.xwt
index 8a0a7265065..0e02805e702 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadStructuralFeatureAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadStructuralFeatureAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadVariableAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadVariableAction.xwt
index 3447cdd6eb6..6d2c033eb1e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadVariableAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadVariableAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRealization.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRealization.xwt
index 9a440860587..df7731c7780 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRealization.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRealization.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReceiveOperationEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReceiveOperationEvent.xwt
index 960bae216bc..5067a8825e5 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReceiveOperationEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReceiveOperationEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReceiveSignalEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReceiveSignalEvent.xwt
index 3fa4f6fd7c8..f5e48725d36 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReceiveSignalEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReceiveSignalEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReception.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReception.xwt
index 35b5e1d2584..792ec23c70c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReception.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReception.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReclassifyObjectAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReclassifyObjectAction.xwt
index bb747ab0acd..dd6df5b82d7 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReclassifyObjectAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReclassifyObjectAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ReclassifyObjectAction:isReplaceAll"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ReclassifyObjectAction:isReplaceAll"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRedefinableElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRedefinableElement.xwt
index a321b4fd0fe..be4689c106b 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRedefinableElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRedefinableElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRedefinableTemplateSignature.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRedefinableTemplateSignature.xwt
index b586239abea..7cc16eba9e0 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRedefinableTemplateSignature.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRedefinableTemplateSignature.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReduceAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReduceAction.xwt
index bc1e08e37dc..8017c202526 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReduceAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReduceAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ReduceAction:isOrdered"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ReduceAction:isOrdered"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRegion.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRegion.xwt
index 2c4320f9873..4eab9af585c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRegion.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRegion.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRemoveStructuralFeatureValueAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRemoveStructuralFeatureValueAction.xwt
index 09f1f6c385c..4c0e398ad3d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRemoveStructuralFeatureValueAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRemoveStructuralFeatureValueAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RemoveStructuralFeatureValueAction:isRemoveDuplicates"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RemoveStructuralFeatureValueAction:isRemoveDuplicates"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRemoveVariableValueAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRemoveVariableValueAction.xwt
index 016ade1dd22..1760d3be442 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRemoveVariableValueAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleRemoveVariableValueAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RemoveVariableValueAction:isRemoveDuplicates"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RemoveVariableValueAction:isRemoveDuplicates"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReplyAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReplyAction.xwt
index 6c6733ca3c8..6a7c0dbc70c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReplyAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReplyAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendObjectAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendObjectAction.xwt
index 59712889a96..736a95937b6 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendObjectAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendObjectAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendOperationEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendOperationEvent.xwt
index 22d62435346..db0b39195fa 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendOperationEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendOperationEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendSignalAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendSignalAction.xwt
index 45c638e18eb..984ae6ed4f2 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendSignalAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendSignalAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendSignalEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendSignalEvent.xwt
index a7fbcd36f91..0b5234b8074 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendSignalEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSendSignalEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSequenceNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSequenceNode.xwt
index 1827abd4960..c124af97b07 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSequenceNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSequenceNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSignal.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSignal.xwt
index e0032e24888..ad487b9bfd8 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSignal.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSignal.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSignalEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSignalEvent.xwt
index 10184a2fcbd..fb1b33b259a 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSignalEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSignalEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStartClassifierBehaviorAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStartClassifierBehaviorAction.xwt
index 7d7b13de7dd..62a4f49b0a3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStartClassifierBehaviorAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStartClassifierBehaviorAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStartObjectBehaviorAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStartObjectBehaviorAction.xwt
index e96f29cd211..d0c4a85533a 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStartObjectBehaviorAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStartObjectBehaviorAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleState.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleState.xwt
index cf928663b26..ecceb9a2963 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleState.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleState.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStateInvariant.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStateInvariant.xwt
index fec36adf111..0b037e0790c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStateInvariant.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStateInvariant.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStateMachine.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStateMachine.xwt
index 070c221e530..dd25cf6c19a 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStateMachine.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStateMachine.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStereotype.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStereotype.xwt
index 5063e13ec6e..d740ebbf536 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStereotype.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStereotype.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStringExpression.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStringExpression.xwt
index 577532e3cf3..0b5234b8074 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStringExpression.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStringExpression.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuralFeature.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuralFeature.xwt
index 4d620f07cd3..54705d3c015 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuralFeature.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuralFeature.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuralFeatureAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuralFeatureAction.xwt
index be0077f3b9f..2c4320f9873 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuralFeatureAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuralFeatureAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuredActivityNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuredActivityNode.xwt
index 1827abd4960..73363af808e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuredActivityNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuredActivityNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuredClassifier.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuredClassifier.xwt
index 0ce262eb172..1d071b4893e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuredClassifier.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleStructuredClassifier.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSubstitution.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSubstitution.xwt
index 8dcf0a360ee..cac2c934393 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSubstitution.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleSubstitution.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTestIdentityAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTestIdentityAction.xwt
index 6d2c033eb1e..7303b669526 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTestIdentityAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTestIdentityAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeEvent.xwt
index ea0bf0720bf..22d5a6101ad 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:TimeEvent:isRelative"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:TimeEvent:isRelative"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeExpression.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeExpression.xwt
index 3fa4f6fd7c8..0b5234b8074 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeExpression.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeExpression.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeInterval.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeInterval.xwt
index 85f042bb93d..9731e4e1093 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeInterval.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeInterval.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeObservation.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeObservation.xwt
index 1f7b158301c..00c68bdc17d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeObservation.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTimeObservation.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:TimeObservation:firstEvent"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:TimeObservation:firstEvent"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTransition.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTransition.xwt
index 3dc93abda1b..24feeecd3b7 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTransition.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTransition.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Transition:kind"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Transition:kind"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTrigger.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTrigger.xwt
index 577532e3cf3..6231f15f9a6 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTrigger.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTrigger.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleType.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleType.xwt
index 960bae216bc..977476b523f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleType.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleType.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTypedElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTypedElement.xwt
index 81b1cb6f752..ca129d4b852 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTypedElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleTypedElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleUnmarshallAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleUnmarshallAction.xwt
index 40586f9cd32..f20d410f2f6 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleUnmarshallAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleUnmarshallAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleUsage.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleUsage.xwt
index cf4b47ffe55..c49689e0078 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleUsage.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleUsage.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleUseCase.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleUseCase.xwt
index 5a174488f3b..b55e42342e6 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleUseCase.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleUseCase.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleValuePin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleValuePin.xwt
index 2d34ef0d92d..1d57dee5a89 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleValuePin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleValuePin.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleValueSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleValueSpecification.xwt
index 2724cfb0588..63003f72308 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleValueSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleValueSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleValueSpecificationAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleValueSpecificationAction.xwt
index 55df5b03c1e..92c5a1612da 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleValueSpecificationAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleValueSpecificationAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleVariable.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleVariable.xwt
index d62407e4617..ee043e6d5ac 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleVariable.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleVariable.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleVariableAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleVariableAction.xwt
index ecceb9a2963..9594a59f5cc 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleVariableAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleVariableAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleVertex.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleVertex.xwt
index 7bb82d972a4..04a6edd3264 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleVertex.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleVertex.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleWriteLinkAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleWriteLinkAction.xwt
index 4a17de77196..cf928663b26 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleWriteLinkAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleWriteLinkAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleWriteStructuralFeatureAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleWriteStructuralFeatureAction.xwt
index e7c68520371..348c17eed7b 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleWriteStructuralFeatureAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleWriteStructuralFeatureAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleWriteVariableAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleWriteVariableAction.xwt
index 405832102f9..58a7ca352a3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleWriteVariableAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleWriteVariableAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAbstraction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAbstraction.xwt
index b1c06b97b3e..cb154c2862c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAbstraction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAbstraction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Abstraction:mapping"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Abstraction:mapping"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAcceptCallAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAcceptCallAction.xwt
index d22e26ec835..23a37ab7524 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAcceptCallAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAcceptCallAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AcceptEventAction:isUnmarshall"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:AcceptCallAction:returnInformation"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:AcceptEventAction:result"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:AcceptEventAction:trigger"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AcceptEventAction:isUnmarshall"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:AcceptCallAction:returnInformation"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:AcceptEventAction:result"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:AcceptEventAction:trigger"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAcceptEventAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAcceptEventAction.xwt
index 88c08798fba..6afaf808ddf 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAcceptEventAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAcceptEventAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AcceptEventAction:isUnmarshall"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:AcceptEventAction:result"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:AcceptEventAction:trigger"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AcceptEventAction:isUnmarshall"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:AcceptEventAction:result"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:AcceptEventAction:trigger"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAction.xwt
index b325f71dfb4..200bd81e028 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActionExecutionSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActionExecutionSpecification.xwt
index e10ba9528d1..feb35501065 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActionExecutionSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActionExecutionSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ActionExecutionSpecification:action"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ExecutionSpecification:finish"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ExecutionSpecification:start"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ActionExecutionSpecification:action"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ExecutionSpecification:finish"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ExecutionSpecification:start"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActionInputPin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActionInputPin.xwt
index 99b1279579c..1819691bcf4 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActionInputPin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActionInputPin.xwt
@@ -1,49 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite 
-xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" 
-xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" 
-xmlns="http://www.eclipse.org/xwt/presentation" 
-xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"
-xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets">
-      <Composite.layout>
-            <ppel:PropertiesLayout></ppel:PropertiesLayout>
-      </Composite.layout>
-      <Composite>
-            <Composite.layout>
-                  <ppel:PropertiesLayout></ppel:PropertiesLayout>
-            </Composite.layout>
-            <ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-      </Composite>
-      <Composite>
-            <Composite.layout>
-                  <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-            </Composite.layout>
-            <ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio>
-            <ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio>
-            <ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-            <ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-            <ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-      </Composite>
-      <Composite>
-            <Composite.layout>
-                  <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-            </Composite.layout>
-            <ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo>
-            <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-      </Composite>
-      <Composite>
-            <Composite.layout>
-                  <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-            </Composite.layout>
-            <ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio>
-            <ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog>
-            <uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog>
-            <ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog>
-      </Composite>
-      <Composite>
-            <Composite.layout>
-                  <ppel:PropertiesLayout></ppel:PropertiesLayout>
-            </Composite.layout>
-            <ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference>
-      </Composite>
-</Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivity.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivity.xwt
index 3516c2b69a0..fd78fc90ba2 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivity.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivity.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Activity:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Activity:isSingleExecution"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Behavior:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Activity:variable"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Activity:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Activity:isSingleExecution"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Behavior:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Activity:variable"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityEdge.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityEdge.xwt
index f5ffc71de8c..12918308707 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityEdge.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityEdge.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityEdge:guard"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityEdge:weight"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityEdge:guard"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityEdge:weight"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityFinalNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityFinalNode.xwt
index 1a945710fd9..79bf9a5b6ee 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityFinalNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityFinalNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityNode.xwt
index 421efe518ff..54d09e0ac4d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityParameterNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityParameterNode.xwt
index 45213864704..f78e5631448 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityParameterNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityParameterNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityParameterNode:parameter"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityParameterNode:parameter"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityPartition.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityPartition.xwt
index f31e7e634d6..34b1e3100a9 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityPartition.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActivityPartition.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ActivityPartition:isDimension"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ActivityPartition:isExternal"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityPartition:represents"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ActivityPartition:isDimension"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ActivityPartition:isExternal"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityPartition:represents"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActor.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActor.xwt
index 956d9dcfab5..e6610c5d860 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActor.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActor.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAddStructuralFeatureValueAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAddStructuralFeatureValueAction.xwt
index 6f368086338..1ce786a4b65 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAddStructuralFeatureValueAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAddStructuralFeatureValueAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AddStructuralFeatureValueAction:isReplaceAll"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:AddStructuralFeatureValueAction:insertAt"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteStructuralFeatureAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:structuralFeature"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteStructuralFeatureAction:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AddStructuralFeatureValueAction:isReplaceAll"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:AddStructuralFeatureValueAction:insertAt"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteStructuralFeatureAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:structuralFeature"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteStructuralFeatureAction:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAddVariableValueAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAddVariableValueAction.xwt
index dd48277909f..4ab0b478d0f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAddVariableValueAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAddVariableValueAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AddVariableValueAction:isReplaceAll"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:AddVariableValueAction:insertAt"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteVariableAction:value"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:VariableAction:variable"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:AddVariableValueAction:isReplaceAll"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:AddVariableValueAction:insertAt"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteVariableAction:value"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:VariableAction:variable"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAnyReceiveEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAnyReceiveEvent.xwt
index d06ec0a0b9b..52442bfe420 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAnyReceiveEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAnyReceiveEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleArtifact.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleArtifact.xwt
index e246bc3ca8e..a2f998b384b 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleArtifact.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleArtifact.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:Artifact:fileName"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Artifact:manifestation"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Artifact:ownedAttribute"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Artifact:ownedOperation"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:Artifact:fileName"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Artifact:manifestation"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Artifact:ownedAttribute"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Artifact:ownedOperation"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAssociation.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAssociation.xwt
index aa05c82c210..6235cb288dc 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAssociation.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAssociation.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo><ppe:ViewEditor view="UML:MemberEnd" input="{Binding}" numColumns="2" property="UML:Association:memberEnd"></ppe:ViewEditor></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo><ppe:ViewEditor numColumns="2" view="UML:MemberEnd" input="{Binding}" property="UML:Association:memberEnd"></ppe:ViewEditor></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAssociationClass.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAssociationClass.xwt
index 85015a0fa9f..9f7bfb1286f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAssociationClass.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleAssociationClass.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Association:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Association:memberEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Association:navigableOwnedEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Association:ownedEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Association:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Association:memberEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Association:navigableOwnedEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Association:ownedEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehavior.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehavior.xwt
index eafe64bfb7e..1d86cbb5ec5 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehavior.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehavior.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Behavior:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Behavior:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehaviorExecutionSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehaviorExecutionSpecification.xwt
index ac6bf956c8c..b75fddc1924 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehaviorExecutionSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehaviorExecutionSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:BehaviorExecutionSpecification:behavior"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ExecutionSpecification:finish"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ExecutionSpecification:start"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:BehaviorExecutionSpecification:behavior"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ExecutionSpecification:finish"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ExecutionSpecification:start"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehavioralFeature.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehavioralFeature.xwt
index b0cdcfc10c9..aa72e0edad6 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehavioralFeature.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehavioralFeature.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:BehavioralFeature:method"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:BehavioralFeature:ownedParameter"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:BehavioralFeature:method"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:BehavioralFeature:ownedParameter"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehavioredClassifier.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehavioredClassifier.xwt
index 97dd5dbb740..3b206369f48 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehavioredClassifier.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBehavioredClassifier.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBroadcastSignalAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBroadcastSignalAction.xwt
index 3a831c0610d..97cdecabf1f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBroadcastSignalAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleBroadcastSignalAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:BroadcastSignalAction:signal"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InvocationAction:argument"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:BroadcastSignalAction:signal"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InvocationAction:argument"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallAction.xwt
index c25c95c713a..a0d868c61a3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InvocationAction:argument"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:CallAction:result"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InvocationAction:argument"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:CallAction:result"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallBehaviorAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallBehaviorAction.xwt
index f51519c3996..46dad8de835 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallBehaviorAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallBehaviorAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:CallBehaviorAction:behavior"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InvocationAction:argument"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:CallAction:result"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:CallBehaviorAction:behavior"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InvocationAction:argument"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:CallAction:result"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallEvent.xwt
index eb4f8430a5c..03ff418d329 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:CallEvent:operation"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:CallEvent:operation"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallOperationAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallOperationAction.xwt
index 7d421eafefb..f5468dc7d09 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallOperationAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCallOperationAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:CallOperationAction:operation"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:CallOperationAction:target"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InvocationAction:argument"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:CallAction:result"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:CallOperationAction:operation"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:CallOperationAction:target"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InvocationAction:argument"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:CallAction:result"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCentralBufferNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCentralBufferNode.xwt
index 06f5ddb764f..afb218f70cf 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCentralBufferNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCentralBufferNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleChangeEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleChangeEvent.xwt
index b2fd3942923..e90e9035603 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleChangeEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleChangeEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ChangeEvent:changeExpression"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ChangeEvent:changeExpression"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClass.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClass.xwt
index 4f4c8a7d462..e07869843c6 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClass.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClass.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:umlXtext="clr-namespace:org.eclipse.papyrus.properties.uml.xtext" xmlns:xtext="clr-namespace:org.eclipse.papyrus.widgets.xtext.creation" xmlns:x="http://www.eclipse.org/xwt" xmlns:creation="clr-namespace:org.eclipse.papyrus.properties.creation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="UML:NamedElement:qualifiedName"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:StructuredClassifier:ownedAttribute"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:umlXtext="clr-namespace:org.eclipse.papyrus.properties.uml.xtext" xmlns:x="http://www.eclipse.org/xwt" xmlns:creation="clr-namespace:org.eclipse.papyrus.properties.creation" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:xtext="clr-namespace:org.eclipse.papyrus.widgets.xtext.creation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="UML:NamedElement:qualifiedName"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:StructuredClassifier:ownedAttribute"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClassifier.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClassifier.xwt
index 7c3ff2af829..e18d975af88 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClassifier.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClassifier.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClassifierTemplateParameter.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClassifierTemplateParameter.xwt
index ee9e0ed52d0..6a45940b1f6 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClassifierTemplateParameter.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClassifierTemplateParameter.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ClassifierTemplateParameter:allowSubstitutable"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:default"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedDefault"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedParameteredElement"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:parameteredElement"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ClassifierTemplateParameter:allowSubstitutable"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:default"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedDefault"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedParameteredElement"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:parameteredElement"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClause.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClause.xwt
index 1f41b96224f..4012cf1d089 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClause.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClause.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Clause:decider"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Clause:body"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Clause:bodyOutput"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Clause:predecessorClause"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Clause:successorClause"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Clause:test"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Clause:decider"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Clause:body"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Clause:bodyOutput"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Clause:predecessorClause"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Clause:successorClause"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Clause:test"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClearAssociationAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClearAssociationAction.xwt
index 146f0063f3a..036c1b670f3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClearAssociationAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClearAssociationAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ClearAssociationAction:association"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ClearAssociationAction:object"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ClearAssociationAction:association"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ClearAssociationAction:object"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClearStructuralFeatureAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClearStructuralFeatureAction.xwt
index 605eb738cf4..b141ff216e7 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClearStructuralFeatureAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClearStructuralFeatureAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ClearStructuralFeatureAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:structuralFeature"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ClearStructuralFeatureAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:structuralFeature"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClearVariableAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClearVariableAction.xwt
index 56b08dfc34a..0c50bb66276 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClearVariableAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClearVariableAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:VariableAction:variable"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:VariableAction:variable"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCollaboration.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCollaboration.xwt
index 63eb3b8b048..2cc66ed14ee 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCollaboration.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCollaboration.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Collaboration:collaborationRole"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Collaboration:collaborationRole"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCollaborationUse.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCollaborationUse.xwt
index c678dec759b..3ae0173414e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCollaborationUse.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCollaborationUse.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:CollaborationUse:type"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:CollaborationUse:roleBinding"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:CollaborationUse:type"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:CollaborationUse:roleBinding"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCombinedFragment.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCombinedFragment.xwt
index 7cd69d77d46..e0db2c6183c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCombinedFragment.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCombinedFragment.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:CombinedFragment:interactionOperator"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:CombinedFragment:interactionOperator"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleComment.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleComment.xwt
index 16810d14280..ba17fcee8bb 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleComment.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleComment.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringMultiline input="{Binding}" property="UML:Comment:body"></ppe:StringMultiline><ppe:MultiReference input="{Binding}" property="UML:Comment:annotatedElement"></ppe:MultiReference></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringMultiline input="{Binding}" property="UML:Comment:body"></ppe:StringMultiline><ppe:MultiReference input="{Binding}" property="UML:Comment:annotatedElement"></ppe:MultiReference></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCommunicationPath.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCommunicationPath.xwt
index fc96f7a108f..f8099cd587e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCommunicationPath.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCommunicationPath.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Association:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Association:memberEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Association:navigableOwnedEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Association:ownedEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Association:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Association:memberEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Association:navigableOwnedEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Association:ownedEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleComponent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleComponent.xwt
index 27c3ad77a9b..e1e626bc300 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleComponent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleComponent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Component:isIndirectlyInstantiated"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Component:provided"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Component:required"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Component:isIndirectlyInstantiated"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Component:provided"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Component:required"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleComponentRealization.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleComponentRealization.xwt
index fdc12fcba7f..c0223876004 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleComponentRealization.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleComponentRealization.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Abstraction:mapping"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Abstraction:mapping"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConditionalNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConditionalNode.xwt
index ac3df66de23..f62d587b0c0 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConditionalNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConditionalNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ConditionalNode:isAssured"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ConditionalNode:isDeterminate"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ConditionalNode:clause"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:ConditionalNode:result"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ConditionalNode:isAssured"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ConditionalNode:isDeterminate"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ConditionalNode:clause"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:ConditionalNode:result"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectableElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectableElement.xwt
index c0dc7b2632c..95d0e8474df 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectableElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectableElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectableElementTemplateParameter.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectableElementTemplateParameter.xwt
index 81ee39de85f..330a0f68558 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectableElementTemplateParameter.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectableElementTemplateParameter.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:default"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedDefault"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedParameteredElement"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:parameteredElement"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:default"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedDefault"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedParameteredElement"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:parameteredElement"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectionPointReference.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectionPointReference.xwt
index 5cac9eece2d..6a147d97928 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectionPointReference.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectionPointReference.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnector.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnector.xwt
index 000e663a13a..b556e9ea2b7 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnector.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnector.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Connector:kind"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Connector:type"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Connector:kind"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Connector:type"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectorEnd.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectorEnd.xwt
index 3f49b82b919..e876e2d0383 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectorEnd.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectorEnd.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConsiderIgnoreFragment.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConsiderIgnoreFragment.xwt
index 9294a44d878..fb26f828214 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConsiderIgnoreFragment.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConsiderIgnoreFragment.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:CombinedFragment:interactionOperator"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:CombinedFragment:interactionOperator"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConstraint.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConstraint.xwt
index 260ab27eb3d..76944e7f955 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConstraint.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConstraint.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:context"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Constraint:constrainedElement"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:context"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Constraint:constrainedElement"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleContinuation.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleContinuation.xwt
index 2a2d884e7c9..2a038982458 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleContinuation.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleContinuation.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Continuation:setting"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Continuation:setting"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleControlFlow.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleControlFlow.xwt
index 43f5464ac83..afb98e56bd2 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleControlFlow.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleControlFlow.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityEdge:guard"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityEdge:weight"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityEdge:guard"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityEdge:weight"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleControlNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleControlNode.xwt
index ff747dfa004..1391e6afe90 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleControlNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleControlNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreateLinkAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreateLinkAction.xwt
index e1f663ca581..d877f437dfe 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreateLinkAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreateLinkAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkAction:endData"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LinkAction:inputValue"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkAction:endData"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LinkAction:inputValue"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreateLinkObjectAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreateLinkObjectAction.xwt
index 93f260744d7..3ae9bf0588b 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreateLinkObjectAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreateLinkObjectAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:CreateLinkObjectAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkAction:endData"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LinkAction:inputValue"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:CreateLinkObjectAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkAction:endData"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LinkAction:inputValue"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreateObjectAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreateObjectAction.xwt
index 2092580042c..0128b59ce97 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreateObjectAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreateObjectAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:CreateObjectAction:classifier"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:CreateObjectAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:CreateObjectAction:classifier"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:CreateObjectAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreationEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreationEvent.xwt
index 51fec9e0c8c..fa1b2a8f086 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreationEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleCreationEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDataStoreNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDataStoreNode.xwt
index c8ca30b75a2..bf7942b8dbf 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDataStoreNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDataStoreNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDataType.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDataType.xwt
index fcbe7c8220a..b50f0a56317 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDataType.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDataType.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDecisionNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDecisionNode.xwt
index ff747dfa004..ea894c002f3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDecisionNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDecisionNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDependency.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDependency.xwt
index 51fec9e0c8c..2b54b92768d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDependency.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDependency.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeployedArtifact.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeployedArtifact.xwt
index 5c805a91951..415ebabf3b4 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeployedArtifact.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeployedArtifact.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeployment.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeployment.xwt
index 530de4f02dd..d3d731ecdc9 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeployment.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeployment.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Deployment:configuration"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Deployment:configuration"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeploymentSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeploymentSpecification.xwt
index 0c6e852148f..2fc6b054981 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeploymentSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeploymentSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:DeploymentSpecification:deploymentLocation"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="UML:DeploymentSpecification:executionLocation"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="UML:Artifact:fileName"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Artifact:manifestation"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Artifact:ownedAttribute"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Artifact:ownedOperation"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:DeploymentSpecification:deploymentLocation"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="UML:DeploymentSpecification:executionLocation"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="UML:Artifact:fileName"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Artifact:manifestation"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Artifact:ownedAttribute"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Artifact:ownedOperation"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeploymentTarget.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeploymentTarget.xwt
index ba31c893441..70e4b351735 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeploymentTarget.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDeploymentTarget.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDestroyLinkAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDestroyLinkAction.xwt
index 9fd8788bf2b..348d60125fb 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDestroyLinkAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDestroyLinkAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkAction:endData"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LinkAction:inputValue"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkAction:endData"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LinkAction:inputValue"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDestroyObjectAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDestroyObjectAction.xwt
index 6be868245e1..2718bf26604 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDestroyObjectAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDestroyObjectAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:DestroyObjectAction:isDestroyLinks"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:DestroyObjectAction:isDestroyOwnedObjects"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:DestroyObjectAction:target"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:DestroyObjectAction:isDestroyLinks"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:DestroyObjectAction:isDestroyOwnedObjects"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:DestroyObjectAction:target"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDestructionEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDestructionEvent.xwt
index 6933f63cc56..b8f22203dfc 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDestructionEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDestructionEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDevice.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDevice.xwt
index f8c26da5fb2..ef7a6f570f8 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDevice.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDevice.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDuration.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDuration.xwt
index 4569a586bb4..51c0cabdfcd 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDuration.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDuration.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Duration:expr"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Duration:observation"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Duration:expr"></ppe:ReferenceDialog><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Duration:observation"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDurationConstraint.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDurationConstraint.xwt
index b37edfb90a5..72d4b59da5b 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDurationConstraint.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDurationConstraint.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:DurationConstraint:firstEvent"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:context"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Constraint:constrainedElement"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:DurationConstraint:firstEvent"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:context"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Constraint:constrainedElement"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDurationInterval.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDurationInterval.xwt
index 156ccaa60fd..b649ba43b7c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDurationInterval.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDurationInterval.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Interval:max"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Interval:min"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Interval:max"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Interval:min"></ppe:ReferenceDialog><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDurationObservation.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDurationObservation.xwt
index 70e76274b46..f6d32059d0d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDurationObservation.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleDurationObservation.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:DurationObservation:firstEvent"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:DurationObservation:event"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:DurationObservation:firstEvent"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:DurationObservation:event"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleElement.xwt
index 29221f23925..94d89e4578e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><GridLayout></GridLayout></Composite.layout><ppe:MultiReference layoutData="Hello" input="{Binding}" property="StereotypeApplication:stereotypeApplication"><ppe:MultiReference.layoutData><GridData horizontalAlignment="FILL" grabExcessVerticalSpace="true" verticalAlignment="FILL" grabExcessHorizontalSpace="true"></GridData></ppe:MultiReference.layoutData></ppe:MultiReference></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:StereotypeApplication input="{Binding}" layoutData="Hello" property="StereotypeApplication:stereotypeApplication"><uml:StereotypeApplication.layoutData><GridData grabExcessVerticalSpace="true" horizontalAlignment="FILL" grabExcessHorizontalSpace="true" verticalAlignment="FILL"></GridData></uml:StereotypeApplication.layoutData></uml:StereotypeApplication></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleElementImport.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleElementImport.xwt
index a17d47aab79..35afce4877e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleElementImport.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleElementImport.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:ElementImport:alias"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ElementImport:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:ElementImport:alias"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ElementImport:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEncapsulatedClassifier.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEncapsulatedClassifier.xwt
index 9120a293965..fc22a01f3bf 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEncapsulatedClassifier.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEncapsulatedClassifier.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEnumeration.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEnumeration.xwt
index 062e98a8942..86fc4966061 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEnumeration.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEnumeration.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Enumeration:ownedLiteral"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Enumeration:ownedLiteral"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEnumerationLiteral.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEnumerationLiteral.xwt
index 9459c991a3b..091e9c2e768 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEnumerationLiteral.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEnumerationLiteral.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InstanceSpecification:classifier"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InstanceSpecification:classifier"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEvent.xwt
index 2867b3889a8..e9b7cdaa422 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExceptionHandler.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExceptionHandler.xwt
index 3b1e9c3730a..296b78bc1d5 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExceptionHandler.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExceptionHandler.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ExceptionHandler:exceptionInput"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ExceptionHandler:handlerBody"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ExceptionHandler:exceptionType"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ExceptionHandler:exceptionInput"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ExceptionHandler:handlerBody"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ExceptionHandler:exceptionType"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutableNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutableNode.xwt
index a91eac81d7e..3bf41451505 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutableNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutableNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionEnvironment.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionEnvironment.xwt
index f2d4308b685..c36e3af7b26 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionEnvironment.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionEnvironment.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionEvent.xwt
index c3d21c2f5b2..68268832bdb 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionOccurrenceSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionOccurrenceSpecification.xwt
index e3fe9cb0fa3..410d5b5555f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionOccurrenceSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionOccurrenceSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ExecutionOccurrenceSpecification:execution"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ExecutionOccurrenceSpecification:execution"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionSpecification.xwt
index bc448b8fc68..43c0d0dbf71 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExecutionSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ExecutionSpecification:finish"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ExecutionSpecification:start"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ExecutionSpecification:finish"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ExecutionSpecification:start"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExpansionNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExpansionNode.xwt
index 58cd5136467..82d6d38739e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExpansionNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExpansionNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ExpansionNode:regionAsInput"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ExpansionNode:regionAsOutput"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ExpansionNode:regionAsInput"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ExpansionNode:regionAsOutput"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExpansionRegion.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExpansionRegion.xwt
index 53534c3245a..8b1d0dc6b4f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExpansionRegion.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExpansionRegion.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ExpansionRegion:mode"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ExpansionRegion:inputElement"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:ExpansionRegion:outputElement"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ExpansionRegion:mode"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ExpansionRegion:inputElement"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:ExpansionRegion:outputElement"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExpression.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExpression.xwt
index 085f4e40d91..d9013fdd7e2 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExpression.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExpression.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="UML:Expression:symbol"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Expression:operand"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="UML:Expression:symbol"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Expression:operand"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtend.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtend.xwt
index 65af270ef00..2867b3889a8 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtend.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtend.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtension.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtension.xwt
index fef5967cffc..6528b74632d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtension.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtension.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Association:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Association:memberEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Association:navigableOwnedEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Association:ownedEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Association:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Association:memberEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Association:navigableOwnedEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Association:ownedEnd"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtensionEnd.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtensionEnd.xwt
index 07e6eccc668..0b2780a7b45 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtensionEnd.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtensionEnd.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:aggregation"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Property:defaultValue"></ppe:ReferenceDialog><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Property:subsettedProperty"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:aggregation"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Property:defaultValue"></ppe:ReferenceDialog><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Property:subsettedProperty"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtensionPoint.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtensionPoint.xwt
index 9a474e58611..7ed1cdf7f15 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtensionPoint.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtensionPoint.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFeature.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFeature.xwt
index 6b1869915bb..647a81f73d4 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFeature.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFeature.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFinalNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFinalNode.xwt
index 9a015417bbf..54d09e0ac4d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFinalNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFinalNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFinalState.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFinalState.xwt
index 955e88950a3..12053a603a5 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFinalState.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFinalState.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:State:doActivity"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:State:entry"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:State:exit"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:State:stateInvariant"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:State:deferrableTrigger"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:State:doActivity"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:State:entry"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:State:exit"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:State:stateInvariant"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:State:deferrableTrigger"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFlowFinalNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFlowFinalNode.xwt
index 38651c5ee6a..db849ca91eb 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFlowFinalNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFlowFinalNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleForkNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleForkNode.xwt
index 4ea02a1e064..0d0fd818c2f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleForkNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleForkNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFunctionBehavior.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFunctionBehavior.xwt
index a969dd40776..3fe06cbbf16 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFunctionBehavior.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleFunctionBehavior.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:OpaqueBehavior:body"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:OpaqueBehavior:language"></ppe:MultiReference><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Behavior:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:OpaqueBehavior:body"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:OpaqueBehavior:language"></ppe:MultiReference><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Behavior:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGate.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGate.xwt
index 8a1472e487c..51fec9e0c8c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGate.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGate.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGeneralOrdering.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGeneralOrdering.xwt
index de71dd07c97..68f2c7524af 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGeneralOrdering.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGeneralOrdering.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGeneralization.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGeneralization.xwt
index f3e2c4ff41d..bc7c2e900ea 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGeneralization.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGeneralization.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Generalization:isSubstitutable"></ppe:BooleanRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Generalization:isSubstitutable"></ppe:BooleanRadio></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGeneralizationSet.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGeneralizationSet.xwt
index 9d1426eb1f4..a88b45b7268 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGeneralizationSet.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleGeneralizationSet.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:GeneralizationSet:isCovering"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:GeneralizationSet:isDisjoint"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:GeneralizationSet:powertype"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:GeneralizationSet:isCovering"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:GeneralizationSet:isDisjoint"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:GeneralizationSet:powertype"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInclude.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInclude.xwt
index e9b7cdaa422..d22dc5b1f5c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInclude.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInclude.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInformationFlow.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInformationFlow.xwt
index 75e236402a1..01e8fe67430 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInformationFlow.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInformationFlow.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InformationFlow:conveyed"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:InformationFlow:realization"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:InformationFlow:realizingActivityEdge"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:InformationFlow:realizingConnector"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:InformationFlow:realizingMessage"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InformationFlow:conveyed"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:InformationFlow:realization"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:InformationFlow:realizingActivityEdge"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:InformationFlow:realizingConnector"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:InformationFlow:realizingMessage"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInformationItem.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInformationItem.xwt
index a3857137ecf..ec9d95d47b5 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInformationItem.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInformationItem.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InformationItem:represented"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InformationItem:represented"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInitialNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInitialNode.xwt
index d1711512273..3d9efd1c0d8 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInitialNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInitialNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInputPin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInputPin.xwt
index dbbdf18a666..9e2cac56d56 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInputPin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInputPin.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInstanceSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInstanceSpecification.xwt
index b8a78a8f497..4aae37dddb4 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInstanceSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInstanceSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InstanceSpecification:classifier"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InstanceSpecification:classifier"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInstanceValue.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInstanceValue.xwt
index 2028f26bfd5..927a4131335 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInstanceValue.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInstanceValue.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InstanceValue:instance"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InstanceValue:instance"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteraction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteraction.xwt
index 69074efbeb0..e923803182d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteraction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteraction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Behavior:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Behavior:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionConstraint.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionConstraint.xwt
index 1c72006a61b..0c36269964d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionConstraint.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionConstraint.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:context"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:InteractionConstraint:maxint"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:InteractionConstraint:minint"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Constraint:constrainedElement"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:context"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:InteractionConstraint:maxint"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:InteractionConstraint:minint"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Constraint:constrainedElement"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionFragment.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionFragment.xwt
index 68268832bdb..2fa3a20baf1 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionFragment.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionFragment.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionOperand.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionOperand.xwt
index 50641975656..1366f08db53 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionOperand.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionOperand.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InteractionOperand:guard"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InteractionOperand:fragment"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InteractionOperand:guard"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InteractionOperand:fragment"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionUse.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionUse.xwt
index b111d93b745..e55d41a3f29 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionUse.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInteractionUse.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterface.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterface.xwt
index f8e995121ec..d5a35d210b9 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterface.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterface.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Interface:protocol"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Interface:protocol"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterfaceRealization.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterfaceRealization.xwt
index e0f96360b97..a90a7b6520d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterfaceRealization.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterfaceRealization.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Abstraction:mapping"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Abstraction:mapping"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterruptibleActivityRegion.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterruptibleActivityRegion.xwt
index 29e26f68970..9c60f24af22 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterruptibleActivityRegion.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterruptibleActivityRegion.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InterruptibleActivityRegion:interruptingEdge"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InterruptibleActivityRegion:interruptingEdge"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterval.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterval.xwt
index 68b0fceda94..a07a729ee66 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterval.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInterval.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Interval:max"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Interval:min"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Interval:max"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Interval:min"></ppe:ReferenceDialog><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleIntervalConstraint.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleIntervalConstraint.xwt
index 76944e7f955..5b21c998edd 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleIntervalConstraint.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleIntervalConstraint.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:context"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Constraint:constrainedElement"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:context"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Constraint:constrainedElement"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInvocationAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInvocationAction.xwt
index 5cf5a141eea..9d9523e6979 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInvocationAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInvocationAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InvocationAction:argument"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InvocationAction:argument"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleJoinNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleJoinNode.xwt
index 243e7af7715..adf249e9ca6 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleJoinNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleJoinNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:JoinNode:isCombineDuplicate"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:JoinNode:joinSpec"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:JoinNode:isCombineDuplicate"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:JoinNode:joinSpec"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLifeline.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLifeline.xwt
index 8e152c0a855..d862ce57b43 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLifeline.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLifeline.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Lifeline:decomposedAs"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Lifeline:represents"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Lifeline:selector"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Lifeline:decomposedAs"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Lifeline:represents"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Lifeline:selector"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkAction.xwt
index 65cabdbf641..44db31ade8c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkAction:endData"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LinkAction:inputValue"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkAction:endData"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LinkAction:inputValue"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkEndCreationData.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkEndCreationData.xwt
index 657feec995e..5fa52de6ee2 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkEndCreationData.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkEndCreationData.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:LinkEndCreationData:isReplaceAll"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndData:end"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndCreationData:insertAt"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndData:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkEndData:qualifier"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:LinkEndCreationData:isReplaceAll"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndData:end"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndCreationData:insertAt"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndData:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkEndData:qualifier"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkEndData.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkEndData.xwt
index 59a327248aa..b8138516394 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkEndData.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkEndData.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndData:end"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndData:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkEndData:qualifier"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndData:end"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndData:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkEndData:qualifier"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkEndDestructionData.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkEndDestructionData.xwt
index 825d63ce539..5f072848f97 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkEndDestructionData.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLinkEndDestructionData.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:LinkEndDestructionData:isDestroyDuplicates"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndDestructionData:destroyAt"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndData:end"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndData:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkEndData:qualifier"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:LinkEndDestructionData:isDestroyDuplicates"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndDestructionData:destroyAt"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndData:end"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:LinkEndData:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkEndData:qualifier"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralBoolean.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralBoolean.xwt
index 71c3f4cd996..5416bb9f771 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralBoolean.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralBoolean.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:BooleanRadio input="{Binding}" property="UML:LiteralBoolean:value"></ppe:BooleanRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:BooleanRadio input="{Binding}" property="UML:LiteralBoolean:value"></ppe:BooleanRadio></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralInteger.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralInteger.xwt
index c138a865ae2..30d46bab50e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralInteger.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralInteger.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:IntegerEditor input="{Binding}" property="UML:LiteralInteger:value"></ppe:IntegerEditor></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:IntegerEditor input="{Binding}" property="UML:LiteralInteger:value"></ppe:IntegerEditor></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralNull.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralNull.xwt
index 50824b1f566..5448211f004 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralNull.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralNull.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralSpecification.xwt
index e03d615ffad..cdc9f31306f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralString.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralString.xwt
index 2d0be46fe43..6eef8143aba 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralString.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralString.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:StringMultiline input="{Binding}" property="UML:LiteralString:value"></ppe:StringMultiline></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:StringMultiline input="{Binding}" property="UML:LiteralString:value"></ppe:StringMultiline></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralUnlimitedNatural.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralUnlimitedNatural.xwt
index 9f12bcbf489..ace347f8d25 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralUnlimitedNatural.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLiteralUnlimitedNatural.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:IntegerEditor input="{Binding}" property="UML:LiteralUnlimitedNatural:value"></ppe:IntegerEditor></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:IntegerEditor input="{Binding}" property="UML:LiteralUnlimitedNatural:value"></ppe:IntegerEditor></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLoopNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLoopNode.xwt
index 3146404b053..ff67bf4cbbf 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLoopNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleLoopNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:LoopNode:isTestedFirst"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:LoopNode:decider"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LoopNode:bodyOutput"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LoopNode:bodyPart"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LoopNode:loopVariable"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LoopNode:loopVariableInput"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LoopNode:result"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LoopNode:setupPart"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LoopNode:test"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:LoopNode:isTestedFirst"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:LoopNode:decider"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LoopNode:bodyOutput"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LoopNode:bodyPart"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LoopNode:loopVariable"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LoopNode:loopVariableInput"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LoopNode:result"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LoopNode:setupPart"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LoopNode:test"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleManifestation.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleManifestation.xwt
index 828e5cbb263..7eb891df4b5 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleManifestation.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleManifestation.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Abstraction:mapping"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Manifestation:utilizedElement"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Abstraction:mapping"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Manifestation:utilizedElement"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMergeNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMergeNode.xwt
index 046a7218cbf..3d95997e5d9 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMergeNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMergeNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessage.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessage.xwt
index 100f9390a59..0289548553e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessage.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessage.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Message:messageSort"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Message:argument"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Message:messageSort"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Message:argument"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessageEnd.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessageEnd.xwt
index 7e35245d767..e8eb74337b5 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessageEnd.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessageEnd.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessageEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessageEvent.xwt
index 33068b81de8..52bb963ca80 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessageEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessageEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessageOccurrenceSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessageOccurrenceSpecification.xwt
index 000768b9554..666e3dec3ef 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessageOccurrenceSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMessageOccurrenceSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleModel.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleModel.xwt
index cd16fdb6eeb..6eca735ecf3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleModel.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleModel.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Package:packageMerge"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Package:packageMerge"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMultiplicityElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMultiplicityElement.xwt
index 96260574815..e876e2d0383 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMultiplicityElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMultiplicityElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleNamedElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleNamedElement.xwt
index 799cfe16bb5..efbff528bb0 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleNamedElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleNamedElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleNamespace.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleNamespace.xwt
index e55ff7d19bb..7ab94dfa618 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleNamespace.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleNamespace.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleNode.xwt
index cc8b164fc41..9d5290cb378 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleObjectFlow.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleObjectFlow.xwt
index 4755df6f616..16be2eeccfc 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleObjectFlow.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleObjectFlow.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectFlow:isMulticast"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectFlow:isMultireceive"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityEdge:guard"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityEdge:weight"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectFlow:isMulticast"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectFlow:isMultireceive"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityEdge:guard"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ActivityEdge:weight"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleObjectNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleObjectNode.xwt
index 3f46be257d2..649acc59a36 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleObjectNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleObjectNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleObservation.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleObservation.xwt
index 624795aaa0b..8962a81bb4a 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleObservation.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleObservation.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOccurrenceSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOccurrenceSpecification.xwt
index bcb1338fad2..9ab2133e54d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOccurrenceSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOccurrenceSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOpaqueAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOpaqueAction.xwt
index 0a3b886752e..ae8c7b0756d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOpaqueAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOpaqueAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" ><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><uml:ExpressionEditor input="{Binding}" property="UML:OpaqueAction:language"></uml:ExpressionEditor><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><uml:ExpressionEditor input="{Binding}" property="UML:OpaqueAction:language"></uml:ExpressionEditor><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOpaqueBehavior.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOpaqueBehavior.xwt
index 15ceedd3655..070c20d8236 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOpaqueBehavior.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOpaqueBehavior.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" ><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><uml:ExpressionEditor input="{Binding}" property="UML:OpaqueBehavior:language"></uml:ExpressionEditor><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Behavior:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><uml:ExpressionEditor input="{Binding}" property="UML:OpaqueBehavior:language"></uml:ExpressionEditor><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Behavior:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOpaqueExpression.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOpaqueExpression.xwt
index 32efdaa671c..95fbf8f4319 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOpaqueExpression.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOpaqueExpression.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" ><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><uml:ExpressionEditor input="{Binding}" property="UML:OpaqueExpression:language"></uml:ExpressionEditor><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:OpaqueExpression:behavior"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><uml:ExpressionEditor input="{Binding}" property="UML:OpaqueExpression:language"></uml:ExpressionEditor><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:OpaqueExpression:behavior"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOperation.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOperation.xwt
index f4c04aaefc6..944300fa968 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOperation.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOperation.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:xtext="clr-namespace:org.eclipse.papyrus.widgets.xtext.creation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:umlXtext="clr-namespace:org.eclipse.papyrus.properties.uml.xtext" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Operation:isQuery"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:BehavioralFeature:method"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:BehavioralFeature:ownedParameter"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:xtext="clr-namespace:org.eclipse.papyrus.widgets.xtext.creation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:umlXtext="clr-namespace:org.eclipse.papyrus.properties.uml.xtext" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Operation:isQuery"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:BehavioralFeature:method"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:BehavioralFeature:ownedParameter"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOperationTemplateParameter.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOperationTemplateParameter.xwt
index 8b5b273220f..bd9a69bb072 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOperationTemplateParameter.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOperationTemplateParameter.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:default"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedDefault"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedParameteredElement"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:parameteredElement"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:default"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedDefault"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedParameteredElement"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:parameteredElement"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOutputPin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOutputPin.xwt
index abaff06491c..2010ad30e7d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOutputPin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOutputPin.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackage.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackage.xwt
index 3c3eaaff091..5f71aae102b 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackage.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackage.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Package:packageMerge"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Package:packageMerge"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageImport.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageImport.xwt
index 648a96eb9ac..d6f7df50a1e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageImport.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageImport.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:PackageImport:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:PackageImport:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageProfile.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageProfile.xwt
index 327afbf1571..f0c356881d8 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageProfile.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageProfile.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" ><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:ProfileApplicationPropertyEditor input="{Binding}" property="StereotypeApplication:profileApplication"></uml:ProfileApplicationPropertyEditor></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:ProfileApplicationPropertyEditor input="{Binding}" property="StereotypeApplication:profileApplication"></uml:ProfileApplicationPropertyEditor></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageableElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageableElement.xwt
index 07fe9e21f8e..799cfe16bb5 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageableElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageableElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleParameter.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleParameter.xwt
index 8a13e9a97fd..62e141c9701 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleParameter.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleParameter.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Parameter:defaultValue"></ppe:ReferenceDialog><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Parameter:defaultValue"></ppe:ReferenceDialog><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleParameterSet.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleParameterSet.xwt
index c6a93d7f8f7..23887c83c03 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleParameterSet.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleParameterSet.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ParameterSet:condition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:ParameterSet:parameter"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ParameterSet:condition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:ParameterSet:parameter"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePartDecomposition.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePartDecomposition.xwt
index b111d93b745..666e3dec3ef 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePartDecomposition.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePartDecomposition.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePin.xwt
index 84eb4c5f95e..47e7dca705d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePin.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePort.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePort.xwt
index 3e0bbeb0377..d74aebbdb76 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePort.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePort.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Port:isBehavior"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Port:isService"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Property:defaultValue"></ppe:ReferenceDialog><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Port:provided"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Port:required"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Property:subsettedProperty"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Port:isBehavior"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Port:isService"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Property:defaultValue"></ppe:ReferenceDialog><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Port:provided"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Port:required"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Property:subsettedProperty"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePrimitiveType.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePrimitiveType.xwt
index e7aeba56cc4..97dd5dbb740 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePrimitiveType.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePrimitiveType.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProfile.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProfile.xwt
index 9730dbf6536..033a3f277ff 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProfile.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProfile.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Package:packageMerge"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Package:packageMerge"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProfileApplication.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProfileApplication.xwt
index f3edb47a4de..9f6e6b45cc9 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProfileApplication.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProfileApplication.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ProfileApplication:isStrict"></ppe:BooleanRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ProfileApplication:isStrict"></ppe:BooleanRadio></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProperty.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProperty.xwt
index 6db57c2fb44..13ec115f878 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProperty.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProperty.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Property:defaultValue"></ppe:ReferenceDialog><ppe:EnumCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumCombo><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Property:subsettedProperty"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Property:defaultValue"></ppe:ReferenceDialog><ppe:EnumCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumCombo><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Property:subsettedProperty"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProtocolStateMachine.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProtocolStateMachine.xwt
index beb5c1033ec..ff3f2ee2a9f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProtocolStateMachine.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProtocolStateMachine.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Behavior:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Behavior:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProtocolTransition.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProtocolTransition.xwt
index 0b32b648bac..6e5faea5a87 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProtocolTransition.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProtocolTransition.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Transition:kind"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Transition:effect"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Transition:guard"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ProtocolTransition:postCondition"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ProtocolTransition:preCondition"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Transition:trigger"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Transition:kind"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Transition:effect"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Transition:guard"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ProtocolTransition:postCondition"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ProtocolTransition:preCondition"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Transition:trigger"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePseudostate.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePseudostate.xwt
index ede550ffd4c..1b82f4be128 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePseudostate.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePseudostate.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Pseudostate:kind"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:Pseudostate:kind"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleQualifierValue.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleQualifierValue.xwt
index 78b4ec4b2e5..b73418fe44d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleQualifierValue.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleQualifierValue.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:QualifierValue:qualifier"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:QualifierValue:value"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:QualifierValue:qualifier"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:QualifierValue:value"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRaiseExceptionAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRaiseExceptionAction.xwt
index b15341ffd2c..fab8c317502 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRaiseExceptionAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRaiseExceptionAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:RaiseExceptionAction:exception"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:RaiseExceptionAction:exception"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadExtentAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadExtentAction.xwt
index f7b077c2f3a..24da5a24697 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadExtentAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadExtentAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReadExtentAction:classifier"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadExtentAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReadExtentAction:classifier"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadExtentAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadIsClassifiedObjectAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadIsClassifiedObjectAction.xwt
index 5209a7bdfe4..379c58c58ed 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadIsClassifiedObjectAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadIsClassifiedObjectAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ReadIsClassifiedObjectAction:isDirect"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReadIsClassifiedObjectAction:classifier"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadIsClassifiedObjectAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadIsClassifiedObjectAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ReadIsClassifiedObjectAction:isDirect"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReadIsClassifiedObjectAction:classifier"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadIsClassifiedObjectAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadIsClassifiedObjectAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadLinkAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadLinkAction.xwt
index 0eed81ba68b..d4cb082c8d2 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadLinkAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadLinkAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReadLinkAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkAction:endData"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LinkAction:inputValue"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReadLinkAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkAction:endData"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LinkAction:inputValue"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadLinkObjectEndAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadLinkObjectEndAction.xwt
index f106ec774ef..9f254df9e8f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadLinkObjectEndAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadLinkObjectEndAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReadLinkObjectEndAction:end"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadLinkObjectEndAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadLinkObjectEndAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReadLinkObjectEndAction:end"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadLinkObjectEndAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadLinkObjectEndAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadLinkObjectEndQualifierAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadLinkObjectEndQualifierAction.xwt
index 51cff1f8a0b..dc9b199d39b 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadLinkObjectEndQualifierAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadLinkObjectEndQualifierAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReadLinkObjectEndQualifierAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadLinkObjectEndQualifierAction:qualifier"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadLinkObjectEndQualifierAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReadLinkObjectEndQualifierAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadLinkObjectEndQualifierAction:qualifier"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadLinkObjectEndQualifierAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadSelfAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadSelfAction.xwt
index ad564828c72..8f063d9dfb0 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadSelfAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadSelfAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReadSelfAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReadSelfAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadStructuralFeatureAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadStructuralFeatureAction.xwt
index f8df4c4c9db..8f4e4a1502c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadStructuralFeatureAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadStructuralFeatureAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadStructuralFeatureAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:structuralFeature"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReadStructuralFeatureAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:structuralFeature"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadVariableAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadVariableAction.xwt
index 16f3c7f713e..3d8dfde4cfc 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadVariableAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReadVariableAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReadVariableAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:VariableAction:variable"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReadVariableAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:VariableAction:variable"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRealization.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRealization.xwt
index 48894d1ed4e..31c5b4ddefa 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRealization.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRealization.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Abstraction:mapping"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Abstraction:mapping"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReceiveOperationEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReceiveOperationEvent.xwt
index 4355a285e4c..1e964e23fb3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReceiveOperationEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReceiveOperationEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReceiveOperationEvent:operation"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReceiveOperationEvent:operation"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReceiveSignalEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReceiveSignalEvent.xwt
index f5970f072bf..e150aefb9fb 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReceiveSignalEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReceiveSignalEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReceiveSignalEvent:signal"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReceiveSignalEvent:signal"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReception.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReception.xwt
index b16f54c6e73..f3fb65df2a7 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReception.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReception.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Reception:signal"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:BehavioralFeature:method"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:BehavioralFeature:ownedParameter"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Reception:signal"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:BehavioralFeature:method"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:BehavioralFeature:ownedParameter"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReclassifyObjectAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReclassifyObjectAction.xwt
index fa3bc8bb766..dcc905e156f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReclassifyObjectAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReclassifyObjectAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ReclassifyObjectAction:isReplaceAll"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReclassifyObjectAction:object"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:ReclassifyObjectAction:newClassifier"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:ReclassifyObjectAction:oldClassifier"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ReclassifyObjectAction:isReplaceAll"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReclassifyObjectAction:object"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:ReclassifyObjectAction:newClassifier"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:ReclassifyObjectAction:oldClassifier"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRedefinableElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRedefinableElement.xwt
index 3d95997e5d9..3f4d5402f9c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRedefinableElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRedefinableElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRedefinableTemplateSignature.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRedefinableTemplateSignature.xwt
index 2ae4b76ddea..ea894c002f3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRedefinableTemplateSignature.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRedefinableTemplateSignature.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReduceAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReduceAction.xwt
index 0ee38e6aa4c..7c7ad6e3433 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReduceAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReduceAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ReduceAction:isOrdered"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReduceAction:collection"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReduceAction:reducer"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReduceAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ReduceAction:isOrdered"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReduceAction:collection"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReduceAction:reducer"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReduceAction:result"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRegion.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRegion.xwt
index b032d861fb8..711f8322cdc 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRegion.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRegion.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRemoveStructuralFeatureValueAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRemoveStructuralFeatureValueAction.xwt
index 9d942579f76..bff48afb6a2 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRemoveStructuralFeatureValueAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRemoveStructuralFeatureValueAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RemoveStructuralFeatureValueAction:isRemoveDuplicates"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:RemoveStructuralFeatureValueAction:removeAt"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteStructuralFeatureAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:structuralFeature"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteStructuralFeatureAction:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RemoveStructuralFeatureValueAction:isRemoveDuplicates"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:RemoveStructuralFeatureValueAction:removeAt"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteStructuralFeatureAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:structuralFeature"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteStructuralFeatureAction:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRemoveVariableValueAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRemoveVariableValueAction.xwt
index 67b625926be..9f7e513f641 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRemoveVariableValueAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleRemoveVariableValueAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RemoveVariableValueAction:isRemoveDuplicates"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:RemoveVariableValueAction:removeAt"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteVariableAction:value"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:VariableAction:variable"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RemoveVariableValueAction:isRemoveDuplicates"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:RemoveVariableValueAction:removeAt"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteVariableAction:value"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:VariableAction:variable"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReplyAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReplyAction.xwt
index 052402fdbdc..1a748f4b6e9 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReplyAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleReplyAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReplyAction:replyToCall"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReplyAction:returnInformation"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:ReplyAction:replyValue"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ReplyAction:replyToCall"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ReplyAction:returnInformation"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:ReplyAction:replyValue"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendObjectAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendObjectAction.xwt
index 09e2ca75820..993b148b0b7 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendObjectAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendObjectAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:SendObjectAction:request"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:SendObjectAction:target"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:SendObjectAction:request"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:SendObjectAction:target"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendOperationEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendOperationEvent.xwt
index 65694f58b20..899f76bdef7 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendOperationEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendOperationEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:SendOperationEvent:operation"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:SendOperationEvent:operation"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendSignalAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendSignalAction.xwt
index 5befb463346..9b330b44ad0 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendSignalAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendSignalAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:SendSignalAction:signal"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:SendSignalAction:target"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InvocationAction:argument"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:SendSignalAction:signal"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:SendSignalAction:target"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InvocationAction:argument"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendSignalEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendSignalEvent.xwt
index 6449d7773f1..6f83a42d389 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendSignalEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSendSignalEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:SendSignalEvent:signal"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:SendSignalEvent:signal"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSequenceNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSequenceNode.xwt
index d01da14e4cb..d43ffc00584 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSequenceNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSequenceNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:SequenceNode:executableNode"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:SequenceNode:executableNode"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSignal.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSignal.xwt
index 9120a293965..578c182e901 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSignal.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSignal.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSignalEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSignalEvent.xwt
index de9f576f423..94b77d57da1 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSignalEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSignalEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:SignalEvent:signal"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:SignalEvent:signal"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSlot.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSlot.xwt
index 7a27e8c038c..97f87a61992 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSlot.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSlot.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Slot:definingFeature"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Slot:value"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Slot:definingFeature"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Slot:value"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStartClassifierBehaviorAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStartClassifierBehaviorAction.xwt
index bcab62c9fec..d543a46bbd6 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStartClassifierBehaviorAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStartClassifierBehaviorAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceCombo input="{Binding}" property="UML:StartClassifierBehaviorAction:object"></ppe:ReferenceCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceCombo input="{Binding}" property="UML:StartClassifierBehaviorAction:object"></ppe:ReferenceCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStartObjectBehaviorAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStartObjectBehaviorAction.xwt
index bf4e46cbde1..aac24f71622 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStartObjectBehaviorAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStartObjectBehaviorAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:StartObjectBehaviorAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InvocationAction:argument"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:CallAction:result"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:CallAction:isSynchronous"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:StartObjectBehaviorAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:InvocationAction:onPort"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:InvocationAction:argument"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:CallAction:result"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleState.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleState.xwt
index 53057fac676..30383e8a0ec 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleState.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleState.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:State:doActivity"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:State:entry"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:State:exit"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:State:stateInvariant"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:State:deferrableTrigger"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:State:doActivity"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:State:entry"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:State:exit"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:State:stateInvariant"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:State:deferrableTrigger"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStateInvariant.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStateInvariant.xwt
index 4e83c34de18..e818f54804f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStateInvariant.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStateInvariant.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:StateInvariant:invariant"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:StateInvariant:invariant"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStateMachine.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStateMachine.xwt
index 5e2b7a06559..de04ad01196 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStateMachine.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStateMachine.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Behavior:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Behavior:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStereotype.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStereotype.xwt
index 70a29b075ab..61fdefb508e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStereotype.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStereotype.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Stereotype:icon"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Stereotype:icon"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStringExpression.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStringExpression.xwt
index 7be07562380..85ecaa1ed03 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStringExpression.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStringExpression.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="UML:Expression:symbol"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Expression:operand"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="UML:Expression:symbol"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Expression:operand"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuralFeature.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuralFeature.xwt
index 5ae7715578e..450294315bb 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuralFeature.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuralFeature.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuralFeatureAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuralFeatureAction.xwt
index 0505f702ff6..0ddfee10ead 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuralFeatureAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuralFeatureAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:structuralFeature"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:structuralFeature"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuredActivityNode.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuredActivityNode.xwt
index 27062922125..539747b6128 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuredActivityNode.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuredActivityNode.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuredActivityNode:mustIsolate"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuredClassifier.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuredClassifier.xwt
index b38e0385bae..9a4a3be016d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuredClassifier.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuredClassifier.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSubstitution.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSubstitution.xwt
index b16b128b455..223cb07deeb 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSubstitution.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleSubstitution.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Abstraction:mapping"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Abstraction:mapping"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTemplateParameter.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTemplateParameter.xwt
index fde318ed263..a3fec6a89e7 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTemplateParameter.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTemplateParameter.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:default"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedDefault"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedParameteredElement"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:parameteredElement"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:default"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedDefault"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:ownedParameteredElement"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TemplateParameter:parameteredElement"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTestIdentityAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTestIdentityAction.xwt
index 296664dfa55..9d37e200c40 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTestIdentityAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTestIdentityAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TestIdentityAction:first"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TestIdentityAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TestIdentityAction:second"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TestIdentityAction:first"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TestIdentityAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:TestIdentityAction:second"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeConstraint.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeConstraint.xwt
index 038f80b25fe..933d3601f5d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeConstraint.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeConstraint.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:TimeConstraint:firstEvent"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:context"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Constraint:constrainedElement"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:TimeConstraint:firstEvent"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:context"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:specification"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Constraint:constrainedElement"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeEvent.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeEvent.xwt
index 0e267c779bb..2cfb6ed9291 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeEvent.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeEvent.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:TimeEvent:isRelative"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TimeEvent:when"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:TimeEvent:isRelative"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TimeEvent:when"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeExpression.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeExpression.xwt
index 7f3a89bdb06..01056d4d197 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeExpression.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeExpression.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TimeExpression:expr"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:TimeExpression:observation"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TimeExpression:expr"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:TimeExpression:observation"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeInterval.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeInterval.xwt
index b95741fcd8a..91ffe19dbac 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeInterval.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeInterval.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Interval:max"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Interval:min"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Interval:max"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Interval:min"></ppe:ReferenceDialog><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeObservation.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeObservation.xwt
index a6c031a716b..ec25417a712 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeObservation.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTimeObservation.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:TimeObservation:firstEvent"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TimeObservation:event"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:TimeObservation:firstEvent"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:TimeObservation:event"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTransition.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTransition.xwt
index 13c74908086..5953fa6854a 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTransition.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTransition.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Transition:kind"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Transition:effect"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Transition:guard"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Transition:trigger"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Transition:kind"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Transition:effect"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:Transition:guard"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Transition:trigger"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTrigger.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTrigger.xwt
index 66c0038ea37..af69ef7ef6f 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTrigger.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTrigger.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Trigger:event"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Trigger:event"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleType.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleType.xwt
index 70e4b351735..624795aaa0b 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleType.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleType.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTypedElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTypedElement.xwt
index 19c4c3ea43d..96abd51e0ee 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTypedElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleTypedElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleUnmarshallAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleUnmarshallAction.xwt
index 1a394b613ad..0f4a746e702 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleUnmarshallAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleUnmarshallAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:UnmarshallAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:UnmarshallAction:unmarshallType"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:UnmarshallAction:result"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:UnmarshallAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:UnmarshallAction:unmarshallType"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:UnmarshallAction:result"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleUsage.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleUsage.xwt
index e3812989a3b..c6ddb944d37 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleUsage.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleUsage.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleUseCase.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleUseCase.xwt
index a398f5da278..0e83297b943 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleUseCase.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleUseCase.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValuePin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValuePin.xwt
index 375cb9e2650..cbc250bd6fe 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValuePin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValuePin.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ValuePin:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:ObjectNode:isControlType"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ValuePin:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValueSpecification.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValueSpecification.xwt
index edd69b5c2d2..1b5a56bb0bd 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValueSpecification.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValueSpecification.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:TypeReferenceDialog property="UML:TypedElement:type" input="{Binding}"></uml:TypeReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValueSpecificationAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValueSpecificationAction.xwt
index ebac9b6db30..384bf938a90 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValueSpecificationAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValueSpecificationAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ValueSpecificationAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ValueSpecificationAction:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:ValueSpecificationAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:ValueSpecificationAction:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVariable.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVariable.xwt
index 30ce102a9f8..8942347fc52 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVariable.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVariable.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><uml:TypeReferenceDialog input="{Binding}" property="UML:TypedElement:type"></uml:TypeReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVariableAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVariableAction.xwt
index ba4ca8f65c5..8285fe38ff9 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVariableAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVariableAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:VariableAction:variable"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:VariableAction:variable"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVertex.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVertex.xwt
index e9b7cdaa422..0c8fac3fa40 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVertex.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVertex.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleWriteLinkAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleWriteLinkAction.xwt
index ccefa11f194..977f78d2dd5 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleWriteLinkAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleWriteLinkAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkAction:endData"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LinkAction:inputValue"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:LinkAction:endData"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:LinkAction:inputValue"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleWriteStructuralFeatureAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleWriteStructuralFeatureAction.xwt
index 903151249d5..afae69e6bb6 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleWriteStructuralFeatureAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleWriteStructuralFeatureAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteStructuralFeatureAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:structuralFeature"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteStructuralFeatureAction:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:object"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteStructuralFeatureAction:result"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:StructuralFeatureAction:structuralFeature"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:WriteStructuralFeatureAction:value"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleWriteVariableAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleWriteVariableAction.xwt
index 854b1bbcc7a..7b4ee100c84 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleWriteVariableAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleWriteVariableAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:WriteVariableAction:value"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:VariableAction:variable"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:WriteVariableAction:value"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="UML:VariableAction:variable"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Action:localPostcondition"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Action:localPrecondition"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UMLNotation/UMLNotation.ctx b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UMLNotation/UMLNotation.ctx
index b273eac0a58..e56f3b32673 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UMLNotation/UMLNotation.ctx
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UMLNotation/UMLNotation.ctx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts" name="UMLNotation">
-  <dependencies href="../../../../plugin/org.eclipse.papyrus.properties.uml/Model/UMLNotation/UMLNotation.ctx#/"/>
-  <tabs label="Appearance" id="appearance" category="papyrus">
+  <dependencies href="../../../../plugin/org.eclipse.papyrus.properties.notation/model/notation.ctx#/"/>
+  <tabs label="Appearance" id="appearance" category="org.eclipse.papyrus">
     <afterTab href="../../../../plugin/org.eclipse.papyrus.properties.uml/Model/UML/UML.ctx#//@tabs.1"/>
     <sections name="Label" sectionFile="ui/Label.xwt">
       <widget href="ui/Label.xwt#/"/>
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UMLNotation/ui/StereotypeDisplay.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UMLNotation/ui/StereotypeDisplay.xwt
index 29feed0a26b..84fd8789c91 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UMLNotation/ui/StereotypeDisplay.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UMLNotation/ui/StereotypeDisplay.xwt
@@ -1,11 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"
-	xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<uml:StereotypeDisplay input="{Binding}"
-		property="UMLNotation:Element:stereotypeDisplay"></uml:StereotypeDisplay>
-</Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:StereotypeDisplay input="{Binding}" property="UMLNotation:Element:stereotypeDisplay"></uml:StereotypeDisplay></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/NavigationObservableValue.java b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/NavigationObservableValue.java
index 9bc2a852cc7..7b2435f787a 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/NavigationObservableValue.java
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/NavigationObservableValue.java
@@ -12,10 +12,16 @@
 package org.eclipse.papyrus.properties.uml.databinding;
 
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.Diffs;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
-import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -25,14 +31,13 @@ import org.eclipse.papyrus.diagram.common.command.wrappers.GMFtoEMFCommandWrappe
 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.service.edit.service.IElementEditService;
 import org.eclipse.uml2.uml.Association;
+import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
  * An ObservableValue for manipulating the UML Navigable property.
  * The navigable property is a virtual property, represented as a Boolean.
- * This boolean is basically the result of the following query :
- * self.association.navigableOwnedEnd->contains(self)
  * 
  * @author Camille Letavernier
  */
@@ -42,6 +47,8 @@ public class NavigationObservableValue extends AbstractObservableValue {
 
 	private EditingDomain domain;
 
+	private boolean currentValue;
+
 	/**
 	 * Constructor.
 	 * 
@@ -53,6 +60,14 @@ public class NavigationObservableValue extends AbstractObservableValue {
 	public NavigationObservableValue(EObject source, EditingDomain domain) {
 		memberEnd = (Property)source;
 		this.domain = domain;
+		IObservableList ownerObservableList = EMFProperties.list(UMLPackage.eINSTANCE.getAssociation_OwnedEnd()).observe(memberEnd.getAssociation());
+		ownerObservableList.addChangeListener(new IChangeListener() {
+
+			public void handleChange(ChangeEvent event) {
+				fireValueChange(Diffs.createValueDiff(currentValue, doGetValue()));
+			}
+
+		});
 	}
 
 	public Object getValueType() {
@@ -61,37 +76,55 @@ public class NavigationObservableValue extends AbstractObservableValue {
 
 	@Override
 	protected Boolean doGetValue() {
-		return memberEnd.getAssociation().getNavigableOwnedEnds().contains(memberEnd);
+		return memberEnd.isNavigable();
 	}
 
 	@Override
 	protected void doSetValue(Object value) {
 		if(value instanceof Boolean) {
 			boolean isNavigable = (Boolean)value;
-
-			Command command = null;
+			if(memberEnd.isNavigable() == isNavigable) {
+				return;
+			}
 
 			Association association = memberEnd.getAssociation();
 
-			EStructuralFeature navigableFeature = association.eClass().getEStructuralFeature(UMLPackage.ASSOCIATION__NAVIGABLE_OWNED_END);
-
 			List<Property> navigableEnds = new ArrayList<Property>();
 			navigableEnds.addAll(association.getNavigableOwnedEnds());
+
+			List<SetRequest> setRequests = new LinkedList<SetRequest>();
+
 			if(isNavigable) {
 				navigableEnds.add(memberEnd);
 			} else {
-				navigableEnds.remove(memberEnd);
+				if(memberEnd.getOwningAssociation() == null && memberEnd.getOwner() instanceof Classifier) {
+					List<Property> ownedEnds = new LinkedList<Property>();
+					ownedEnds.addAll(association.getOwnedEnds());
+					ownedEnds.add(memberEnd);
+					setRequests.add(new SetRequest(association, UMLPackage.eINSTANCE.getAssociation_OwnedEnd(), ownedEnds));
+				}
+				if(navigableEnds.contains(memberEnd)) {
+					navigableEnds.remove(memberEnd);
+				}
 			}
 
+			EStructuralFeature navigableFeature = UMLPackage.eINSTANCE.getAssociation_NavigableOwnedEnd();
+			setRequests.add(new SetRequest(association, navigableFeature, navigableEnds));
+
+			CompoundCommand command = null;
+
 			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(association);
 			if(provider != null) {
-				SetRequest request = new SetRequest(association, navigableFeature, navigableEnds);
 
-				ICommand createGMFCommand = provider.getEditCommand(request);
+				command = new CompoundCommand();
 
-				command = new GMFtoEMFCommandWrapper(createGMFCommand);
+				for(SetRequest request : setRequests) {
+					ICommand createGMFCommand = provider.getEditCommand(request);
+					command.append(new GMFtoEMFCommandWrapper(createGMFCommand));
+				}
 			}
 
+			currentValue = isNavigable;
 			domain.getCommandStack().execute(command);
 		}
 	}
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/OwnerObservableValue.java b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/OwnerObservableValue.java
index f3a6a5ef92a..1091df835d6 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/OwnerObservableValue.java
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/OwnerObservableValue.java
@@ -14,8 +14,13 @@ package org.eclipse.papyrus.properties.uml.databinding;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.Diffs;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -49,6 +54,8 @@ public class OwnerObservableValue extends AbstractObservableValue {
 
 	private EditingDomain domain;
 
+	private String currentValue;
+
 	/**
 	 * Constructor.
 	 * 
@@ -60,6 +67,14 @@ public class OwnerObservableValue extends AbstractObservableValue {
 	public OwnerObservableValue(EObject source, EditingDomain domain) {
 		this.memberEnd = (Property)source;
 		this.domain = domain;
+		IObservableList navigableEndsObservableList = EMFProperties.list(UMLPackage.eINSTANCE.getAssociation_NavigableOwnedEnd()).observe(memberEnd.getAssociation());
+		navigableEndsObservableList.addChangeListener(new IChangeListener() {
+
+			public void handleChange(ChangeEvent event) {
+				fireValueChange(Diffs.createValueDiff(currentValue, doGetValue()));
+			}
+
+		});
 	}
 
 	public Object getValueType() {
@@ -132,8 +147,8 @@ public class OwnerObservableValue extends AbstractObservableValue {
 				}
 			}
 
+			this.currentValue = owner;
 			domain.getCommandStack().execute(command);
 		}
 	}
-
 }
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/MemberEndModelElement.java b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/MemberEndModelElement.java
index c3a08c7ca3d..2a443ab2b73 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/MemberEndModelElement.java
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/MemberEndModelElement.java
@@ -81,4 +81,9 @@ public class MemberEndModelElement extends AbstractModelElement {
 		}
 		return true;
 	}
+
+	@Override
+	public boolean forceRefresh(String propertyPath) {
+		return propertyPath.equals("navigable") || propertyPath.equals("owner"); //$NON-NLS-1$ //$NON-NLS-2$
+	}
 }
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/StereotypeApplicationFactory.java b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/StereotypeApplicationFactory.java
index baae2c5ad80..8dc67e26ce2 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/StereotypeApplicationFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/StereotypeApplicationFactory.java
@@ -13,6 +13,7 @@ package org.eclipse.papyrus.properties.uml.modelelement;
 
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gef.EditPart;
 import org.eclipse.papyrus.properties.Activator;
 import org.eclipse.papyrus.properties.contexts.DataContextElement;
 import org.eclipse.papyrus.properties.modelelement.ModelElement;
@@ -31,7 +32,7 @@ public class StereotypeApplicationFactory implements ModelElementFactory {
 		}
 
 		EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(umlSource);
-		return new StereotypeApplicationModelElement(umlSource, domain);
+		return new StereotypeApplicationModelElement((EditPart)sourceElement, domain);
 	}
 
 }
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/StereotypeApplicationModelElement.java b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/StereotypeApplicationModelElement.java
index 0df05819567..7f20a59f7e4 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/StereotypeApplicationModelElement.java
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/StereotypeApplicationModelElement.java
@@ -12,13 +12,16 @@
 package org.eclipse.papyrus.properties.uml.modelelement;
 
 import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.emf.ecore.EModelElement;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gef.EditPart;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.papyrus.diagram.common.providers.EditorLabelProvider;
 import org.eclipse.papyrus.properties.modelelement.AbstractModelElement;
 import org.eclipse.papyrus.properties.uml.databinding.ProfileApplicationObservableList;
 import org.eclipse.papyrus.properties.uml.databinding.StereotypeApplicationObservableList;
 import org.eclipse.papyrus.properties.uml.providers.ApplicableStereotypeContentProvider;
+import org.eclipse.papyrus.properties.uml.util.UMLUtil;
 import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Package;
@@ -34,8 +37,11 @@ public class StereotypeApplicationModelElement extends AbstractModelElement {
 
 	private EditingDomain domain;
 
-	public StereotypeApplicationModelElement(Element umlSource, EditingDomain domain) {
-		this.umlSource = umlSource;
+	private EditPart sourceElement;
+
+	public StereotypeApplicationModelElement(EditPart sourceElement, EditingDomain domain) {
+		this.umlSource = UMLUtil.resolveUMLElement(sourceElement);
+		this.sourceElement = sourceElement;
 		this.domain = domain;
 	}
 
@@ -68,4 +74,12 @@ public class StereotypeApplicationModelElement extends AbstractModelElement {
 	public boolean isOrdered(String propertyPath) {
 		return false;
 	}
+
+	public EModelElement getEModelElement() {
+		return (EModelElement)sourceElement.getModel();
+	}
+
+	public EditPart getEditPart() {
+		return sourceElement;
+	}
 }
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/widgets/StereotypeApplication.java b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/widgets/StereotypeApplication.java
new file mode 100644
index 00000000000..82029a03035
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/widgets/StereotypeApplication.java
@@ -0,0 +1,59 @@
+package org.eclipse.papyrus.properties.uml.widgets;
+
+import java.util.Collections;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.profile.tree.objects.StereotypedElementTreeObject;
+import org.eclipse.papyrus.profile.ui.compositeforview.AppliedStereotypeCompositeWithView;
+import org.eclipse.papyrus.profile.ui.compositeforview.AppliedStereotypePropertyCompositeWithView;
+import org.eclipse.papyrus.properties.modelelement.ModelElement;
+import org.eclipse.papyrus.properties.uml.modelelement.StereotypeApplicationModelElement;
+import org.eclipse.papyrus.properties.widgets.AbstractPropertyEditor;
+import org.eclipse.papyrus.properties.widgets.layout.PropertiesLayout;
+import org.eclipse.papyrus.widgets.editors.AbstractEditor;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.uml2.uml.Element;
+
+
+public class StereotypeApplication extends AbstractPropertyEditor {
+
+	private AppliedStereotypeCompositeWithView stereotypeComposite;
+
+	private AppliedStereotypePropertyCompositeWithView propertyComposite;
+
+	private Composite self;
+
+	public StereotypeApplication(Composite parent, int style) {
+		self = new Composite(parent, style);
+		self.setLayout(new PropertiesLayout(2, true));
+
+		stereotypeComposite = new AppliedStereotypeCompositeWithView(self);
+		stereotypeComposite.createContent(self, AbstractEditor.factory);
+
+		propertyComposite = new AppliedStereotypePropertyCompositeWithView(self, stereotypeComposite);
+		propertyComposite.createContent(self, AbstractEditor.factory);
+
+		stereotypeComposite.setPropertyComposite(propertyComposite);
+	}
+
+	@Override
+	protected void doBinding() {
+		// No Databinding here ; the AppliedStereotypeCompositeWithView is responsible
+		// for editing the data
+		ModelElement element = input.getModelElement(propertyPath);
+		if(element instanceof StereotypeApplicationModelElement) {
+			View diagramElement = (View)((StereotypeApplicationModelElement)element).getEModelElement();
+			EditPart editPart = ((StereotypeApplicationModelElement)element).getEditPart();
+			Element umlElement = (Element)diagramElement.getElement();
+
+			stereotypeComposite.setSelection(new StructuredSelection(Collections.singletonList(editPart)));
+			stereotypeComposite.setElement(umlElement);
+			stereotypeComposite.setInput(new StereotypedElementTreeObject(umlElement));
+			stereotypeComposite.setDiagramElement(diagramElement);
+
+			stereotypeComposite.refresh();
+		}
+	}
+}